diff --git a/LICENSE.rtf b/LICENSE.rtf
new file mode 100644
index 0000000000..1d110e353f
--- /dev/null
+++ b/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. }
+\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 }
\ No newline at end of file
diff --git a/icons/command-prompt.ico b/icons/command-prompt.ico
new file mode 100644
index 0000000000..a1b292b9e5
Binary files /dev/null and b/icons/command-prompt.ico differ
diff --git a/icons/viewer.ico b/icons/viewer.ico
index 4473e07f07..4b5464c8ad 100644
Binary files a/icons/viewer.ico and b/icons/viewer.ico differ
diff --git a/icons/wix-banner.bmp b/icons/wix-banner.bmp
new file mode 100644
index 0000000000..e3c7015ee8
Binary files /dev/null and b/icons/wix-banner.bmp differ
diff --git a/icons/wix-dialog.bmp b/icons/wix-dialog.bmp
new file mode 100644
index 0000000000..0d98336ace
Binary files /dev/null and b/icons/wix-dialog.bmp differ
diff --git a/resources/content_server/gui.js b/resources/content_server/gui.js
index edefdbc5ef..b6a7f8a5d7 100644
--- a/resources/content_server/gui.js
+++ b/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++) {
diff --git a/resources/images/news/sanjosemercurynews.png b/resources/images/news/sanjosemercurynews.png
new file mode 100644
index 0000000000..c45bc20b8d
Binary files /dev/null and b/resources/images/news/sanjosemercurynews.png differ
diff --git a/resources/images/news/toronto_sun.png b/resources/images/news/toronto_sun.png
new file mode 100644
index 0000000000..7b8384afb1
Binary files /dev/null and b/resources/images/news/toronto_sun.png differ
diff --git a/setup/__init__.py b/setup/__init__.py
index d7b9d2321d..6277e13b5e 100644
--- a/setup/__init__.py
+++ b/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:
diff --git a/setup/build_environment.py b/setup/build_environment.py
index 1eab15b630..052bbf05ac 100644
--- a/setup/build_environment.py
+++ b/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_lib_dirs = [r'C:\cygwin\home\kovid\ImageMagick-6.5.6-Q16\lib']
+ magick_inc_dirs = [os.path.join(prefix, 'build', 'ImageMagick-6.5.6')]
+ 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('.'))
diff --git a/setup/commands.py b/setup/commands.py
index 6fb593bd21..ba870072d6 100644
--- a/setup/commands.py
+++ b/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()
diff --git a/setup/extensions.py b/setup/extensions.py
index 17d82f3ff9..c2b8467300 100644
--- a/setup/extensions.py
+++ b/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',
diff --git a/setup/installer/__init__.py b/setup/installer/__init__.py
index 9fed8cf252..99e7586aa3 100644
--- a/setup/installer/__init__.py
+++ b/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', (
- 'rsync -avz --exclude src/calibre/plugins '
- '--exclude calibre/src/calibre.egg-info --exclude docs '
- '--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',]
+ BUILD_RSYNC = [r'cd ~/build/{project}', Rsync.SYNC_CMD]
+ BUILD_CLEAN = ['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'
diff --git a/setup/installer/windows/__init__.py b/setup/installer/windows/__init__.py
index 17667368c7..b51eccc832 100644
--- a/setup/installer/windows/__init__.py
+++ b/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'):
- shutil.rmtree('build/py2exe')
- subprocess.check_call(('scp', '-rp', 'xp_build:build/%s/build/py2exe'%__appname__,
- 'build'))
- 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 os.path.exists('build/winfrozen'):
+ shutil.rmtree('build/winfrozen')
+ subprocess.check_call(('scp',
+ 'xp_build:build/%s/%s'%(__appname__, installer), 'dist'))
if not os.path.exists(installer):
- self.warn('Failed to run installjammer')
+ self.warn('Failed to freeze')
raise SystemExit(1)
diff --git a/setup/installer/windows/build_installer.py b/setup/installer/windows/build_installer.py
deleted file mode 100644
index a347be40f7..0000000000
--- a/setup/installer/windows/build_installer.py
+++ /dev/null
@@ -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())
diff --git a/setup/installer/windows/calibre/calibre.mpi b/setup/installer/windows/calibre/calibre.mpi
deleted file mode 100644
index a65b22ab6a..0000000000
--- a/setup/installer/windows/calibre/calibre.mpi
+++ /dev/null
@@ -1,2773 +0,0 @@
-array set info {
-AllowLanguageSelection
-No
-
-AppName
-calibre
-
-ApplicationID
-EA5B0AA7-D6AE-0996-E42A-F9BBBE08F74F
-
-ApplicationURL
-http://calibre.kovidgoyal.net
-
-AutoRefreshFiles
-Yes
-
-BuildFailureAction
-{Fail (recommended)}
-
-CancelledInstallAction
-{Rollback and Stop}
-
-CleanupCancelledInstall
-Yes
-
-CommandLineFailureAction
-{Fail (recommended)}
-
-Company
-kovidgoyal.net
-
-CompressionLevel
-9
-
-CompressionMethod
-{lzma (solid)}
-
-Copyright
-{2008 Kovid Goyal}
-
-CreateDesktopShortcut
-Yes
-
-CreateQuickLaunchShortcut
-Yes
-
-DefaultDirectoryLocation
-{}
-
-DefaultLanguage
-English
-
-DefaultToSystemLanguage
-Yes
-
-EnableResponseFiles
-Yes
-
-Ext
-{}
-
-ExtractSolidArchivesOnStartup
-No
-
-Icon
-Modern/Small/SetupModernSmall01.gif
-
-IgnoreDirectories
-{}
-
-IgnoreFiles
-{}
-
-Image
-Modern/SetupModern01.gif
-
-IncludeDebugging
-Yes
-
-InstallPassword
-{}
-
-InstallVersion
-1.0.0.0
-
-Language,ca
-Yes
-
-Language,de
-No
-
-Language,en
-Yes
-
-Language,es
-No
-
-Language,fr
-No
-
-Language,hu
-No
-
-Language,it
-No
-
-Language,lt
-Yes
-
-Language,nl
-No
-
-Language,pl
-No
-
-Language,pt_br
-No
-
-Language,ru
-No
-
-LastIgnoreDirectories
-{}
-
-LastIgnoreFiles
-{}
-
-LaunchApplication
-Yes
-
-PackageDescription
-{calibre: E-book library management}
-
-PackageLicense
-GPL-3
-
-PackageMaintainer
-{Kovid Goyal }
-
-PackageName
-<%ShortAppName%>
-
-PackagePackager
-{Kovid Goyal }
-
-PackageRelease
-<%PatchVersion%>
-
-PackageSummary
-{calibre: E-book library management}
-
-PackageVersion
-<%MajorVersion%>.<%MinorVersion%>
-
-PreserveFileAttributes
-Yes
-
-PreserveFilePermissions
-Yes
-
-ProjectID
-DA98A0C6-9102-73EC-2516-B147E972D3F7
-
-ProjectVersion
-1.2.13.8
-
-SaveOnlyToplevelDirs
-No
-
-ScriptExt
-.sh
-
-ShortAppName
-calibre
-
-SkipUnusedFileGroups
-Yes
-
-SystemLanguage
-c
-
-Theme
-Modern_Wizard
-
-ThemeDir
-Modern_Wizard
-
-ThemeVersion
-1
-
-UpgradeApplicationID
-{}
-
-Version
-1.0
-
-WizardHeight
-365
-
-WizardWidth
-500
-
-}
-
-array set ::InstallJammer::InstallCommandLineOptions {
-debug
-{Debugging Switch Yes No {} {run installer in debug mode}}
-
-debugconsole
-{ShowConsole Switch Yes No {} {run installer with a debug console open}}
-
-mode
-{InstallMode Choice No No {Console Default Silent Standard} {set the mode to run the installer in}}
-
-prefix
-{InstallDir String No No {} {set the installation directory}}
-
-test
-{Testing Switch Yes No {} {run installer without installing any files}}
-
-}
-array set ::InstallJammer::UninstallCommandLineOptions {
-debugconsole
-{ShowConsole Switch Yes No {} {run uninstaller with a debug console open}}
-
-mode
-{UninstallMode Choice No No {Console Silent Standard} {set the mode to run the uninstaller in}}
-
-test
-{Testing Switch Yes No {} {run uninstaller without uninstalling any files}}
-
-}
-FileGroup ::BEF8D398-58BA-1F66-39D6-D4A63D5BEEF9 -setup Install -active Yes -platforms {AIX-ppc FreeBSD-4-x86 FreeBSD-x86 HPUX-hppa Linux-x86 Solaris-sparc Windows TarArchive ZipArchive FreeBSD-5-x86 FreeBSD-6-x86 FreeBSD-7-x86 Linux-x86_64 Solaris-x86} -name {Program Files} -parent FileGroups
-File ::8E5D85A4-7608-47A1-CF7C-309060D5FF40 -filemethod {Always overwrite files} -type dir -directory <%InstallDir%> -name /home/kovid/work/calibre/build/py2exe -parent BEF8D398-58BA-1F66-39D6-D4A63D5BEEF9
-File ::B95D03D4-EA59-F00E-59E1-BA05758879DA -type dir -name imageformats -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::A624029D-AE0F-49A5-4DAC-7720CDCAB271 -name qmng4.dll -parent B95D03D4-EA59-F00E-59E1-BA05758879DA
-File ::C53E8AB9-30FC-730C-3DA3-851C9B4838A1 -name qmng4.exp -parent B95D03D4-EA59-F00E-59E1-BA05758879DA
-File ::36ADF34E-46AD-663F-6C3A-D45E971CB722 -name qmng4.lib -parent B95D03D4-EA59-F00E-59E1-BA05758879DA
-File ::A1EEB0BC-ADA2-86C8-631B-E88FE03328EA -name qico4.dll -parent B95D03D4-EA59-F00E-59E1-BA05758879DA
-File ::516069B4-FC33-F267-8C4B-95475515A853 -name qico4.exp -parent B95D03D4-EA59-F00E-59E1-BA05758879DA
-File ::129AE39B-995D-9BE2-3FB4-69F129C4E86E -name qico4.lib -parent B95D03D4-EA59-F00E-59E1-BA05758879DA
-File ::113DBCCE-B6CA-2742-35DB-6FB53EE75919 -name qico4.dll.manifest -parent B95D03D4-EA59-F00E-59E1-BA05758879DA
-File ::CC7FFFF8-5DA6-3CCB-540C-A24B528B3DD6 -name qjpeg4.dll -parent B95D03D4-EA59-F00E-59E1-BA05758879DA
-File ::9C5B362E-D06B-D92F-6B39-F9F2B5BE9E17 -name qjpeg4.exp -parent B95D03D4-EA59-F00E-59E1-BA05758879DA
-File ::0FF52CC9-3920-A82E-0657-5B2A31CD1457 -name qjpeg4.lib -parent B95D03D4-EA59-F00E-59E1-BA05758879DA
-File ::9DD8CFAE-2E69-CACA-B451-16683C0F168D -name qjpeg4.dll.manifest -parent B95D03D4-EA59-F00E-59E1-BA05758879DA
-File ::5E16CADD-7269-4247-B35C-046D5B67E298 -name qtiff4.dll.manifest -parent B95D03D4-EA59-F00E-59E1-BA05758879DA
-File ::633981BF-9A0C-589D-25D3-50866757C3B8 -name qmng4.dll.manifest -parent B95D03D4-EA59-F00E-59E1-BA05758879DA
-File ::DB93E311-ECDF-21E0-8C5D-0B2EDAE6C424 -name qgif4.dll.manifest -parent B95D03D4-EA59-F00E-59E1-BA05758879DA
-File ::48E4C188-4ABF-4CCD-C410-7936B4898DDF -name qsvg4.dll.manifest -parent B95D03D4-EA59-F00E-59E1-BA05758879DA
-File ::BFF82F4E-0F3C-8F6E-381C-CCF91E220226 -name qgif4.dll -parent B95D03D4-EA59-F00E-59E1-BA05758879DA
-File ::3FAEE4BA-C005-E833-8BE4-EC8EF7BDAF1B -name qgif4.exp -parent B95D03D4-EA59-F00E-59E1-BA05758879DA
-File ::4AB682B9-C811-C68A-0100-5B32E0127093 -name qgif4.lib -parent B95D03D4-EA59-F00E-59E1-BA05758879DA
-File ::6EBEF5E4-1FA0-B14A-736F-DD1068874D19 -name qtiff4.dll -parent B95D03D4-EA59-F00E-59E1-BA05758879DA
-File ::8B2F7092-5B97-9DA8-90CD-46D191B49C28 -name qtiff4.exp -parent B95D03D4-EA59-F00E-59E1-BA05758879DA
-File ::9D014D0C-E6F4-A713-7CE9-CD71AFCEBC61 -name qtiff4.lib -parent B95D03D4-EA59-F00E-59E1-BA05758879DA
-File ::5EA8BF5D-76A7-023E-CF87-ED92DBCA527D -name qsvg4.dll -parent B95D03D4-EA59-F00E-59E1-BA05758879DA
-File ::A5298D0E-A211-EB2E-6892-7045D04B264E -name qsvg4.exp -parent B95D03D4-EA59-F00E-59E1-BA05758879DA
-File ::8A138EC0-728A-A421-A723-DE84F8DDE3EA -name qsvg4.lib -parent B95D03D4-EA59-F00E-59E1-BA05758879DA
-File ::5EF561A9-E70B-8F01-A852-C36D28D1FA14 -type dir -name codecs -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::D60D391E-2AA1-900B-DB5A-348EFC529375 -name qkrcodecs4.dll -parent 5EF561A9-E70B-8F01-A852-C36D28D1FA14
-File ::4B320138-FB4B-DBD2-81BC-9D1413CF7ED6 -name qkrcodecs4.exp -parent 5EF561A9-E70B-8F01-A852-C36D28D1FA14
-File ::38BE74BB-3CFA-7131-0467-BB1C4AE76512 -name qkrcodecs4.lib -parent 5EF561A9-E70B-8F01-A852-C36D28D1FA14
-File ::49F00491-8056-0B75-7FC5-87761A3C6161 -name qcncodecs4.dll -parent 5EF561A9-E70B-8F01-A852-C36D28D1FA14
-File ::CE567CBA-06A4-6D8E-E389-560CAC84E168 -name qcncodecs4.exp -parent 5EF561A9-E70B-8F01-A852-C36D28D1FA14
-File ::2546B812-DBD7-3EDF-5CB2-B5F6B62639AB -name qcncodecs4.lib -parent 5EF561A9-E70B-8F01-A852-C36D28D1FA14
-File ::12148DF6-6953-C6D3-6CDA-0ACED6F7D7FA -name qjpcodecs4.dll.manifest -parent 5EF561A9-E70B-8F01-A852-C36D28D1FA14
-File ::E4C54E9A-D1E4-DCC9-C43E-FC3A5FD7F8C7 -name qcncodecs4.dll.manifest -parent 5EF561A9-E70B-8F01-A852-C36D28D1FA14
-File ::1A86AC76-87FD-5EA9-0F23-2F21CA22F0CE -name qjpcodecs4.dll -parent 5EF561A9-E70B-8F01-A852-C36D28D1FA14
-File ::FEB0CF93-169B-D996-2363-3AE057322EA6 -name qjpcodecs4.exp -parent 5EF561A9-E70B-8F01-A852-C36D28D1FA14
-File ::0C8E6656-F734-B2B5-F0F7-6F5BDB5C6885 -name qjpcodecs4.lib -parent 5EF561A9-E70B-8F01-A852-C36D28D1FA14
-File ::F95B9748-FC4E-4AF3-C037-8493AD7BE0DA -name qtwcodecs4.dll.manifest -parent 5EF561A9-E70B-8F01-A852-C36D28D1FA14
-File ::2C3B2B03-3911-E7A8-035A-33E25A510F27 -name qtwcodecs4.dll -parent 5EF561A9-E70B-8F01-A852-C36D28D1FA14
-File ::BD1A8C7A-D485-9272-4B9A-05EE511A59CF -name qtwcodecs4.exp -parent 5EF561A9-E70B-8F01-A852-C36D28D1FA14
-File ::7EC5EFFB-7AA7-AEB1-46AD-4234DEE6A377 -name qtwcodecs4.lib -parent 5EF561A9-E70B-8F01-A852-C36D28D1FA14
-File ::CEE6F2FE-EEBA-8973-AAA5-DCAAAD279B72 -name qkrcodecs4.dll.manifest -parent 5EF561A9-E70B-8F01-A852-C36D28D1FA14
-File ::48EA1D8C-F4C8-3D34-229D-B501057802F3 -type dir -name driver -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::596DAFDA-23D2-26B3-1535-3D4BF36C9AD9 -name libusb0.dll -parent 48EA1D8C-F4C8-3D34-229D-B501057802F3
-File ::E6B997AB-A35F-1142-14AB-6B9513D98C40 -name libusb0.sys -parent 48EA1D8C-F4C8-3D34-229D-B501057802F3
-File ::20557983-9D6C-4AB5-D2DF-BE418BEE6BA3 -name libusb0_x64.dll -parent 48EA1D8C-F4C8-3D34-229D-B501057802F3
-File ::CFCED8FB-FE60-07EC-690D-4C47C2C786F6 -name libusb0_x64.sys -parent 48EA1D8C-F4C8-3D34-229D-B501057802F3
-File ::6D2B03D1-8449-045C-298A-9E65C168F64A -name prs500_x64.cat -parent 48EA1D8C-F4C8-3D34-229D-B501057802F3
-File ::8147A9D4-D17C-55EB-CAA5-CC0C04EDC0D2 -name prs500.cat -parent 48EA1D8C-F4C8-3D34-229D-B501057802F3
-File ::1085BEED-C76A-5FF4-209A-E03CFB697462 -name prs500.inf -parent 48EA1D8C-F4C8-3D34-229D-B501057802F3
-File ::0AC00D67-8452-CABB-6843-FE6A464E9AE9 -type dir -name plugins -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::540FEFD3-9B1B-00E6-B8A5-EA8EB959428E -name podofo.pyd -parent 0AC00D67-8452-CABB-6843-FE6A464E9AE9
-File ::0C77BC18-CE53-35EF-A667-C25B81C43E64 -name pictureflow.pyd -parent 0AC00D67-8452-CABB-6843-FE6A464E9AE9
-File ::F1D1D581-9194-D12F-6139-F920EEC1B14E -name winutil.pyd -parent 0AC00D67-8452-CABB-6843-FE6A464E9AE9
-File ::A94E4D31-5F8C-A363-AE61-A8F2E3A7B756 -name lzx.pyd -parent 0AC00D67-8452-CABB-6843-FE6A464E9AE9
-File ::2C88788E-B9FB-729D-442B-600ED97096A0 -name cPalmdoc.pyd -parent 0AC00D67-8452-CABB-6843-FE6A464E9AE9
-File ::26503DDE-8C5F-102F-B689-C6A17B2D6C93 -name msdes.pyd -parent 0AC00D67-8452-CABB-6843-FE6A464E9AE9
-File ::FCB0D098-8F90-1C97-9E20-65546F08A203 -name fontconfig.pyd -parent 0AC00D67-8452-CABB-6843-FE6A464E9AE9
-File ::E3BD0592-A0B9-B69D-7FD8-AD828D301351 -name cPalmdoc.pyd.manifest -parent 0AC00D67-8452-CABB-6843-FE6A464E9AE9
-File ::03E9E137-98F0-1B8C-CBE7-6E3A6691D4F1 -name pdfreflow.pyd -parent 0AC00D67-8452-CABB-6843-FE6A464E9AE9
-File ::BF6697B0-1BA5-024A-0566-2F3B22D8449F -name lzx.pyd.manifest -parent 0AC00D67-8452-CABB-6843-FE6A464E9AE9
-File ::520B27CC-2288-A6BA-689B-B7C090B1D27E -name pdfreflow.pyd.manifest -parent 0AC00D67-8452-CABB-6843-FE6A464E9AE9
-File ::F49E4A29-3607-039C-C67C-31E59861037C -name fontconfig.pyd.manifest -parent 0AC00D67-8452-CABB-6843-FE6A464E9AE9
-File ::3F660706-F752-6458-0DF5-CFD1C556DDC1 -name winutil.pyd.manifest -parent 0AC00D67-8452-CABB-6843-FE6A464E9AE9
-File ::4DD0593A-E9D1-2EB4-4CB4-DF75F28C9D0C -name podofo.pyd.manifest -parent 0AC00D67-8452-CABB-6843-FE6A464E9AE9
-File ::F6486848-58DE-9CC7-7F72-A1A3BC936DD3 -name msdes.pyd.manifest -parent 0AC00D67-8452-CABB-6843-FE6A464E9AE9
-File ::01034EB7-C79C-42B9-6FF0-E06C72EF2623 -type dir -name iconengines -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::8ADB07A0-6B9E-8F53-34DF-2035C7C343F1 -name qsvgicon4.dll -parent 01034EB7-C79C-42B9-6FF0-E06C72EF2623
-File ::41F512E3-9F39-68C6-BB7F-58F572755D35 -name qsvgicon4.exp -parent 01034EB7-C79C-42B9-6FF0-E06C72EF2623
-File ::7EE2621C-0EAE-B516-505A-6CE11A8F8951 -name qsvgicon4.lib -parent 01034EB7-C79C-42B9-6FF0-E06C72EF2623
-File ::99A56CA8-60A5-CC90-1F6F-0A393722F9D2 -name qsvgicon4.dll.manifest -parent 01034EB7-C79C-42B9-6FF0-E06C72EF2623
-File ::7FC7557D-E1AF-082B-7286-24939CD5EE76 -name IM_MOD_RL_sfw_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::71A18B69-E38B-AB9F-3B81-BECFD4454D38 -name PyQt4.QtNetwork.pyd -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::F6C99732-1835-1C2A-02F9-F2BB631BEC81 -name dde.pyd -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::20079501-EBD5-FEFD-8E49-2CF6A63E83E0 -name IM_MOD_RL_rle_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::470243F6-C8E4-DB45-678F-6A314747097E -name sqlite3.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::0213D597-D9C7-F155-EE44-1BD9E19520E3 -name IM_MOD_RL_tiff_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::F782E3D0-C2CA-481C-70C4-2257FEF52EAF -name CORE_RL_libxml_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::9306B7C1-11DE-7B54-1AFB-67AFF82B8013 -name _sqlite3.pyd -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::4D6B4FC9-F900-E0AD-5258-8918CBFEB9AD -name lrs2lrf.exe.local -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::A2AF7001-960E-F5EA-AA09-025E35FD09BC -name IM_MOD_RL_sun_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::C472ABCF-2160-C218-41CA-0DDE625AAEC6 -name IM_MOD_RL_msl_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::DC7D8C3A-81C2-7FC5-4AC0-8CDC4069FC97 -name IM_MOD_RL_jp2_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::555AF3FA-9A08-CCFF-4028-3F8891A6D212 -name CORE_RL_ttf_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::92F06FE6-C2C5-FF23-0A9B-884AB21D8221 -name PIL._imagingft.pyd -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::ED8542BE-DDE4-72B2-B05A-A09D00818994 -name web2disk.exe -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::A2154B84-F146-FD50-1DA9-1DB374A5439E -name IM_MOD_RL_exr_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::A442B5C3-724F-6542-816D-30C3D3EDD1E3 -name CORE_RL_Magick++_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::A18318B3-88EF-11EB-4E14-B02CBD4F0E5E -name calibre-parallel.exe.local -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::E26C9A86-F12B-7F1E-F2E8-8A42C0436321 -name IM_MOD_RL_dib_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::2E94EBE2-F588-C484-009C-48C0DA7D1932 -name IM_MOD_RL_preview_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::7294280B-8324-B1A0-A054-92F330874F48 -name numpy.fft.fftpack_lite.pyd -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::74DC3F8D-5C56-8FB8-F59A-0C4C5ECB70A0 -name CORE_RL_magick_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::1638722F-A861-F762-1514-5649B2AD08FF -name IM_MOD_RL_svg_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::D345F98D-EDB4-53D0-95A6-82968E47E080 -name IM_MOD_RL_mpeg_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::91CA5392-5F4E-12F7-C670-939B1500616B -name ebook-viewer.exe.local -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::4706580D-D101-13EA-DED0-2593D7FBADE8 -name LICENSE -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::89CAC9B2-DA65-DBF2-6295-757553882213 -name numpy.core.umath.pyd -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::2F90282D-B59F-B6BA-090B-45858AF7F3B2 -name IM_MOD_RL_clipboard_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::B512D139-B295-D7C3-F0B4-43775849CF58 -name numpy.core._sort.pyd -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::A2C063AC-2F12-9260-501A-0E8BD0B8A932 -name calibre.exe.local -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::439B6D05-7DE6-061D-4BCC-3F04F4FA2FA2 -name IM_MOD_RL_png_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::BA464D11-BBCE-DEDA-C354-0C7BE60FAA05 -name IM_MOD_RL_braille_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::8F9FF823-AF6D-A288-8AE6-7D74F55DCE29 -name CORE_RL_bzlib_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::57A3F5D5-BFC8-CB38-5A57-548EE0DB033B -name QtNetwork4.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::4DB7E8DE-905A-822A-AF14-17BD5ACEF915 -name IM_MOD_RL_wmf_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::559057ED-0FEA-62A1-68C2-023116B5636C -name win32ui.pyd -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::83F3AC3F-A485-B791-D4F0-6E67135FF19D -name IM_MOD_RL_txt_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::FABA7768-743B-08F7-B871-ED5E9082DF38 -name win32gui.pyd -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::C49805D2-C0B8-01C4-DF6F-674D9C0BFD15 -name IM_MOD_RL_viff_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::826F1915-9F97-59DD-6637-3EEC0744A79C -name IM_MOD_RL_ps2_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::A5F23791-BCDC-A997-4941-5D1F2F227E6D -name type.xml -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::0A1C107A-C0AA-3ED6-4F37-A6894386DCBE -name IM_MOD_RL_ps3_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::2655F4FC-F682-46D8-B75C-6AF322323EF5 -name IM_MOD_RL_dot_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::176456BB-237C-9EBE-60E1-D8F78AAFFEC8 -name IM_MOD_RL_xwd_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::9AE8498B-C89C-8B12-B8A1-35E1B6650469 -name lxml.objectify.pyd -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::EA37C1C2-57BB-4E7A-C004-0010D79142C2 -name IM_MOD_RL_fits_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::05F5C10D-6988-F1F4-A486-86C96DB20302 -name pywintypes26.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::0137A2B1-EB94-EB26-7295-0C7CD941A1DF -name IM_MOD_RL_histogram_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::5BB7579D-9183-412C-81F8-B411B07C57B3 -name IM_MOD_RL_pnm_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::97B8BB83-7772-D87B-C8D1-5215E324AF2C -name library.ico -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::DF1361A2-2580-EFBF-65D2-156AD9919DE1 -name library.zip -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::A6419A84-6C22-784E-6D84-D09972770770 -name unicodedata.pyd -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::E658FBE0-5860-D041-12D3-76ADD18F804B -name servicemanager.pyd -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::C98A6FC4-E341-7FD4-005C-DA2B384E11D8 -name win32api.pyd -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::ADA36EEA-7DE1-447C-B1AB-A4908E65E2CD -name IM_MOD_RL_ipl_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::EDE6F457-C83F-C5FA-9AF4-38FDFF17D929 -name PIL._imagingtk.pyd -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::09D0906E-3611-3DB7-32CF-A140585694A7 -name win32pdh.pyd -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::4C84F0DC-7157-0C90-2062-180139B03E25 -name IM_MOD_RL_rgb_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::A732EDE7-4796-241F-BECA-68E59F88F8AF -name lrs2lrf.exe -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::69072379-7D16-B9F7-9F39-3E6403C48267 -name IM_MOD_RL_xbm_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::FBD11D98-D1E7-5DD9-BF02-01CE92518859 -name IM_MOD_RL_otb_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::8D0CFD32-2B7F-2BB3-8FA0-760A8DB24B52 -name win32service.pyd -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::C7F9AB12-AAF7-2954-3DB6-F2C84F41655B -name win32clipboard.pyd -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::62CD997A-A5C7-D71B-A8F7-54567B36A071 -name msvcp90.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::7D76BBE6-FD20-1290-4DBA-93D14FC45B81 -name sip.pyd -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::D4354621-69ED-DFCB-068A-0812DB1C09C3 -name IM_MOD_RL_avi_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::EAFAC6D5-A7E8-1843-6D98-6663D899BB11 -name PyQt4.QtCore.pyd -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::155505A4-F0D8-05B2-10AD-149E178976A4 -name calibredb.exe -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::39D5114E-1E70-5402-7E19-D86490678506 -name CORE_RL_lcms_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::388E0308-35A8-69B9-6837-383FD72E99E9 -name IM_MOD_RL_xpm_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::43C0DE14-A935-2139-6690-256C49C461C4 -name IM_MOD_RL_xcf_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::E185A35A-93DB-61BB-E7EE-2C2222FD4939 -name win32security.pyd -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::498CCC26-383A-87CA-30C0-626D52555B37 -name librarything.exe.local -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::404A98F1-84FD-B6D0-B130-354EECD9253C -name IM_MOD_RL_emf_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::17034C34-403E-B405-99C1-F80B7F00E27C -name log.xml -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::34E63A2C-65C5-0A84-ACF1-BD6A844D4579 -name pythoncom26.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::2F20484B-53B8-B08E-B691-C5B2D49A9CB4 -name QtWebKit4.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::E8A4442D-D0D3-31CD-997A-3CEB641CF5B7 -name IM_MOD_RL_mtv_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::0CA87D0B-5A04-1439-AEE8-C97072D47BA7 -name CORE_RL_tiff_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::AC24F520-88D4-D1CF-5797-27C715CE8ACA -name pyexpat.pyd -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::16848F38-71CD-55B8-4D96-1537F6773744 -name IM_MOD_RL_dps_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::81116DD3-1715-AA87-472F-544FC616EDAF -name IM_MOD_RL_dcm_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::335A4CFB-5C2D-44E4-C438-7018E8244C3D -name ebook-viewer.exe -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::62A16C3B-ED9C-5187-2807-58857DF3A990 -name calibre-debug.exe -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::55ECA7B7-279A-F51D-81C2-C8DC44CF0E22 -name select.pyd -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::A6AF5ECC-A981-4CBD-DBEE-303A9340C603 -name IM_MOD_RL_xps_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::5BCBF71F-18E7-5C52-E3F5-7D7F3028AD46 -name locale.xml -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::5C9FA94C-B8B0-A94B-548D-1D24FDEA5770 -name CORE_RL_wand_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::E39E60BE-DE77-AB8C-42C6-5A7D7DC073E3 -name IM_MOD_RL_ttf_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::D8F566FB-93DA-3128-5DBD-DF1068B3E3ED -name IM_MOD_RL_dpx_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::FFE5F178-A1A4-3691-9C88-E5109D144437 -name IM_MOD_RL_jpeg_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::03665A74-B895-EB3D-EBA0-2D2B6D26DDDA -name PIL._imagingmath.pyd -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::81AED538-B97F-6272-5C6E-9B27D7285B35 -name IM_MOD_RL_fax_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::BDCCAEC0-4847-B8D8-50B1-1B434B73A01F -name IM_MOD_RL_avs_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::727B9BD6-B55E-386E-D3B9-D99D0D9ADBB1 -name QtGui4.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::1C7421A2-1BA7-7807-EB41-67578E0302E8 -name IM_MOD_RL_mvg_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::C3466B70-23C3-31C9-3B4F-1B3B56E4D013 -name markdown-calibre.exe.local -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::6ED1C675-C4D5-6BFF-7C8A-9AB4BF39D00C -name _hashlib.pyd -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::21F7F333-3063-71E3-85F5-5C88584B15CC -name IM_MOD_RL_tga_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::26741B21-C241-E100-8BB1-8B679BC3E662 -name configure.xml -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::476CB977-5155-D56F-26CA-EB243AEBBA99 -name unrar.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::2E2A9EDA-5386-444E-8479-557386794552 -name IM_MOD_RL_uil_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::D3301E15-1B1A-E2AB-1B04-30A601B3FB44 -name IM_MOD_RL_cut_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::181B28B9-CF13-0C28-8380-B39DF6E7397D -name markdown-calibre.exe -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::BC1D2D23-48ED-ECFF-2180-37C83554FDED -name Xext.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::15289622-D0DC-4F61-4990-AF6CA73C3F8C -name IM_MOD_RL_scr_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::76594353-4D68-08A0-B2AD-B3BA58FABB75 -name IM_MOD_RL_map_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::E0F9749A-2B00-4A6C-ABB0-9AD1910A81A6 -name lxml.etree.pyd -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::5BFB62EB-32B6-EA16-752E-2F29CC9B6202 -name numpy.random.mtrand.pyd -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::452196C8-28B2-4BA4-1F00-27C3C0BDDC04 -name thresholds.xml -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::DE476170-B65E-B429-A23C-F822E4190FFC -name IM_MOD_RL_thumbnail_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::31E46936-560D-1E88-8FC1-F8E590D2FD02 -name IM_MOD_RL_mpc_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::0C04692E-5DCF-864F-6640-2FF5BF12BA91 -name IM_MOD_RL_cmyk_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::A620FEB9-39FE-B102-6963-FEDA25EBF2F1 -name IM_MOD_RL_pcd_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::80D1F9CA-D7DA-578E-CE25-4E0EE988D280 -name IM_MOD_RL_sct_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::C85307C1-5F11-01EF-2193-95F37CB49822 -name IM_MOD_RL_pict_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::3ECF2FC0-91AA-9573-42B3-4BD784FA5BC9 -name IM_MOD_RL_gradient_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::544BC0E6-66E4-EB06-CCD5-A172F230C83E -name IM_MOD_RL_icon_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::305631EA-9397-0384-259C-643046B72E44 -name X11.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::CBF83E89-39E0-D7C3-7902-A4A0ADCDEF48 -name IM_MOD_RL_jbig_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::FFF32C7F-BB57-4BB3-A52D-4E4F3496B967 -name calibre-debug.exe.local -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::80A3C65A-553D-EA27-FAED-4F831578F4F8 -name magic.xml -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::E2DF0DC3-3372-3CDF-5177-5B3F3BF84E66 -name IM_MOD_RL_mat_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::4D938678-59AF-F5F6-697B-E3A5BE76B43B -name QtXml4.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::0A5A70A8-39EC-B733-E807-9C358E5EA7A3 -name IM_MOD_RL_meta_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::E6419523-253A-3052-B9B4-0EA792EF4A64 -name pdftohtml.exe.local -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::EF062C24-09D8-1DC8-891A-F9563BBA57C2 -name IM_MOD_RL_gray_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::0E21E0B1-C2D4-3F6D-E788-9EEB821128C3 -name web2disk.exe.local -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::27127583-9DC6-4397-3E86-052A515ED051 -name lrfviewer.exe.local -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::396B4F78-FB45-C0B2-ACB3-97769CF5CD5D -name msvcr90.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::1DE767EE-4891-4E54-422D-67A4DFF8C3B5 -name lrfviewer.exe -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::AFFEC28A-615C-E3E6-0026-CCE2594A6D25 -name calibre-server.exe.local -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::2C64F86B-9366-B52D-F7B2-5BBD51F6982A -name IM_MOD_RL_pwp_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::F4B2EF9C-EB18-B865-6E99-75CFB9B60D87 -name IM_MOD_RL_dds_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::38770D87-6CA9-9E3E-FBA1-A8CCFCD88FB5 -name IM_MOD_RL_fpx_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::BE2D7BC3-D294-AF3F-65E7-3B372DEFDE36 -name PIL._imaging.pyd -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::200B9AEC-809F-75B7-DC12-A51BFC2A6F93 -name PyQt4.QtSvg.pyd -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::52132A31-D3AE-C617-7568-BF2AF46B5D74 -name IM_MOD_RL_pcl_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::F94472C3-C8D0-950F-5ED9-1611D1CE30E5 -name IM_MOD_RL_inline_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::055ADB4B-20C5-E071-442F-4DA0A8D6F3C5 -name english.xml -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::B10B6B91-0C03-642D-90D8-37B607B164AD -name IM_MOD_RL_wpg_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::BFBB144B-1794-8304-9772-F103A42F2CA4 -name IM_MOD_RL_pdb_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::2FE2FF56-5CF5-15B7-2BD8-32100DF421DC -name _ssl.pyd -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::AE47BDA8-A1E5-2E84-28D7-DF8A84B18202 -name Microsoft.VC90.CRT.manifest -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::A6B1C213-DC68-B7C3-8EDE-806286829899 -name w9xpopen.exe -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::D3E03CFA-4AF0-93FB-E04B-B282926099E0 -name IM_MOD_RL_label_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::662783C0-3826-9869-8EB8-326B363D3686 -name IM_MOD_RL_clip_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::442D92A7-97B1-74BC-F150-A9992A925356 -name numpy.core.multiarray.pyd -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::54991918-D11F-EEAD-F7E3-0EE28F22249E -name IM_MOD_RL_pix_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::069E7552-C005-26F6-2837-CDDDC0159183 -name win32wnet.pyd -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::071C5A61-CAC7-1136-DCD5-B2C0847A004A -name colors.xml -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::F209A2F0-ED6A-E241-E351-4CA8A539F2BA -name perfmon.pyd -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::74DDFF28-013C-4C41-CCE7-0CAD45F7D6B4 -name IM_MOD_RL_cin_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::5CB76241-5682-AE44-82D3-A6C8C66B88D6 -name IM_MOD_RL_bmp_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::A843E4DA-8671-C4F7-BA61-998AA1D278C8 -name numpy.linalg.lapack_lite.pyd -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::908EA762-5568-17BE-D77D-5DE5551895D0 -name IM_MOD_RL_raw_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::CC186E15-8751-A4AA-B2A7-D2E522F1F9DF -name lrf2lrs.exe.local -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::A99CACD7-FE57-8A5E-BAA1-2D8B41925593 -name IM_MOD_RL_cip_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::C4649D7A-9312-8984-E7CD-A0AB794C5A8E -name IM_MOD_RL_pdf_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::B50467F0-07D0-B634-EB43-C4B721798A84 -name analyze.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::47658BFB-7389-6866-359E-7517C18E768D -name IM_MOD_RL_mpr_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::3F6735E8-D4E6-A6F9-C9F8-4219E6BBC827 -name CORE_RL_jpeg_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::918BE500-1E97-90C0-3FB3-4056FE8D0E15 -name IM_MOD_RL_wbmp_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::D59F7D54-24A7-774D-79EB-423A64E8CB21 -name IM_MOD_RL_stegano_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::17F9A868-E52D-F961-9DB7-8AC69BA702EA -name CORE_RL_jp2_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::878003DC-9B1D-7C58-29F8-14D4565ABA64 -name IM_MOD_RL_yuv_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::602B3244-CF6C-F934-E86C-8161800DB150 -name coder.xml -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::C23261F0-19EA-2216-A8D6-45FCC4ECBECE -name win32file.pyd -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::100103F9-C269-9B03-A133-7D046DCC5B30 -name IM_MOD_RL_null_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::9BEE3580-3674-F4AE-C1F3-B8623E0E4FC8 -name IM_MOD_RL_pattern_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::58F70BF7-491E-38D1-B836-1BBF340AA602 -name IM_MOD_RL_plasma_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::4B6C22CD-D139-FCAB-45FB-E9B7DADFFFED -name win32process.pyd -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::9698339D-6A1E-7CBC-A772-C9C4B10418BC -name librarything.exe -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::A3F1DC1C-BEF6-CB6B-F7AC-39F34F4DFABD -name IM_MOD_RL_pcx_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::BE44B72D-2ED1-4983-F652-DE8814401946 -name CORE_RL_xlib_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::EC5B5C55-8347-0A8C-E9B5-28E45680E2F2 -name IM_MOD_RL_caption_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::519BA66E-0CD3-00EA-0932-8D225C4C7EC8 -name calibredb.exe.local -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::B7E13F99-C8D3-F2FB-1E5F-E8530A77BB71 -name IM_MOD_RL_url_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::D0762C72-29E8-85CC-8550-6AC9E9AE39E9 -name _win32sysloader.pyd -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::4921649D-06BD-A568-3879-BD2D94423FCB -name pdftohtml.exe -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::2D4976D6-B0ED-C239-5461-70A711A018BE -name QtCore4.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::AA761ACD-B728-2324-AA75-B20A2A79F125 -name lrf2lrs.exe -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::95434C76-22F5-B9CE-6194-6E1B1EE3232D -name IM_MOD_RL_info_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::AAF45D03-322F-5553-63A7-312DB754A20B -name _ctypes.pyd -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::C3D351CA-A8D8-AB35-55D9-5AACF8DB37D1 -name python26.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::B50B66A1-FB65-FAD5-1DD7-E894ACC07464 -name QtSvg4.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::906FF13D-D993-7192-7EA5-6D15A5A24BFB -name CORE_RL_png_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::5D368661-6BF0-D6AF-7C1A-87646864EB4B -name delegates.xml -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::6BB7B9CF-131D-3B0A-3A23-21BF168D78A4 -name win32event.pyd -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::9BA85EE5-1754-67AF-736D-481CDCC72DD2 -name _imagingft.pyd -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::6254DD0C-8F2C-D4AE-2107-2597D542C181 -name IM_MOD_RL_matte_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::F159D566-88D6-C347-3E3C-55C2DDFC5FD0 -name IM_MOD_RL_mono_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::B873CAA2-011F-94C3-7977-FF344E53C44F -name CORE_RL_jbig_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::6921F62A-4015-4C9F-98A6-BCBBC43B698E -name msvcm90.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::7276E0CA-C205-4B18-19A3-157F1B8523FB -name IM_MOD_RL_xtrn_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::7B9624A9-88B4-C61E-6771-9A34FB6CA3B5 -name PyQt4.QtGui.pyd -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::80EC4265-6F3B-7F74-F995-4FA85E87A877 -name IM_MOD_RL_vicar_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::4CDC2DC5-5A3D-B773-A338-3E12E8C5BB9D -name IM_MOD_RL_psd_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::4AF4C7B2-8926-4581-2896-C6436460C81F -name IM_MOD_RL_uyvy_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::BF71D048-1137-4453-960C-9267CB790EAD -name IM_MOD_RL_art_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::D9B6371C-332C-45FB-DAEE-1A247130F704 -name calibre-customize.exe -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::605E727F-DE13-27FE-75C0-34567C468B18 -name calibre-parallel.exe -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::37306B68-BABB-418C-A2CA-BAF4E439D3F1 -name viewer.ico -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::6092C5A2-8740-2769-DB77-E0B664CD19EC -name PyQt4.QtWebKit.pyd -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::73C82473-A35A-23B8-067C-AA3120D1CEE2 -name win32pipe.pyd -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::F269DBE1-334B-2108-31C2-E28664703103 -name _imaging.pyd -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::1FF92E56-1C02-1600-8FF5-24B25DD40A51 -name IM_MOD_RL_ycbcr_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::B863CAFC-1205-0F3B-949A-68310B7F3EDB -name type-ghostscript.xml -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::931C4A8D-5B70-AC18-605E-DE89810C778E -name IM_MOD_RL_x_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::5BF8A346-2EC6-E5E0-063F-6FB02F84FCAC -name IM_MOD_RL_dng_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::19891B45-E756-8755-9156-FA8CB87AD057 -name IM_MOD_RL_html_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::BC81419A-A3B0-45B4-6672-7EB91B249786 -name IM_MOD_RL_tim_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::4E37CF0F-60E7-5CA5-D9FB-C9CD211B8A94 -name IM_MOD_RL_tile_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::D6A57A60-DCB9-BA5C-14BD-5C6143CF34C5 -name numpy.lib._compiled_base.pyd -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::E2573481-3079-D789-64A6-CC6EA121F7B4 -name IM_MOD_RL_xc_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::F7129083-E586-0227-69C1-63D832794884 -name CORE_RL_zlib_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::29022F2B-4E69-8624-2B2C-98A40E12DC0A -name calibre-server.exe -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::7592A236-4835-6A9D-56B1-78985267D9AD -name win32console.pyd -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::05F4A6BD-A7C3-5108-4708-1524EB0628D9 -name calibre.exe -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::DEB8E703-365E-A7BB-2315-6306B2E5C978 -name win32evtlog.pyd -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::AB44B44C-E258-A5AB-9511-8D0FBB456EE8 -name IM_MOD_RL_gif_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::5D5F2AAD-6668-5E14-B84C-5D80C4CCC968 -name calibre-customize.exe.local -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::9A0C05D0-26E3-72C5-1F04-76F76ABB180F -name numpy.core.scalarmath.pyd -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::0888A744-B049-01E8-6AC8-ECC3EE2CEFE6 -name IM_MOD_RL_sgi_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::4AEEBBED-E749-15A9-E1F7-9F6BE2A2C3D0 -name _socket.pyd -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::35B19292-0C50-4AEE-0A79-B2F3BC34B529 -name w9xpopen.exe.local -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::E2C2739C-56B3-E2D0-A1DA-0E3FC3087924 -name IM_MOD_RL_ept_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::C6C5BD2D-887F-5D79-F8B5-C6041C0AEF3C -name PyQt4.Qt.pyd -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::8CD7A1E2-9139-8FE7-AAF5-E18B2A6825F2 -name bz2.pyd -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::EBF917FB-15F6-9B3E-5C37-AB0B1D50C64D -name IM_MOD_RL_palm_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::A5500C64-121C-4419-9E3D-F698FE462AE8 -name IM_MOD_RL_ps_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::ADBFA663-E232-7AC1-34A1-700D056E143A -name IM_MOD_RL_miff_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::325F545D-30A8-08DA-74F0-AC1244F6C1D9 -name IM_MOD_RL_vid_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::24238371-77D0-0A8F-35D1-498A5FCC1B0D -name IM_MOD_RL_rla_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::6F5D62F3-5E63-0753-364C-01CAAF1002E0 -name IM_MOD_RL_magick_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::9FDAC308-5D4F-A865-A09A-9FBF48162A47 -name IM_MOD_RL_djvu_.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::5D748040-5973-EFF1-41FC-B424636C642E -name fetch-ebook-metadata.exe.local -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::8B8655B8-3823-AA02-1CDA-02F5AD4677C0 -name fetch-ebook-metadata.exe -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::8FC3D58A-F3FA-A2D1-711F-F4C3128620CE -name podofo.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::88034147-A376-B759-D48C-5F17A47E8CC3 -name ebook-meta.exe.local -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::6E6F2A97-6614-F2A6-1751-95C099B909FD -name pdfmanipulate.exe.local -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::BA087530-7CF4-5460-C9AA-DE4A796C9AEB -name pdfmanipulate.exe -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::6AF80BFC-A813-074D-897A-856744A91949 -name ebook-convert.exe.local -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::F8C59A30-9E90-0861-5604-95E7C69C3C80 -name ebook-convert.exe -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::9389D511-7BF3-4D72-C78E-4F98DCE8F723 -name calibre-smtp.exe -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::36E9023D-CCBC-9C59-CDA3-71A4D3203B25 -name ebook-meta.exe -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::B757AEB8-74A7-1EA8-AC7C-C2B5F690B539 -name ebook-device.exe -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::CD137106-C058-6035-57F3-420F9540386E -name _multiprocessing.pyd -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::7930C2FB-1C6F-3CFB-D8C6-BC677D96045F -name zlib1.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::7FDFCBEF-0687-FDA5-F5B7-632966E87BD3 -name calibre-complete.exe -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::0450D3E0-07EB-F81F-DA39-038494E4C8FE -name win32com.shell.shell.pyd -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::8D7A36A6-4517-E995-E989-2E522E7A1438 -name calibre-smtp.exe.local -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::9E4E5E8F-30C0-E631-9516-2AE01A5CA0E9 -name ebook-device.exe.local -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::7BE6B538-70D5-A7EB-5F91-E14CE57B394B -name calibre-complete.exe.local -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::C4E40030-3EE0-8B05-E6B9-89E81433EE1F -name phonon4.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::B1560042-C99B-9803-552E-21C15F0DFD85 -type dir -name resources -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::DEDE8BE9-D712-2770-A1EC-7E9164CC6D29 -name libpng12.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::2A8619DB-B715-CBF8-E711-C6B0C5FD9EF4 -name _elementtree.pyd -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::F92DE458-3417-3474-E0E0-C2CB98CA452A -name libxml2.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::5243CC78-8F58-46D6-4CDB-98FE073F4966 -name libxml2.dll.manifest -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::6C13AD7D-4C52-05F7-21D7-6258D4ECD542 -name freetype.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::800D9AFB-00CF-043C-0096-77BB4A2CD629 -name fontconfig.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::3B4975F7-B38C-895A-F11F-04BDF303309E -name jpeg.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::BA7F0DB8-28CB-9E0C-AA32-C10A729813D5 -name libexpatw.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::54736356-200D-EE7B-5D46-62B198B8AAF5 -name libexpat.dll -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::620D5BA9-9652-2032-ED10-D3958F594AF4 -type dir -name fontconfig -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-File ::57DAE30B-1BBA-0D0B-8DB0-DCE473520E9C -name zlib1.dll.manifest -parent 8E5D85A4-7608-47A1-CF7C-309060D5FF40
-Component ::F6829AB7-9F66-4CEE-CA0E-21F54C6D3609 -setup Install -active Yes -platforms {AIX-ppc FreeBSD-4-x86 FreeBSD-x86 HPUX-hppa Linux-x86 Solaris-sparc Windows FreeBSD-5-x86 FreeBSD-6-x86 FreeBSD-7-x86 Linux-x86_64 Solaris-x86} -name Main -parent Components
-SetupType ::D9ADE41C-B744-690C-2CED-CF826BF03D2E -setup Install -active Yes -platforms {AIX-ppc FreeBSD-4-x86 FreeBSD-x86 HPUX-hppa Linux-x86 Solaris-sparc Windows FreeBSD-5-x86 FreeBSD-6-x86 FreeBSD-7-x86 Linux-x86_64 Solaris-x86} -name Typical -parent SetupTypes
-
-InstallComponent 3EA07B17-04D8-6508-B535-96CC7173B49A -setup Install -type pane -conditions D7F585DB-0DEC-A94E-DAB0-94D558D82764 -title {Welcome Screen} -component Welcome -command insert -active Yes -parent StandardInstall
-Condition D7F585DB-0DEC-A94E-DAB0-94D558D82764 -active Yes -parent 3EA07B17-04D8-6508-B535-96CC7173B49A -title {Execute Script Condition} -component ExecuteScriptCondition -TreeObject::id D7F585DB-0DEC-A94E-DAB0-94D558D82764
-InstallComponent 7CCDA4BB-861C-C21E-3011-E93DB58F07D6 -setup Install -type action -conditions ADBCD53E-C9A6-A3CA-1AAC-0DB0CE84F71E -title {Check for Previous Install} -component CheckForPreviousInstall -command insert -active Yes -parent 3EA07B17-04D8-6508-B535-96CC7173B49A
-Condition ADBCD53E-C9A6-A3CA-1AAC-0DB0CE84F71E -active Yes -parent 7CCDA4BB-861C-C21E-3011-E93DB58F07D6 -title {Execute Script Condition} -component ExecuteScriptCondition -TreeObject::id ADBCD53E-C9A6-A3CA-1AAC-0DB0CE84F71E
-InstallComponent 580ACF2C-517F-5E48-9DEF-7DAEFBA59FDD -setup Install -type action -conditions 6DE3B369-9D6B-6BC1-4EA0-2C54ECE159EB -title {Set Virtual Text} -component SetVirtualText -command insert -active Yes -parent 3EA07B17-04D8-6508-B535-96CC7173B49A
-Condition 6DE3B369-9D6B-6BC1-4EA0-2C54ECE159EB -active Yes -parent 580ACF2C-517F-5E48-9DEF-7DAEFBA59FDD -title {String Is Condition} -component StringIsCondition -TreeObject::id 6DE3B369-9D6B-6BC1-4EA0-2C54ECE159EB
-InstallComponent 9ACCDC35-E034-F142-ED42-AC8EC2B9AE2D -setup Install -type pane -title {License Agreement} -component License -active Yes -parent StandardInstall
-InstallComponent AAEC34E6-7F02-18F2-30BB-744738192A3B -setup Install -type action -conditions {081A479A-572E-5133-4979-84456DB40EFA A4388F3F-0D32-F14E-BA00-1BE7F54B05ED} -title {Modify Widget} -component ModifyWidget -command insert -active Yes -parent 9ACCDC35-E034-F142-ED42-AC8EC2B9AE2D
-Condition 081A479A-572E-5133-4979-84456DB40EFA -active Yes -parent AAEC34E6-7F02-18F2-30BB-744738192A3B -title {String Is Condition} -component StringIsCondition -TreeObject::id 081A479A-572E-5133-4979-84456DB40EFA
-Condition A4388F3F-0D32-F14E-BA00-1BE7F54B05ED -active Yes -parent AAEC34E6-7F02-18F2-30BB-744738192A3B -title {String Is Condition} -component StringIsCondition -TreeObject::id A4388F3F-0D32-F14E-BA00-1BE7F54B05ED
-InstallComponent 6661142D-D174-F52E-CD1D-6BFB3649BC64 -setup Install -type pane -conditions {B3F43ECF-D504-F7A0-45FE-A735D202B6F0 9E0D138E-5FFC-0F18-F110-F093644E4DD2} -title {Select Destination} -component SelectDestination -command insert -active Yes -parent StandardInstall
-Condition B3F43ECF-D504-F7A0-45FE-A735D202B6F0 -active Yes -parent 6661142D-D174-F52E-CD1D-6BFB3649BC64 -title {Script Condition} -component ScriptCondition -TreeObject::id B3F43ECF-D504-F7A0-45FE-A735D202B6F0
-Condition 9E0D138E-5FFC-0F18-F110-F093644E4DD2 -active Yes -parent 6661142D-D174-F52E-CD1D-6BFB3649BC64 -title {File Permission Condition} -component FilePermissionCondition -TreeObject::id 9E0D138E-5FFC-0F18-F110-F093644E4DD2
-InstallComponent 28FDA3F4-B799-901F-8A27-AA04F0C022AB -setup Install -type pane -title {Copying Files} -component CopyFiles -active Yes -parent StandardInstall
-InstallComponent A75C97CC-01AC-C12A-D663-A54E3257F11B -setup Install -type action -title {Disable Buttons} -component ModifyWidget -active Yes -parent 28FDA3F4-B799-901F-8A27-AA04F0C022AB
-InstallComponent B6D03F99-8B73-BE6E-1050-721B286D3D60 -setup Install -type action -title {Execute Action} -component ExecuteAction -active Yes -parent 28FDA3F4-B799-901F-8A27-AA04F0C022AB
-InstallComponent 91AB3DE5-D61C-522D-5B3B-F2953E1DE771 -setup Install -type action -title {Move Forward} -component MoveForward -active Yes -parent 28FDA3F4-B799-901F-8A27-AA04F0C022AB
-InstallComponent 8A7FD0C2-F053-8764-F204-4BAE71E05708 -setup Install -type pane -title {Setup Complete} -component SetupComplete -active Yes -parent StandardInstall
-InstallComponent 710F2507-2557-652D-EA55-440D710EFDFA -setup Install -type action -conditions {69188956-D764-5B26-B048-46A4239C3733 08195201-0797-932C-4B51-E5EF9D1D41BD 2E18F4AE-F1BB-5C62-2900-73A576A49261} -title {Install USB Driver} -component ExecuteExternalProgram -command insert -alias {Install USB Driver} -active Yes -parent 8A7FD0C2-F053-8764-F204-4BAE71E05708
-Condition 69188956-D764-5B26-B048-46A4239C3733 -active Yes -parent 710F2507-2557-652D-EA55-440D710EFDFA -title {Platform Condition} -component PlatformCondition -TreeObject::id 69188956-D764-5B26-B048-46A4239C3733
-Condition 08195201-0797-932C-4B51-E5EF9D1D41BD -active Yes -parent 710F2507-2557-652D-EA55-440D710EFDFA -title {String Is Condition} -component StringIsCondition -TreeObject::id 08195201-0797-932C-4B51-E5EF9D1D41BD
-Condition 2E18F4AE-F1BB-5C62-2900-73A576A49261 -active Yes -parent 710F2507-2557-652D-EA55-440D710EFDFA -title {String Is Condition} -component StringIsCondition -TreeObject::id 2E18F4AE-F1BB-5C62-2900-73A576A49261
-InstallComponent 21B897C4-24BE-70D1-58EA-DE78EFA60719 -setup Install -type action -conditions 76FA3CA2-1F09-75C5-C6CF-72719A8EC4A5 -title {Message Box} -component MessageBox -command insert -active Yes -parent 8A7FD0C2-F053-8764-F204-4BAE71E05708
-Condition 76FA3CA2-1F09-75C5-C6CF-72719A8EC4A5 -active Yes -parent 21B897C4-24BE-70D1-58EA-DE78EFA60719 -title {String Is Condition} -component StringIsCondition -TreeObject::id 76FA3CA2-1F09-75C5-C6CF-72719A8EC4A5
-InstallComponent 940F7FED-7D20-7264-3BF9-ED78205A76B3 -setup Install -type action -conditions {96440B8B-C6D0-FCCA-6D3C-7ECE1C304CC0 FBA33088-C809-DD6B-D337-EADBF1CEE966} -title {Desktop Shortcut Checkbutton} -component AddWidget -command insert -active Yes -parent 8A7FD0C2-F053-8764-F204-4BAE71E05708
-Condition 96440B8B-C6D0-FCCA-6D3C-7ECE1C304CC0 -active Yes -parent 940F7FED-7D20-7264-3BF9-ED78205A76B3 -title {File Exists Condition} -component FileExistsCondition -TreeObject::id 96440B8B-C6D0-FCCA-6D3C-7ECE1C304CC0
-Condition FBA33088-C809-DD6B-D337-EADBF1CEE966 -active Yes -parent 940F7FED-7D20-7264-3BF9-ED78205A76B3 -title {String Is Condition} -component StringIsCondition -TreeObject::id FBA33088-C809-DD6B-D337-EADBF1CEE966
-InstallComponent 27B44808-381F-7202-A0D9-40788CD679D0 -setup Install -type action -conditions {1039BE84-4163-2FCB-9798-D85E6C37B668 657FDE96-809B-821F-3294-15E637B85E6E B7F0CB71-720B-7DC9-5C5E-AA1AF92D78E2} -title {Quick Launch Shortcut Checkbutton} -component AddWidget -command insert -active Yes -parent 8A7FD0C2-F053-8764-F204-4BAE71E05708
-Condition 1039BE84-4163-2FCB-9798-D85E6C37B668 -active Yes -parent 27B44808-381F-7202-A0D9-40788CD679D0 -title {Platform Condition} -component PlatformCondition -TreeObject::id 1039BE84-4163-2FCB-9798-D85E6C37B668
-Condition 657FDE96-809B-821F-3294-15E637B85E6E -active Yes -parent 27B44808-381F-7202-A0D9-40788CD679D0 -title {File Exists Condition} -component FileExistsCondition -TreeObject::id 657FDE96-809B-821F-3294-15E637B85E6E
-Condition B7F0CB71-720B-7DC9-5C5E-AA1AF92D78E2 -active Yes -parent 27B44808-381F-7202-A0D9-40788CD679D0 -title {String Is Condition} -component StringIsCondition -TreeObject::id B7F0CB71-720B-7DC9-5C5E-AA1AF92D78E2
-InstallComponent FAE98A0F-B6A9-30D2-A9EA-33F9D5F8B3D0 -setup Install -type pane -title {Copying Files} -component CopyFiles -active Yes -parent DefaultInstall
-InstallComponent 5C66451D-6042-DBDE-0D8C-31156EE244AD -setup Install -type action -title {Disable Buttons} -component ModifyWidget -active Yes -parent FAE98A0F-B6A9-30D2-A9EA-33F9D5F8B3D0
-InstallComponent A05E9D13-9686-83DD-C6AD-2A4D912C5B81 -setup Install -type action -title {Execute Action} -component ExecuteAction -active Yes -parent FAE98A0F-B6A9-30D2-A9EA-33F9D5F8B3D0
-InstallComponent 137ED7CE-70C6-DEC3-4929-CAE747038617 -setup Install -type action -title {Move Forward} -component MoveForward -active Yes -parent FAE98A0F-B6A9-30D2-A9EA-33F9D5F8B3D0
-InstallComponent A5A97363-4CD6-4A6A-3D39-6EFC56BA9D39 -setup Install -type pane -title {Setup Complete} -component SetupComplete -active Yes -parent DefaultInstall
-InstallComponent 7C57D3D3-B1DB-0888-B098-B46AD4F99F7E -setup Install -type action -conditions {37A46164-C287-5D4A-E55A-A2329E25E829 CFBE4459-450B-1FAB-3422-609544334AA2} -title {Launch Application Checkbutton} -component AddWidget -command insert -active Yes -parent A5A97363-4CD6-4A6A-3D39-6EFC56BA9D39
-Condition 37A46164-C287-5D4A-E55A-A2329E25E829 -active Yes -parent 7C57D3D3-B1DB-0888-B098-B46AD4F99F7E -title {File Exists Condition} -component FileExistsCondition -TreeObject::id 37A46164-C287-5D4A-E55A-A2329E25E829
-Condition CFBE4459-450B-1FAB-3422-609544334AA2 -active Yes -parent 7C57D3D3-B1DB-0888-B098-B46AD4F99F7E -title {String Is Condition} -component StringIsCondition -TreeObject::id CFBE4459-450B-1FAB-3422-609544334AA2
-InstallComponent C7D6444E-DB8B-EE24-3E12-A2AF8A392C5D -setup Install -type action -conditions {52ACF73B-2106-3106-B7F0-D8587A4A6A3B 7C2D1F15-9A28-9938-3C1B-681A4D79C7B2} -title {Desktop Shortcut Checkbutton} -component AddWidget -command insert -active Yes -parent A5A97363-4CD6-4A6A-3D39-6EFC56BA9D39
-Condition 52ACF73B-2106-3106-B7F0-D8587A4A6A3B -active Yes -parent C7D6444E-DB8B-EE24-3E12-A2AF8A392C5D -title {File Exists Condition} -component FileExistsCondition -TreeObject::id 52ACF73B-2106-3106-B7F0-D8587A4A6A3B
-Condition 7C2D1F15-9A28-9938-3C1B-681A4D79C7B2 -active Yes -parent C7D6444E-DB8B-EE24-3E12-A2AF8A392C5D -title {String Is Condition} -component StringIsCondition -TreeObject::id 7C2D1F15-9A28-9938-3C1B-681A4D79C7B2
-InstallComponent A246E5D4-5489-19CC-C7B1-AA0C98D55F85 -setup Install -type action -conditions {E57B5080-47C0-3209-40DC-144F41FBF866 BDC2A4B5-C169-A971-4F35-13B1BF3F8C24 AAF04AF0-329D-75A6-BB68-60ECF2EB74F0} -title {Quick Launch Shortcut Checkbutton} -component AddWidget -command insert -active Yes -parent A5A97363-4CD6-4A6A-3D39-6EFC56BA9D39
-Condition E57B5080-47C0-3209-40DC-144F41FBF866 -active Yes -parent A246E5D4-5489-19CC-C7B1-AA0C98D55F85 -title {Platform Condition} -component PlatformCondition -TreeObject::id E57B5080-47C0-3209-40DC-144F41FBF866
-Condition BDC2A4B5-C169-A971-4F35-13B1BF3F8C24 -active Yes -parent A246E5D4-5489-19CC-C7B1-AA0C98D55F85 -title {File Exists Condition} -component FileExistsCondition -TreeObject::id BDC2A4B5-C169-A971-4F35-13B1BF3F8C24
-Condition AAF04AF0-329D-75A6-BB68-60ECF2EB74F0 -active Yes -parent A246E5D4-5489-19CC-C7B1-AA0C98D55F85 -title {String Is Condition} -component StringIsCondition -TreeObject::id AAF04AF0-329D-75A6-BB68-60ECF2EB74F0
-InstallComponent C93967A6-0618-9A8C-9554-35292F85F61B -setup Install -type action -title {Console Ask Yes Or No} -component ConsoleAskYesOrNo -active Yes -parent ConsoleInstall
-InstallComponent 361C9910-C284-B9BE-FA0C-B94309DB19A7 -setup Install -type action -conditions 825CDD1E-9B3D-E64E-5381-5C5557D204A2 -title Exit -component Exit -command insert -active Yes -parent ConsoleInstall
-Condition 825CDD1E-9B3D-E64E-5381-5C5557D204A2 -active Yes -parent 361C9910-C284-B9BE-FA0C-B94309DB19A7 -title {String Is Condition} -component StringIsCondition -TreeObject::id 825CDD1E-9B3D-E64E-5381-5C5557D204A2
-InstallComponent A1E6AD62-FD68-14BF-2D05-264DC2B370A5 -setup Install -type action -conditions F6C53555-674E-0479-7EC0-FE737201EA0A -title {Console Get User Input} -component ConsoleGetUserInput -command insert -active Yes -parent ConsoleInstall
-Condition F6C53555-674E-0479-7EC0-FE737201EA0A -active Yes -parent A1E6AD62-FD68-14BF-2D05-264DC2B370A5 -title {File Permission Condition} -component FilePermissionCondition -TreeObject::id F6C53555-674E-0479-7EC0-FE737201EA0A
-InstallComponent 1356216E-90D2-8324-0EEB-975A64F23EB8 -setup Install -type action -title {Console Message} -component ConsoleMessage -active Yes -parent ConsoleInstall
-InstallComponent BFD200F2-6AC9-8FE2-046F-48E5126BE639 -setup Install -type action -title {Execute Action} -component ExecuteAction -active Yes -parent ConsoleInstall
-InstallComponent E611105F-DC85-9E20-4F7B-E63C54E5DF06 -setup Install -type action -title {Console Message} -component ConsoleMessage -active Yes -parent ConsoleInstall
-InstallComponent C5AD5B0C-26BE-16E5-899A-9A9436C8F688 -setup Install -type action -title Exit -component Exit -active Yes -parent ConsoleInstall
-InstallComponent 1D757BEB-2EA2-269E-B331-C41CB71831EF -setup Install -type action -title {Execute Action} -component ExecuteAction -active Yes -parent SilentInstall
-InstallComponent 67F58321-C0AF-1721-C519-0FCCABD66FE9 -setup Install -type action -title Exit -component Exit -active Yes -parent SilentInstall
-InstallComponent 7C1E2A34-CD5C-F707-9DF3-92DF130C3BFD -setup Install -type actiongroup -title {Setup Actions} -alias {Setup Actions} -active Yes -parent ActionGroupsInstall
-InstallComponent 3F2A14F0-06AC-C9D3-1F07-311F41E1338E -setup Install -type actiongroup -title {Startup Actions} -alias {Startup Actions} -active Yes -parent ActionGroupsInstall
-InstallComponent 001FA257-6A8E-7CEA-ED5E-492247DF5E5A -setup Install -type action -title {Create Install Panes} -component CreateInstallPanes -active Yes -parent 3F2A14F0-06AC-C9D3-1F07-311F41E1338E
-InstallComponent 2DF93B55-41E5-75D5-E815-BD9FDC32D9F8 -setup Install -type actiongroup -title {Install Actions} -alias {Install Actions} -active Yes -parent ActionGroupsInstall
-InstallComponent 54B45A5F-FF59-0E99-952F-165BAA590889 -setup Install -type action -title {Install Selected Files} -component InstallSelectedFiles -active Yes -parent 2DF93B55-41E5-75D5-E815-BD9FDC32D9F8
-InstallComponent BE4A731E-1FC2-87A1-547D-91E2CA467AA7 -setup Install -type action -title {Add Directory To Path} -component AddDirectoryToPath -active Yes -parent 2DF93B55-41E5-75D5-E815-BD9FDC32D9F8
-InstallComponent C14CC317-9757-2C79-64C6-BC6C8A267CB1 -setup Install -type action -conditions 4AAFE838-3E44-5147-0F04-65DB5B647191 -title {Install Uninstaller} -component InstallUninstaller -command insert -active Yes -parent 2DF93B55-41E5-75D5-E815-BD9FDC32D9F8
-Condition 4AAFE838-3E44-5147-0F04-65DB5B647191 -active Yes -parent C14CC317-9757-2C79-64C6-BC6C8A267CB1 -title {String Is Condition} -component StringIsCondition -TreeObject::id 4AAFE838-3E44-5147-0F04-65DB5B647191
-InstallComponent EDD03974-B223-B62F-DA4B-FD5E94861CFE -setup Install -type action -conditions 1ADA4DE6-31A7-E816-7719-4C8558F5378D -title {Windows Uninstall Registry} -component AddWindowsUninstallEntry -command insert -active Yes -parent 2DF93B55-41E5-75D5-E815-BD9FDC32D9F8
-Condition 1ADA4DE6-31A7-E816-7719-4C8558F5378D -active Yes -parent EDD03974-B223-B62F-DA4B-FD5E94861CFE -title {String Is Condition} -component StringIsCondition -TreeObject::id 1ADA4DE6-31A7-E816-7719-4C8558F5378D
-InstallComponent 48596410-DF5A-1E56-D59C-1B1E2F094FCA -setup Install -type action -conditions A75C28A7-801B-22B3-C00A-B4B6F148DAA5 -title {Program Shortcut} -component InstallProgramFolderShortcut -command insert -active Yes -parent 2DF93B55-41E5-75D5-E815-BD9FDC32D9F8
-Condition A75C28A7-801B-22B3-C00A-B4B6F148DAA5 -active Yes -parent 48596410-DF5A-1E56-D59C-1B1E2F094FCA -title {String Is Condition} -component StringIsCondition -TreeObject::id A75C28A7-801B-22B3-C00A-B4B6F148DAA5
-InstallComponent EE3AF196-AF0F-4947-CD75-7894634F48A6 -setup Install -type action -conditions C5416030-8AB4-3466-F341-9A0BBFEA55EF -title {Uninstall Shortcut} -component InstallProgramFolderShortcut -command insert -active Yes -parent 2DF93B55-41E5-75D5-E815-BD9FDC32D9F8
-Condition C5416030-8AB4-3466-F341-9A0BBFEA55EF -active Yes -parent EE3AF196-AF0F-4947-CD75-7894634F48A6 -title {String Is Condition} -component StringIsCondition -TreeObject::id C5416030-8AB4-3466-F341-9A0BBFEA55EF
-InstallComponent 6734BA65-B25A-DA08-812C-EE0775F91A89 -setup Install -type action -title {Ebook viewer shorcut} -component InstallProgramFolderShortcut -active Yes -parent 2DF93B55-41E5-75D5-E815-BD9FDC32D9F8
-InstallComponent 77D1144B-1013-79B5-034B-5D6BDA6B2FD2 -setup Install -type action -title {LRFViewer Shortcut} -component InstallProgramFolderShortcut -active Yes -parent 2DF93B55-41E5-75D5-E815-BD9FDC32D9F8
-InstallComponent 28BAE662-E103-4E3F-D298-C8FBA36361FC -setup Install -type actiongroup -title {Finish Actions} -alias {Finish Actions} -active Yes -parent ActionGroupsInstall
-InstallComponent E32519F3-A540-C8F3-957F-4C1DB5B25DFE -setup Install -type action -conditions {72D8B44E-E4CF-7551-645E-FB57C5B000E9 03FA7EEF-F626-B69A-09C6-0AA7A54EE9E7} -title {Install Desktop Shortcut} -component InstallDesktopShortcut -command insert -active Yes -parent 28BAE662-E103-4E3F-D298-C8FBA36361FC
-Condition 72D8B44E-E4CF-7551-645E-FB57C5B000E9 -active Yes -parent E32519F3-A540-C8F3-957F-4C1DB5B25DFE -title {String Is Condition} -component StringIsCondition -TreeObject::id 72D8B44E-E4CF-7551-645E-FB57C5B000E9
-Condition 03FA7EEF-F626-B69A-09C6-0AA7A54EE9E7 -active Yes -parent E32519F3-A540-C8F3-957F-4C1DB5B25DFE -title {File Exists Condition} -component FileExistsCondition -TreeObject::id 03FA7EEF-F626-B69A-09C6-0AA7A54EE9E7
-InstallComponent D86BBA5C-4903-33BA-59F8-4266A3D45896 -setup Install -type action -conditions {C4C0A903-CF2A-D25A-27AB-A64219FB7E70 5EC7056B-6F90-311E-2C6F-76E96164CFFD} -title {Install Quick Launch Shortcut} -component InstallWindowsShortcut -command insert -active Yes -parent 28BAE662-E103-4E3F-D298-C8FBA36361FC
-Condition C4C0A903-CF2A-D25A-27AB-A64219FB7E70 -active Yes -parent D86BBA5C-4903-33BA-59F8-4266A3D45896 -title {String Is Condition} -component StringIsCondition -TreeObject::id C4C0A903-CF2A-D25A-27AB-A64219FB7E70
-Condition 5EC7056B-6F90-311E-2C6F-76E96164CFFD -active Yes -parent D86BBA5C-4903-33BA-59F8-4266A3D45896 -title {File Exists Condition} -component FileExistsCondition -TreeObject::id 5EC7056B-6F90-311E-2C6F-76E96164CFFD
-InstallComponent 2A230259-3A6F-8669-8B8B-23C3E7C1BFC2 -setup Install -type action -conditions {4E5FC4FE-5D37-B216-CFFE-E046A2D6321E E560F3A1-208D-2B4F-2C87-E08595F8E1CD 9C1E4BD9-066D-ABCE-28D0-9E194B9F8475} -title {Launch Application} -component ExecuteExternalProgram -command insert -active No -parent 28BAE662-E103-4E3F-D298-C8FBA36361FC
-Condition 4E5FC4FE-5D37-B216-CFFE-E046A2D6321E -active Yes -parent 2A230259-3A6F-8669-8B8B-23C3E7C1BFC2 -title {String Is Condition} -component StringIsCondition -TreeObject::id 4E5FC4FE-5D37-B216-CFFE-E046A2D6321E
-Condition E560F3A1-208D-2B4F-2C87-E08595F8E1CD -active Yes -parent 2A230259-3A6F-8669-8B8B-23C3E7C1BFC2 -title {String Is Condition} -component StringIsCondition -TreeObject::id E560F3A1-208D-2B4F-2C87-E08595F8E1CD
-Condition 9C1E4BD9-066D-ABCE-28D0-9E194B9F8475 -active Yes -parent 2A230259-3A6F-8669-8B8B-23C3E7C1BFC2 -title {File Exists Condition} -component FileExistsCondition -TreeObject::id 9C1E4BD9-066D-ABCE-28D0-9E194B9F8475
-InstallComponent 6B66969B-8882-7EFE-A351-31DEBA7E384E -setup Install -type actiongroup -title {Cancel Actions} -alias {Cancel Actions} -active Yes -parent ActionGroupsInstall
-InstallComponent 4603766D-70BD-919C-AF5F-C4D7B1C181DB -setup Uninstall -type pane -title Uninstall -component Uninstall -active Yes -parent StandardUninstall
-InstallComponent E5CBB018-A89D-3145-CFF5-CFC3B62BEA97 -setup Uninstall -type action -title {Modify Widget} -component ModifyWidget -active Yes -parent 4603766D-70BD-919C-AF5F-C4D7B1C181DB
-InstallComponent 3F1FF865-1284-2577-16AB-65B308DCE28F -setup Uninstall -type action -title {Execute Action} -component ExecuteAction -active Yes -parent 4603766D-70BD-919C-AF5F-C4D7B1C181DB
-InstallComponent C9AF2317-503F-07D9-EC26-343C95E4831C -setup Uninstall -type action -title {Move Forward} -component MoveForward -active Yes -parent 4603766D-70BD-919C-AF5F-C4D7B1C181DB
-InstallComponent EE91F1AF-8AEB-B248-D932-3702CC788AF9 -setup Uninstall -type pane -conditions 173ABC5E-D4D9-9CAE-D79F-E3067EC87EC7 -title {Uninstall Details} -component UninstallDetails -command insert -active Yes -parent StandardUninstall
-Condition 173ABC5E-D4D9-9CAE-D79F-E3067EC87EC7 -active Yes -parent EE91F1AF-8AEB-B248-D932-3702CC788AF9 -title {String Is Condition} -component StringIsCondition -TreeObject::id 173ABC5E-D4D9-9CAE-D79F-E3067EC87EC7
-InstallComponent B3012DC5-8A65-EBF0-8641-CE533A8A7A2D -setup Uninstall -type pane -title {Uninstall Complete} -component UninstallComplete -active Yes -parent StandardUninstall
-InstallComponent 58863721-5610-F284-0B46-D2D1D4B93D16 -setup Uninstall -type action -title {Console Ask Yes Or No} -component ConsoleAskYesOrNo -active Yes -parent ConsoleUninstall
-InstallComponent FB99914F-F566-94B5-8F96-F5A9A07DF1FA -setup Uninstall -type action -conditions 797C84AD-91E9-78BB-A794-B1406EEA6ABF -title Exit -component Exit -command insert -active Yes -parent ConsoleUninstall
-Condition 797C84AD-91E9-78BB-A794-B1406EEA6ABF -active Yes -parent FB99914F-F566-94B5-8F96-F5A9A07DF1FA -title {String Is Condition} -component StringIsCondition -TreeObject::id 797C84AD-91E9-78BB-A794-B1406EEA6ABF
-InstallComponent C3E9E5D9-58C8-C2C5-DF75-21D908A64782 -setup Uninstall -type action -title {Console Message} -component ConsoleMessage -active Yes -parent ConsoleUninstall
-InstallComponent B113E8EE-10BD-0792-4CD3-7E0ADC8CD7FA -setup Uninstall -type action -title {Execute Action} -component ExecuteAction -active Yes -parent ConsoleUninstall
-InstallComponent 442920D9-8A51-9476-14E4-787D5C230E84 -setup Uninstall -type action -title {Console Message} -component ConsoleMessage -active Yes -parent ConsoleUninstall
-InstallComponent BF3067ED-139A-269F-F6DA-9D43B840779A -setup Uninstall -type action -title Exit -component Exit -active Yes -parent ConsoleUninstall
-InstallComponent 9B935DA3-A0E5-9C04-D692-9D10B44ADC90 -setup Uninstall -type action -title {Execute Action} -component ExecuteAction -active Yes -parent SilentUninstall
-InstallComponent D79DC0D2-38BC-9D9F-2DF4-3C76D89BF933 -setup Uninstall -type action -title Exit -component Exit -active Yes -parent SilentUninstall
-InstallComponent 678C30B6-BF0A-238C-524A-2BFEC6876FC5 -setup Uninstall -type actiongroup -title {Setup Actions} -alias {Setup Actions} -active Yes -parent ActionGroupsUninstall
-InstallComponent 3D180445-8990-20F7-13DC-93B6909B907F -setup Uninstall -type actiongroup -title {Startup Actions} -alias {Startup Actions} -active Yes -parent ActionGroupsUninstall
-InstallComponent 1CA13495-CB19-27A9-56E5-9BCF91958249 -setup Uninstall -type action -conditions {F8921FAD-AFBD-348C-F26C-67855FA4691D 64B8D0F3-4B11-DA22-D6E7-7248872D5FA7} -title Exit -component Exit -command insert -active Yes -parent 3D180445-8990-20F7-13DC-93B6909B907F
-Condition F8921FAD-AFBD-348C-F26C-67855FA4691D -active Yes -parent 1CA13495-CB19-27A9-56E5-9BCF91958249 -title {String Is Condition} -component StringIsCondition -TreeObject::id F8921FAD-AFBD-348C-F26C-67855FA4691D
-Condition 64B8D0F3-4B11-DA22-D6E7-7248872D5FA7 -active Yes -parent 1CA13495-CB19-27A9-56E5-9BCF91958249 -title {Ask Yes or No} -component AskYesOrNo -TreeObject::id 64B8D0F3-4B11-DA22-D6E7-7248872D5FA7
-InstallComponent 521E782E-2C93-8C60-9B2A-B65552FFA8E4 -setup Uninstall -type actiongroup -title {Uninstall Actions} -alias {Uninstall Actions} -active Yes -parent ActionGroupsUninstall
-InstallComponent 79C2EE18-497D-DE39-8AB6-777CE25D9484 -setup Uninstall -type action -title {Uninstall Selected Files} -component UninstallSelectedFiles -active Yes -parent 521E782E-2C93-8C60-9B2A-B65552FFA8E4
-InstallComponent 2D445859-68B9-1761-BA4F-DE91AFE5B9EB -setup Uninstall -type action -title {Uninstall Leftover Files} -component UninstallLeftoverFiles -active Yes -parent 521E782E-2C93-8C60-9B2A-B65552FFA8E4
-InstallComponent 167174E3-7241-9060-3A3C-1F0D169A1A1F -setup Uninstall -type action -title {Uninstall USB Driver} -component ExecuteExternalProgram -active Yes -parent 521E782E-2C93-8C60-9B2A-B65552FFA8E4
-InstallComponent A57E3390-AA3E-A868-2C7D-75ADF12D8471 -setup Uninstall -type actiongroup -title {Finish Actions} -alias {Finish Actions} -active Yes -parent ActionGroupsUninstall
-InstallComponent AAFE58A0-2DFB-CA20-1F6E-D3815F885996 -setup Uninstall -type actiongroup -title {Cancel Actions} -alias {Cancel Actions} -active Yes -parent ActionGroupsUninstall
-
-array set Properties {
-001FA257-6A8E-7CEA-ED5E-492247DF5E5A,Conditions
-{0 conditions}
-
-03FA7EEF-F626-B69A-09C6-0AA7A54EE9E7,CheckCondition
-{Before Action is Executed}
-
-03FA7EEF-F626-B69A-09C6-0AA7A54EE9E7,Filename
-<%ProgramExecutable%>
-
-08195201-0797-932C-4B51-E5EF9D1D41BD,CheckCondition
-{Before Action is Executed}
-
-08195201-0797-932C-4B51-E5EF9D1D41BD,String
-<%InstallUSBDriver%>
-
-081A479A-572E-5133-4979-84456DB40EFA,CheckCondition
-{Before Action is Executed}
-
-081A479A-572E-5133-4979-84456DB40EFA,String
-{<%Property <%CurrentPane%> UserMustAcceptLicense%>}
-
-1039BE84-4163-2FCB-9798-D85E6C37B668,CheckCondition
-{Before Action is Executed}
-
-1039BE84-4163-2FCB-9798-D85E6C37B668,Platform
-Windows
-
-1356216E-90D2-8324-0EEB-975A64F23EB8,Message,subst
-1
-
-167174E3-7241-9060-3A3C-1F0D169A1A1F,Conditions
-{0 conditions}
-
-167174E3-7241-9060-3A3C-1F0D169A1A1F,IgnoreErrors
-Yes
-
-167174E3-7241-9060-3A3C-1F0D169A1A1F,IncludeStderr
-Yes
-
-167174E3-7241-9060-3A3C-1F0D169A1A1F,ProgramCommandLine
-{devcon.exe remove "USB\VID_054C&PID_029B"}
-
-167174E3-7241-9060-3A3C-1F0D169A1A1F,WorkingDirectory
-<%InstallDir%>/driver
-
-173ABC5E-D4D9-9CAE-D79F-E3067EC87EC7,String
-<%ErrorsOccurred%>
-
-1ADA4DE6-31A7-E816-7719-4C8558F5378D,CheckCondition
-{Before Action is Executed}
-
-1ADA4DE6-31A7-E816-7719-4C8558F5378D,Operator
-false
-
-1ADA4DE6-31A7-E816-7719-4C8558F5378D,String
-<%UpgradeInstall%>
-
-1CA13495-CB19-27A9-56E5-9BCF91958249,Comment
-{Ask the user if they want to proceed with the uninstall.}
-
-1D757BEB-2EA2-269E-B331-C41CB71831EF,Action
-{Install Actions}
-
-1D757BEB-2EA2-269E-B331-C41CB71831EF,Conditions
-{0 conditions}
-
-21B897C4-24BE-70D1-58EA-DE78EFA60719,Conditions
-{1 condition}
-
-21B897C4-24BE-70D1-58EA-DE78EFA60719,IgnoreErrors
-Yes
-
-21B897C4-24BE-70D1-58EA-DE78EFA60719,Message,subst
-1
-
-21B897C4-24BE-70D1-58EA-DE78EFA60719,Title,subst
-1
-
-27B44808-381F-7202-A0D9-40788CD679D0,Background
-white
-
-27B44808-381F-7202-A0D9-40788CD679D0,Checked
-No
-
-27B44808-381F-7202-A0D9-40788CD679D0,Conditions
-{3 conditions}
-
-27B44808-381F-7202-A0D9-40788CD679D0,Text,subst
-1
-
-27B44808-381F-7202-A0D9-40788CD679D0,Type
-checkbutton
-
-27B44808-381F-7202-A0D9-40788CD679D0,VirtualText
-CreateQuickLaunchShortcut
-
-27B44808-381F-7202-A0D9-40788CD679D0,X
-185
-
-27B44808-381F-7202-A0D9-40788CD679D0,Y
-170
-
-28BAE662-E103-4E3F-D298-C8FBA36361FC,Alias
-{Finish Actions}
-
-28BAE662-E103-4E3F-D298-C8FBA36361FC,Conditions
-{0 conditions}
-
-28FDA3F4-B799-901F-8A27-AA04F0C022AB,BackButton,subst
-1
-
-28FDA3F4-B799-901F-8A27-AA04F0C022AB,CancelButton,subst
-1
-
-28FDA3F4-B799-901F-8A27-AA04F0C022AB,Caption,subst
-1
-
-28FDA3F4-B799-901F-8A27-AA04F0C022AB,Conditions
-{0 conditions}
-
-28FDA3F4-B799-901F-8A27-AA04F0C022AB,FileLabel,subst
-1
-
-28FDA3F4-B799-901F-8A27-AA04F0C022AB,Message,subst
-1
-
-28FDA3F4-B799-901F-8A27-AA04F0C022AB,NextButton,subst
-1
-
-28FDA3F4-B799-901F-8A27-AA04F0C022AB,ProgressValue,subst
-1
-
-28FDA3F4-B799-901F-8A27-AA04F0C022AB,Subtitle,subst
-1
-
-28FDA3F4-B799-901F-8A27-AA04F0C022AB,Title,subst
-1
-
-2A230259-3A6F-8669-8B8B-23C3E7C1BFC2,Active
-No
-
-2A230259-3A6F-8669-8B8B-23C3E7C1BFC2,Conditions
-{3 conditions}
-
-2A230259-3A6F-8669-8B8B-23C3E7C1BFC2,ProgramCommandLine
-<%ProgramExecutable%>
-
-2A230259-3A6F-8669-8B8B-23C3E7C1BFC2,WaitForProgram
-No
-
-2A230259-3A6F-8669-8B8B-23C3E7C1BFC2,WorkingDirectory
-<%InstallDir%>
-
-2D445859-68B9-1761-BA4F-DE91AFE5B9EB,Conditions
-{0 conditions}
-
-2DF93B55-41E5-75D5-E815-BD9FDC32D9F8,Alias
-{Install Actions}
-
-2DF93B55-41E5-75D5-E815-BD9FDC32D9F8,Conditions
-{0 conditions}
-
-2E18F4AE-F1BB-5C62-2900-73A576A49261,CheckCondition
-{Before Action is Executed}
-
-2E18F4AE-F1BB-5C62-2900-73A576A49261,Operator
-false
-
-2E18F4AE-F1BB-5C62-2900-73A576A49261,String
-<%UpgradeInstall%>
-
-37A46164-C287-5D4A-E55A-A2329E25E829,CheckCondition
-{Before Action is Executed}
-
-37A46164-C287-5D4A-E55A-A2329E25E829,Filename
-<%ProgramExecutable%>
-
-3D180445-8990-20F7-13DC-93B6909B907F,Alias
-{Startup Actions}
-
-3EA07B17-04D8-6508-B535-96CC7173B49A,BackButton,subst
-1
-
-3EA07B17-04D8-6508-B535-96CC7173B49A,CancelButton,subst
-1
-
-3EA07B17-04D8-6508-B535-96CC7173B49A,Caption,subst
-1
-
-3EA07B17-04D8-6508-B535-96CC7173B49A,Conditions
-{1 condition}
-
-3EA07B17-04D8-6508-B535-96CC7173B49A,Message,subst
-1
-
-3EA07B17-04D8-6508-B535-96CC7173B49A,NextButton,subst
-1
-
-3F1FF865-1284-2577-16AB-65B308DCE28F,Action
-{Uninstall Actions}
-
-3F2A14F0-06AC-C9D3-1F07-311F41E1338E,Alias
-{Startup Actions}
-
-3F2A14F0-06AC-C9D3-1F07-311F41E1338E,Conditions
-{0 conditions}
-
-442920D9-8A51-9476-14E4-787D5C230E84,Message,subst
-1
-
-4603766D-70BD-919C-AF5F-C4D7B1C181DB,BackButton,subst
-1
-
-4603766D-70BD-919C-AF5F-C4D7B1C181DB,CancelButton,subst
-1
-
-4603766D-70BD-919C-AF5F-C4D7B1C181DB,Caption,subst
-1
-
-4603766D-70BD-919C-AF5F-C4D7B1C181DB,Conditions
-{0 conditions}
-
-4603766D-70BD-919C-AF5F-C4D7B1C181DB,FileValue,subst
-1
-
-4603766D-70BD-919C-AF5F-C4D7B1C181DB,Message,subst
-1
-
-4603766D-70BD-919C-AF5F-C4D7B1C181DB,NextButton,subst
-1
-
-4603766D-70BD-919C-AF5F-C4D7B1C181DB,ProgressValue,subst
-1
-
-4603766D-70BD-919C-AF5F-C4D7B1C181DB,Subtitle,subst
-1
-
-4603766D-70BD-919C-AF5F-C4D7B1C181DB,Title,subst
-1
-
-48596410-DF5A-1E56-D59C-1B1E2F094FCA,Conditions
-{1 condition}
-
-48596410-DF5A-1E56-D59C-1B1E2F094FCA,IconPath
-{<%InstallDir%>\library.ico}
-
-48596410-DF5A-1E56-D59C-1B1E2F094FCA,ShortcutName
-<%AppName%>
-
-48596410-DF5A-1E56-D59C-1B1E2F094FCA,TargetFileName
-<%ProgramExecutable%>
-
-48596410-DF5A-1E56-D59C-1B1E2F094FCA,WorkingDirectory
-<%InstallDir%>
-
-4AAFE838-3E44-5147-0F04-65DB5B647191,CheckCondition
-{Before Action is Executed}
-
-4AAFE838-3E44-5147-0F04-65DB5B647191,Operator
-false
-
-4AAFE838-3E44-5147-0F04-65DB5B647191,String
-<%UpgradeInstall%>
-
-4E5FC4FE-5D37-B216-CFFE-E046A2D6321E,CheckCondition
-{Before Action is Executed}
-
-4E5FC4FE-5D37-B216-CFFE-E046A2D6321E,String
-<%GuiMode%>
-
-521E782E-2C93-8C60-9B2A-B65552FFA8E4,Alias
-{Uninstall Actions}
-
-521E782E-2C93-8C60-9B2A-B65552FFA8E4,Conditions
-{0 conditions}
-
-52ACF73B-2106-3106-B7F0-D8587A4A6A3B,CheckCondition
-{Before Action is Executed}
-
-52ACF73B-2106-3106-B7F0-D8587A4A6A3B,Filename
-<%ProgramExecutable%>
-
-54B45A5F-FF59-0E99-952F-165BAA590889,Conditions
-{0 conditions}
-
-580ACF2C-517F-5E48-9DEF-7DAEFBA59FDD,AutoUpdate
-Yes
-
-580ACF2C-517F-5E48-9DEF-7DAEFBA59FDD,Conditions
-{1 condition}
-
-580ACF2C-517F-5E48-9DEF-7DAEFBA59FDD,SubstituteValue
-Yes
-
-580ACF2C-517F-5E48-9DEF-7DAEFBA59FDD,Value
-<%PreviousInstallDir%>
-
-580ACF2C-517F-5E48-9DEF-7DAEFBA59FDD,VirtualText
-InstallDir
-
-58863721-5610-F284-0B46-D2D1D4B93D16,Default
-Yes
-
-58863721-5610-F284-0B46-D2D1D4B93D16,Prompt
-<%UninstallStartupText%>
-
-5C66451D-6042-DBDE-0D8C-31156EE244AD,Conditions
-{0 conditions}
-
-5C66451D-6042-DBDE-0D8C-31156EE244AD,State
-disabled
-
-5C66451D-6042-DBDE-0D8C-31156EE244AD,Widget
-{Back Button;Next Button}
-
-5EC7056B-6F90-311E-2C6F-76E96164CFFD,CheckCondition
-{Before Action is Executed}
-
-5EC7056B-6F90-311E-2C6F-76E96164CFFD,Filename
-<%ProgramExecutable%>
-
-64B8D0F3-4B11-DA22-D6E7-7248872D5FA7,CheckCondition
-{Before Action is Executed}
-
-64B8D0F3-4B11-DA22-D6E7-7248872D5FA7,Message,subst
-1
-
-64B8D0F3-4B11-DA22-D6E7-7248872D5FA7,Title,subst
-1
-
-64B8D0F3-4B11-DA22-D6E7-7248872D5FA7,TrueValue
-No
-
-657FDE96-809B-821F-3294-15E637B85E6E,CheckCondition
-{Before Action is Executed}
-
-657FDE96-809B-821F-3294-15E637B85E6E,Filename
-<%ProgramExecutable%>
-
-6661142D-D174-F52E-CD1D-6BFB3649BC64,BackButton,subst
-1
-
-6661142D-D174-F52E-CD1D-6BFB3649BC64,BrowseButton,subst
-1
-
-6661142D-D174-F52E-CD1D-6BFB3649BC64,BrowseText,subst
-1
-
-6661142D-D174-F52E-CD1D-6BFB3649BC64,CancelButton,subst
-1
-
-6661142D-D174-F52E-CD1D-6BFB3649BC64,Caption,subst
-1
-
-6661142D-D174-F52E-CD1D-6BFB3649BC64,Conditions
-{2 conditions}
-
-6661142D-D174-F52E-CD1D-6BFB3649BC64,Destination,subst
-1
-
-6661142D-D174-F52E-CD1D-6BFB3649BC64,DestinationLabel,subst
-0
-
-6661142D-D174-F52E-CD1D-6BFB3649BC64,Message,subst
-1
-
-6661142D-D174-F52E-CD1D-6BFB3649BC64,NextButton,subst
-1
-
-6661142D-D174-F52E-CD1D-6BFB3649BC64,Subtitle,subst
-1
-
-6661142D-D174-F52E-CD1D-6BFB3649BC64,Title,subst
-1
-
-6734BA65-B25A-DA08-812C-EE0775F91A89,Conditions
-{0 conditions}
-
-6734BA65-B25A-DA08-812C-EE0775F91A89,FileName
-{}
-
-6734BA65-B25A-DA08-812C-EE0775F91A89,IconPath
-{<%InstallDir%>\viewer.ico}
-
-6734BA65-B25A-DA08-812C-EE0775F91A89,InstallForAllUsers
-Yes
-
-6734BA65-B25A-DA08-812C-EE0775F91A89,ShortcutName
-{Ebook Viewer}
-
-6734BA65-B25A-DA08-812C-EE0775F91A89,TargetFileName
-{<%InstallDir%>\ebook-viewer<%Ext%>}
-
-6734BA65-B25A-DA08-812C-EE0775F91A89,WorkingDirectory
-<%InstallDir%>
-
-678C30B6-BF0A-238C-524A-2BFEC6876FC5,Alias
-{Setup Actions}
-
-67F58321-C0AF-1721-C519-0FCCABD66FE9,ExitType
-Finish
-
-69188956-D764-5B26-B048-46A4239C3733,CheckCondition
-{Before Action is Executed}
-
-69188956-D764-5B26-B048-46A4239C3733,Platform
-Windows
-
-6B66969B-8882-7EFE-A351-31DEBA7E384E,Alias
-{Cancel Actions}
-
-6B66969B-8882-7EFE-A351-31DEBA7E384E,Conditions
-{0 conditions}
-
-6DE3B369-9D6B-6BC1-4EA0-2C54ECE159EB,CheckCondition
-{Before Action is Executed}
-
-6DE3B369-9D6B-6BC1-4EA0-2C54ECE159EB,Operator
-{not empty}
-
-6DE3B369-9D6B-6BC1-4EA0-2C54ECE159EB,String
-<%PreviousInstallDir%>
-
-710F2507-2557-652D-EA55-440D710EFDFA,Alias
-{Install USB Driver}
-
-710F2507-2557-652D-EA55-440D710EFDFA,Comment
-{Instal the USB driver for the SONY PRS500}
-
-710F2507-2557-652D-EA55-440D710EFDFA,Conditions
-{3 conditions}
-
-710F2507-2557-652D-EA55-440D710EFDFA,ConsoleTitle
-{}
-
-710F2507-2557-652D-EA55-440D710EFDFA,ExecuteAction
-{Before Pane is Displayed}
-
-710F2507-2557-652D-EA55-440D710EFDFA,IncludeStderr
-Yes
-
-710F2507-2557-652D-EA55-440D710EFDFA,ProgramCommandLine
-{devcon.exe install prs500.inf "USB\VID_054&PID029B"}
-
-710F2507-2557-652D-EA55-440D710EFDFA,ResultVirtualText
-DevconResult
-
-710F2507-2557-652D-EA55-440D710EFDFA,StatusVirtualText
-DevconStatus
-
-710F2507-2557-652D-EA55-440D710EFDFA,WorkingDirectory
-<%InstallDir%>/driver
-
-72D8B44E-E4CF-7551-645E-FB57C5B000E9,CheckCondition
-{Before Action is Executed}
-
-72D8B44E-E4CF-7551-645E-FB57C5B000E9,String
-<%CreateDesktopShortcut%>
-
-76FA3CA2-1F09-75C5-C6CF-72719A8EC4A5,CheckCondition
-{Before Action is Executed}
-
-76FA3CA2-1F09-75C5-C6CF-72719A8EC4A5,String
-<%InstallUSBDriver%>
-
-77D1144B-1013-79B5-034B-5D6BDA6B2FD2,Conditions
-{0 conditions}
-
-77D1144B-1013-79B5-034B-5D6BDA6B2FD2,FileName
-{}
-
-77D1144B-1013-79B5-034B-5D6BDA6B2FD2,IconPath
-{<%InstallDir%>\viewer.ico}
-
-77D1144B-1013-79B5-034B-5D6BDA6B2FD2,InstallForAllUsers
-Yes
-
-77D1144B-1013-79B5-034B-5D6BDA6B2FD2,ShortcutName
-{LRF Viewer}
-
-77D1144B-1013-79B5-034B-5D6BDA6B2FD2,TargetFileName
-{<%InstallDir%>\lrfviewer<%Ext%>}
-
-77D1144B-1013-79B5-034B-5D6BDA6B2FD2,WorkingDirectory
-<%InstallDir%>
-
-797C84AD-91E9-78BB-A794-B1406EEA6ABF,CheckCondition
-{Before Action is Executed}
-
-797C84AD-91E9-78BB-A794-B1406EEA6ABF,Operator
-false
-
-797C84AD-91E9-78BB-A794-B1406EEA6ABF,String
-<%Answer%>
-
-7C1E2A34-CD5C-F707-9DF3-92DF130C3BFD,Alias
-{Setup Actions}
-
-7C1E2A34-CD5C-F707-9DF3-92DF130C3BFD,Conditions
-{0 conditions}
-
-7C2D1F15-9A28-9938-3C1B-681A4D79C7B2,CheckCondition
-{Before Action is Executed}
-
-7C2D1F15-9A28-9938-3C1B-681A4D79C7B2,Operator
-false
-
-7C2D1F15-9A28-9938-3C1B-681A4D79C7B2,String
-<%InstallStopped%>
-
-7C57D3D3-B1DB-0888-B098-B46AD4F99F7E,Background
-white
-
-7C57D3D3-B1DB-0888-B098-B46AD4F99F7E,Text,subst
-1
-
-7C57D3D3-B1DB-0888-B098-B46AD4F99F7E,Type
-checkbutton
-
-7C57D3D3-B1DB-0888-B098-B46AD4F99F7E,VirtualText
-LaunchApplication
-
-7C57D3D3-B1DB-0888-B098-B46AD4F99F7E,X
-185
-
-7C57D3D3-B1DB-0888-B098-B46AD4F99F7E,Y
-160
-
-7CCDA4BB-861C-C21E-3011-E93DB58F07D6,Conditions
-{1 condition}
-
-7CCDA4BB-861C-C21E-3011-E93DB58F07D6,ExecuteAction
-{Before Next Pane is Displayed}
-
-825CDD1E-9B3D-E64E-5381-5C5557D204A2,CheckCondition
-{Before Action is Executed}
-
-825CDD1E-9B3D-E64E-5381-5C5557D204A2,Operator
-false
-
-825CDD1E-9B3D-E64E-5381-5C5557D204A2,String
-<%Answer%>
-
-8A7FD0C2-F053-8764-F204-4BAE71E05708,BackButton,subst
-1
-
-8A7FD0C2-F053-8764-F204-4BAE71E05708,CancelButton,subst
-1
-
-8A7FD0C2-F053-8764-F204-4BAE71E05708,Caption,subst
-1
-
-8A7FD0C2-F053-8764-F204-4BAE71E05708,Conditions
-{0 conditions}
-
-8A7FD0C2-F053-8764-F204-4BAE71E05708,Message,subst
-1
-
-8A7FD0C2-F053-8764-F204-4BAE71E05708,NextButton,subst
-1
-
-940F7FED-7D20-7264-3BF9-ED78205A76B3,Background
-white
-
-940F7FED-7D20-7264-3BF9-ED78205A76B3,Conditions
-{2 conditions}
-
-940F7FED-7D20-7264-3BF9-ED78205A76B3,Text,subst
-1
-
-940F7FED-7D20-7264-3BF9-ED78205A76B3,Type
-checkbutton
-
-940F7FED-7D20-7264-3BF9-ED78205A76B3,VirtualText
-CreateDesktopShortcut
-
-940F7FED-7D20-7264-3BF9-ED78205A76B3,X
-185
-
-940F7FED-7D20-7264-3BF9-ED78205A76B3,Y
-150
-
-96440B8B-C6D0-FCCA-6D3C-7ECE1C304CC0,CheckCondition
-{Before Action is Executed}
-
-96440B8B-C6D0-FCCA-6D3C-7ECE1C304CC0,Filename
-<%ProgramExecutable%>
-
-9ACCDC35-E034-F142-ED42-AC8EC2B9AE2D,AcceptRadiobutton,subst
-0
-
-9ACCDC35-E034-F142-ED42-AC8EC2B9AE2D,Active
-Yes
-
-9ACCDC35-E034-F142-ED42-AC8EC2B9AE2D,BackButton,subst
-1
-
-9ACCDC35-E034-F142-ED42-AC8EC2B9AE2D,Buttons
-Next/Cancel
-
-9ACCDC35-E034-F142-ED42-AC8EC2B9AE2D,CancelButton,subst
-1
-
-9ACCDC35-E034-F142-ED42-AC8EC2B9AE2D,Caption,subst
-1
-
-9ACCDC35-E034-F142-ED42-AC8EC2B9AE2D,Conditions
-{0 conditions}
-
-9ACCDC35-E034-F142-ED42-AC8EC2B9AE2D,DeclineRadiobutton,subst
-0
-
-9ACCDC35-E034-F142-ED42-AC8EC2B9AE2D,Message,subst
-1
-
-9ACCDC35-E034-F142-ED42-AC8EC2B9AE2D,NextButton,subst
-1
-
-9ACCDC35-E034-F142-ED42-AC8EC2B9AE2D,Subtitle,subst
-1
-
-9ACCDC35-E034-F142-ED42-AC8EC2B9AE2D,Text,subst
-1
-
-9ACCDC35-E034-F142-ED42-AC8EC2B9AE2D,Title,subst
-1
-
-9B935DA3-A0E5-9C04-D692-9D10B44ADC90,Action
-{Uninstall Actions}
-
-9C1E4BD9-066D-ABCE-28D0-9E194B9F8475,CheckCondition
-{Before Action is Executed}
-
-9C1E4BD9-066D-ABCE-28D0-9E194B9F8475,Filename
-<%ProgramExecutable%>
-
-9E0D138E-5FFC-0F18-F110-F093644E4DD2,CheckCondition
-{Before Next Pane is Displayed}
-
-9E0D138E-5FFC-0F18-F110-F093644E4DD2,FailureMessage
-<%DirectoryPermissionText%>
-
-9E0D138E-5FFC-0F18-F110-F093644E4DD2,Filename
-<%InstallDir%>
-
-9E0D138E-5FFC-0F18-F110-F093644E4DD2,Permission
-{can create}
-
-A05E9D13-9686-83DD-C6AD-2A4D912C5B81,Action
-{Install Actions}
-
-A05E9D13-9686-83DD-C6AD-2A4D912C5B81,Conditions
-{0 conditions}
-
-A1E6AD62-FD68-14BF-2D05-264DC2B370A5,Prompt
-<%ConsoleSelectDestinationText%>
-
-A1E6AD62-FD68-14BF-2D05-264DC2B370A5,VirtualText
-InstallDir
-
-A246E5D4-5489-19CC-C7B1-AA0C98D55F85,Background
-white
-
-A246E5D4-5489-19CC-C7B1-AA0C98D55F85,Checked
-No
-
-A246E5D4-5489-19CC-C7B1-AA0C98D55F85,Conditions
-{3 conditions}
-
-A246E5D4-5489-19CC-C7B1-AA0C98D55F85,Text,subst
-1
-
-A246E5D4-5489-19CC-C7B1-AA0C98D55F85,Type
-checkbutton
-
-A246E5D4-5489-19CC-C7B1-AA0C98D55F85,VirtualText
-CreateQuickLaunchShortcut
-
-A246E5D4-5489-19CC-C7B1-AA0C98D55F85,X
-185
-
-A246E5D4-5489-19CC-C7B1-AA0C98D55F85,Y
-200
-
-A4388F3F-0D32-F14E-BA00-1BE7F54B05ED,CheckCondition
-{Before Action is Executed}
-
-A4388F3F-0D32-F14E-BA00-1BE7F54B05ED,Operator
-false
-
-A4388F3F-0D32-F14E-BA00-1BE7F54B05ED,String
-<%LicenseAccepted%>
-
-A57E3390-AA3E-A868-2C7D-75ADF12D8471,Alias
-{Finish Actions}
-
-A5A97363-4CD6-4A6A-3D39-6EFC56BA9D39,BackButton,subst
-1
-
-A5A97363-4CD6-4A6A-3D39-6EFC56BA9D39,CancelButton,subst
-1
-
-A5A97363-4CD6-4A6A-3D39-6EFC56BA9D39,Caption,subst
-1
-
-A5A97363-4CD6-4A6A-3D39-6EFC56BA9D39,Conditions
-{0 conditions}
-
-A5A97363-4CD6-4A6A-3D39-6EFC56BA9D39,Message,subst
-1
-
-A5A97363-4CD6-4A6A-3D39-6EFC56BA9D39,NextButton,subst
-1
-
-A75C28A7-801B-22B3-C00A-B4B6F148DAA5,CheckCondition
-{Before Action is Executed}
-
-A75C28A7-801B-22B3-C00A-B4B6F148DAA5,Operator
-false
-
-A75C28A7-801B-22B3-C00A-B4B6F148DAA5,String
-<%UpgradeInstall%>
-
-A75C97CC-01AC-C12A-D663-A54E3257F11B,State
-disabled
-
-A75C97CC-01AC-C12A-D663-A54E3257F11B,Widget
-{Back Button;Next Button}
-
-AAEC34E6-7F02-18F2-30BB-744738192A3B,Conditions
-{2 conditions}
-
-AAEC34E6-7F02-18F2-30BB-744738192A3B,State
-disabled
-
-AAEC34E6-7F02-18F2-30BB-744738192A3B,Widget
-NextButton
-
-AAF04AF0-329D-75A6-BB68-60ECF2EB74F0,CheckCondition
-{Before Action is Executed}
-
-AAF04AF0-329D-75A6-BB68-60ECF2EB74F0,Operator
-false
-
-AAF04AF0-329D-75A6-BB68-60ECF2EB74F0,String
-<%InstallStopped%>
-
-AAFE58A0-2DFB-CA20-1F6E-D3815F885996,Alias
-{Cancel Actions}
-
-ADBCD53E-C9A6-A3CA-1AAC-0DB0CE84F71E,CheckCondition
-{Before Action is Executed}
-
-ADBCD53E-C9A6-A3CA-1AAC-0DB0CE84F71E,FailureMessage
-{Cannot proceed because calibre is running. You can quit it by right clicking the calibre system tray icon.}
-
-ADBCD53E-C9A6-A3CA-1AAC-0DB0CE84F71E,ResultVirtualText
-CalibreRunning
-
-ADBCD53E-C9A6-A3CA-1AAC-0DB0CE84F71E,Script
-{set pid [::InstallAPI::FindProcesses -name calibre.exe]
-if {$pid eq ""} {
- ## myapp.exe is not running
- return 1
-}
-return 0}
-
-AIX-ppc,Active
-No
-
-AIX-ppc,BuildSeparateArchives
-No
-
-AIX-ppc,DefaultDirectoryPermission
-0755
-
-AIX-ppc,DefaultFilePermission
-0755
-
-AIX-ppc,Executable
-<%AppName%>-<%Version%>-<%Platform%>-Install<%Ext%>
-
-AIX-ppc,FallBackToConsole
-Yes
-
-AIX-ppc,InstallDir
-<%Home%>/<%ShortAppName%>
-
-AIX-ppc,InstallMode
-Standard
-
-AIX-ppc,InstallType
-Typical
-
-AIX-ppc,ProgramExecutable
-<%InstallDir%>/calibre
-
-AIX-ppc,ProgramFolderAllUsers
-No
-
-AIX-ppc,ProgramFolderName
-<%AppName%>
-
-AIX-ppc,ProgramLicense
-<%InstallDir%>/LICENSE
-
-AIX-ppc,ProgramName
-{}
-
-AIX-ppc,ProgramReadme
-<%InstallDir%>/README.txt
-
-AIX-ppc,PromptForRoot
-Yes
-
-AIX-ppc,RequireRoot
-No
-
-AIX-ppc,RootInstallDir
-/usr/local/<%ShortAppName%>
-
-B113E8EE-10BD-0792-4CD3-7E0ADC8CD7FA,Action
-{Uninstall Actions}
-
-B3012DC5-8A65-EBF0-8641-CE533A8A7A2D,BackButton,subst
-1
-
-B3012DC5-8A65-EBF0-8641-CE533A8A7A2D,CancelButton,subst
-1
-
-B3012DC5-8A65-EBF0-8641-CE533A8A7A2D,Caption,subst
-1
-
-B3012DC5-8A65-EBF0-8641-CE533A8A7A2D,Message,subst
-1
-
-B3012DC5-8A65-EBF0-8641-CE533A8A7A2D,NextButton,subst
-1
-
-B3F43ECF-D504-F7A0-45FE-A735D202B6F0,Comment
-{Do not display this pane if this is an upgrade install unless there is more than one installation present}
-
-B3F43ECF-D504-F7A0-45FE-A735D202B6F0,Script
-{!<%UpgradeInstall%> || <%PreviousInstallCount%> != 1}
-
-B6D03F99-8B73-BE6E-1050-721B286D3D60,Action
-{Install Actions}
-
-B6D03F99-8B73-BE6E-1050-721B286D3D60,Conditions
-{0 conditions}
-
-B7F0CB71-720B-7DC9-5C5E-AA1AF92D78E2,CheckCondition
-{Before Action is Executed}
-
-B7F0CB71-720B-7DC9-5C5E-AA1AF92D78E2,Operator
-false
-
-B7F0CB71-720B-7DC9-5C5E-AA1AF92D78E2,String
-<%InstallStopped%>
-
-BDC2A4B5-C169-A971-4F35-13B1BF3F8C24,CheckCondition
-{Before Action is Executed}
-
-BDC2A4B5-C169-A971-4F35-13B1BF3F8C24,Filename
-<%ProgramExecutable%>
-
-BE4A731E-1FC2-87A1-547D-91E2CA467AA7,Conditions
-{0 conditions}
-
-BE4A731E-1FC2-87A1-547D-91E2CA467AA7,Directory
-<%InstallDir%>
-
-BE4A731E-1FC2-87A1-547D-91E2CA467AA7,ExecuteAction
-{Before Pane is Displayed}
-
-BE4A731E-1FC2-87A1-547D-91E2CA467AA7,Level
-system
-
-BEF8D398-58BA-1F66-39D6-D4A63D5BEEF9,Destination
-<%InstallDir%>
-
-BEF8D398-58BA-1F66-39D6-D4A63D5BEEF9,FileUpdateMethod
-{Always overwrite files}
-
-BEF8D398-58BA-1F66-39D6-D4A63D5BEEF9,Name
-{Program Files}
-
-BF3067ED-139A-269F-F6DA-9D43B840779A,ExitType
-Finish
-
-BFD200F2-6AC9-8FE2-046F-48E5126BE639,Action
-{Install Actions}
-
-C14CC317-9757-2C79-64C6-BC6C8A267CB1,Conditions
-{1 condition}
-
-C3E9E5D9-58C8-C2C5-DF75-21D908A64782,Message,subst
-1
-
-C4C0A903-CF2A-D25A-27AB-A64219FB7E70,CheckCondition
-{Before Action is Executed}
-
-C4C0A903-CF2A-D25A-27AB-A64219FB7E70,String
-<%CreateQuickLaunchShortcut%>
-
-C5416030-8AB4-3466-F341-9A0BBFEA55EF,CheckCondition
-{Before Action is Executed}
-
-C5416030-8AB4-3466-F341-9A0BBFEA55EF,Operator
-false
-
-C5416030-8AB4-3466-F341-9A0BBFEA55EF,String
-<%UpgradeInstall%>
-
-C5AD5B0C-26BE-16E5-899A-9A9436C8F688,ExitType
-Finish
-
-C7D6444E-DB8B-EE24-3E12-A2AF8A392C5D,Background
-white
-
-C7D6444E-DB8B-EE24-3E12-A2AF8A392C5D,Conditions
-{2 conditions}
-
-C7D6444E-DB8B-EE24-3E12-A2AF8A392C5D,Text,subst
-1
-
-C7D6444E-DB8B-EE24-3E12-A2AF8A392C5D,Type
-checkbutton
-
-C7D6444E-DB8B-EE24-3E12-A2AF8A392C5D,VirtualText
-CreateDesktopShortcut
-
-C7D6444E-DB8B-EE24-3E12-A2AF8A392C5D,X
-185
-
-C7D6444E-DB8B-EE24-3E12-A2AF8A392C5D,Y
-180
-
-C93967A6-0618-9A8C-9554-35292F85F61B,Conditions
-{0 conditions}
-
-C93967A6-0618-9A8C-9554-35292F85F61B,Default
-Yes
-
-C93967A6-0618-9A8C-9554-35292F85F61B,Prompt
-<%InstallStartupText%>
-
-CFBE4459-450B-1FAB-3422-609544334AA2,CheckCondition
-{Before Action is Executed}
-
-CFBE4459-450B-1FAB-3422-609544334AA2,Operator
-false
-
-CFBE4459-450B-1FAB-3422-609544334AA2,String
-<%InstallStopped%>
-
-D79DC0D2-38BC-9D9F-2DF4-3C76D89BF933,ExitType
-Finish
-
-D7F585DB-0DEC-A94E-DAB0-94D558D82764,CheckCondition
-{Before Next Pane is Displayed}
-
-D7F585DB-0DEC-A94E-DAB0-94D558D82764,Comment
-{Check if calibre.exe is still running}
-
-D7F585DB-0DEC-A94E-DAB0-94D558D82764,FailureMessage
-{calibre is still running. Please shut it down before proceeding. You can quit calibre by right clicking on the calibre system tray icon.}
-
-D7F585DB-0DEC-A94E-DAB0-94D558D82764,ResultVirtualText
-CalibreRunning
-
-D7F585DB-0DEC-A94E-DAB0-94D558D82764,Script
-{set pid [::InstallAPI::FindProcesses -name calibre.exe]
-if {$pid eq ""} {
- ## myapp.exe is not running
- return 1
-}
-return 0}
-
-D86BBA5C-4903-33BA-59F8-4266A3D45896,Conditions
-{2 conditions}
-
-D86BBA5C-4903-33BA-59F8-4266A3D45896,IconPath
-{<%InstallDir%>\library.ico}
-
-D86BBA5C-4903-33BA-59F8-4266A3D45896,ShortcutDirectory
-<%QUICK_LAUNCH%>
-
-D86BBA5C-4903-33BA-59F8-4266A3D45896,ShortcutName
-<%AppName%>
-
-D86BBA5C-4903-33BA-59F8-4266A3D45896,TargetFileName
-<%ProgramExecutable%>
-
-D86BBA5C-4903-33BA-59F8-4266A3D45896,WorkingDirectory
-<%InstallDir%>
-
-D9ADE41C-B744-690C-2CED-CF826BF03D2E,Components
-F6829AB7-9F66-4CEE-CA0E-21F54C6D3609
-
-D9ADE41C-B744-690C-2CED-CF826BF03D2E,Description,subst
-1
-
-D9ADE41C-B744-690C-2CED-CF826BF03D2E,DisplayName,subst
-1
-
-D9ADE41C-B744-690C-2CED-CF826BF03D2E,Name
-Typical
-
-E32519F3-A540-C8F3-957F-4C1DB5B25DFE,Conditions
-{2 conditions}
-
-E32519F3-A540-C8F3-957F-4C1DB5B25DFE,IconPath
-{<%InstallDir%>\library.ico}
-
-E32519F3-A540-C8F3-957F-4C1DB5B25DFE,ShortcutName
-<%AppName%>
-
-E32519F3-A540-C8F3-957F-4C1DB5B25DFE,TargetFileName
-<%ProgramExecutable%>
-
-E32519F3-A540-C8F3-957F-4C1DB5B25DFE,WorkingDirectory
-<%InstallDir%>
-
-E560F3A1-208D-2B4F-2C87-E08595F8E1CD,CheckCondition
-{Before Action is Executed}
-
-E560F3A1-208D-2B4F-2C87-E08595F8E1CD,String
-<%LaunchApplication%>
-
-E57B5080-47C0-3209-40DC-144F41FBF866,CheckCondition
-{Before Action is Executed}
-
-E57B5080-47C0-3209-40DC-144F41FBF866,Platform
-Windows
-
-E5CBB018-A89D-3145-CFF5-CFC3B62BEA97,State
-disabled
-
-E5CBB018-A89D-3145-CFF5-CFC3B62BEA97,Widget
-{NextButton; CancelButton}
-
-E611105F-DC85-9E20-4F7B-E63C54E5DF06,Message,subst
-1
-
-EDD03974-B223-B62F-DA4B-FD5E94861CFE,Conditions
-{1 condition}
-
-EE3AF196-AF0F-4947-CD75-7894634F48A6,Conditions
-{1 condition}
-
-EE3AF196-AF0F-4947-CD75-7894634F48A6,FileName
-<%ShortAppName%>-uninstall
-
-EE3AF196-AF0F-4947-CD75-7894634F48A6,ShortcutName
-{Uninstall <%AppName%>}
-
-EE3AF196-AF0F-4947-CD75-7894634F48A6,TargetFileName
-<%Uninstaller%>
-
-EE3AF196-AF0F-4947-CD75-7894634F48A6,WorkingDirectory
-<%InstallDir%>
-
-EE91F1AF-8AEB-B248-D932-3702CC788AF9,BackButton,subst
-1
-
-EE91F1AF-8AEB-B248-D932-3702CC788AF9,CancelButton,subst
-1
-
-EE91F1AF-8AEB-B248-D932-3702CC788AF9,Caption,subst
-1
-
-EE91F1AF-8AEB-B248-D932-3702CC788AF9,Message,subst
-1
-
-EE91F1AF-8AEB-B248-D932-3702CC788AF9,NextButton,subst
-1
-
-EE91F1AF-8AEB-B248-D932-3702CC788AF9,Subtitle,subst
-1
-
-EE91F1AF-8AEB-B248-D932-3702CC788AF9,Text,subst
-1
-
-EE91F1AF-8AEB-B248-D932-3702CC788AF9,Title,subst
-1
-
-F6829AB7-9F66-4CEE-CA0E-21F54C6D3609,Description,subst
-1
-
-F6829AB7-9F66-4CEE-CA0E-21F54C6D3609,DisplayName,subst
-1
-
-F6829AB7-9F66-4CEE-CA0E-21F54C6D3609,FileGroups
-BEF8D398-58BA-1F66-39D6-D4A63D5BEEF9
-
-F6829AB7-9F66-4CEE-CA0E-21F54C6D3609,Name
-Main
-
-F6829AB7-9F66-4CEE-CA0E-21F54C6D3609,RequiredComponent
-Yes
-
-F6C53555-674E-0479-7EC0-FE737201EA0A,CheckCondition
-{Before Next Action is Executed}
-
-F6C53555-674E-0479-7EC0-FE737201EA0A,FailureMessage
-<%DirectoryPermissionText%>
-
-F6C53555-674E-0479-7EC0-FE737201EA0A,Filename
-<%InstallDir%>
-
-F6C53555-674E-0479-7EC0-FE737201EA0A,Permission
-{can create}
-
-F8921FAD-AFBD-348C-F26C-67855FA4691D,CheckCondition
-{Before Action is Executed}
-
-F8921FAD-AFBD-348C-F26C-67855FA4691D,String
-<%GuiMode%>
-
-FAE98A0F-B6A9-30D2-A9EA-33F9D5F8B3D0,BackButton,subst
-1
-
-FAE98A0F-B6A9-30D2-A9EA-33F9D5F8B3D0,CancelButton,subst
-1
-
-FAE98A0F-B6A9-30D2-A9EA-33F9D5F8B3D0,Caption,subst
-1
-
-FAE98A0F-B6A9-30D2-A9EA-33F9D5F8B3D0,Conditions
-{0 conditions}
-
-FAE98A0F-B6A9-30D2-A9EA-33F9D5F8B3D0,FileLabel,subst
-1
-
-FAE98A0F-B6A9-30D2-A9EA-33F9D5F8B3D0,Message,subst
-1
-
-FAE98A0F-B6A9-30D2-A9EA-33F9D5F8B3D0,NextButton,subst
-1
-
-FAE98A0F-B6A9-30D2-A9EA-33F9D5F8B3D0,ProgressValue,subst
-1
-
-FAE98A0F-B6A9-30D2-A9EA-33F9D5F8B3D0,Subtitle,subst
-1
-
-FAE98A0F-B6A9-30D2-A9EA-33F9D5F8B3D0,Title,subst
-1
-
-FBA33088-C809-DD6B-D337-EADBF1CEE966,CheckCondition
-{Before Action is Executed}
-
-FBA33088-C809-DD6B-D337-EADBF1CEE966,Operator
-false
-
-FBA33088-C809-DD6B-D337-EADBF1CEE966,String
-<%InstallStopped%>
-
-FreeBSD-4-x86,Active
-No
-
-FreeBSD-4-x86,BuildSeparateArchives
-No
-
-FreeBSD-4-x86,DefaultDirectoryPermission
-0755
-
-FreeBSD-4-x86,DefaultFilePermission
-0755
-
-FreeBSD-4-x86,Executable
-<%AppName%>-<%Version%>-<%Platform%>-Install<%Ext%>
-
-FreeBSD-4-x86,FallBackToConsole
-Yes
-
-FreeBSD-4-x86,InstallDir
-<%Home%>/<%ShortAppName%>
-
-FreeBSD-4-x86,InstallMode
-Standard
-
-FreeBSD-4-x86,InstallType
-Typical
-
-FreeBSD-4-x86,ProgramExecutable
-<%InstallDir%>/calibre
-
-FreeBSD-4-x86,ProgramFolderAllUsers
-No
-
-FreeBSD-4-x86,ProgramFolderName
-<%AppName%>
-
-FreeBSD-4-x86,ProgramLicense
-<%InstallDir%>/LICENSE.txt
-
-FreeBSD-4-x86,ProgramName
-{}
-
-FreeBSD-4-x86,ProgramReadme
-<%InstallDir%>/README.txt
-
-FreeBSD-4-x86,PromptForRoot
-Yes
-
-FreeBSD-4-x86,RequireRoot
-No
-
-FreeBSD-4-x86,RootInstallDir
-/usr/local/<%ShortAppName%>
-
-FreeBSD-5-x86,Active
-No
-
-FreeBSD-5-x86,BuildSeparateArchives
-No
-
-FreeBSD-5-x86,DefaultDirectoryPermission
-0755
-
-FreeBSD-5-x86,DefaultFilePermission
-0755
-
-FreeBSD-5-x86,Executable
-<%AppName%>-<%Version%>-<%Platform%>-Install<%Ext%>
-
-FreeBSD-5-x86,FallBackToConsole
-Yes
-
-FreeBSD-5-x86,InstallDir
-<%Home%>/<%ShortAppName%>
-
-FreeBSD-5-x86,InstallMode
-Standard
-
-FreeBSD-5-x86,InstallType
-Typical
-
-FreeBSD-5-x86,ProgramExecutable
-{}
-
-FreeBSD-5-x86,ProgramFolderAllUsers
-No
-
-FreeBSD-5-x86,ProgramFolderName
-<%AppName%>
-
-FreeBSD-5-x86,ProgramLicense
-<%InstallDir%>/LICENSE.txt
-
-FreeBSD-5-x86,ProgramName
-{}
-
-FreeBSD-5-x86,ProgramReadme
-<%InstallDir%>/README.txt
-
-FreeBSD-5-x86,PromptForRoot
-Yes
-
-FreeBSD-5-x86,RequireRoot
-No
-
-FreeBSD-5-x86,RootInstallDir
-/usr/local/<%ShortAppName%>
-
-FreeBSD-6-x86,Active
-No
-
-FreeBSD-6-x86,BuildSeparateArchives
-No
-
-FreeBSD-6-x86,DefaultDirectoryPermission
-0755
-
-FreeBSD-6-x86,DefaultFilePermission
-0755
-
-FreeBSD-6-x86,Executable
-<%AppName%>-<%Version%>-<%Platform%>-Install<%Ext%>
-
-FreeBSD-6-x86,FallBackToConsole
-Yes
-
-FreeBSD-6-x86,InstallDir
-<%Home%>/<%ShortAppName%>
-
-FreeBSD-6-x86,InstallMode
-Standard
-
-FreeBSD-6-x86,InstallType
-Typical
-
-FreeBSD-6-x86,ProgramExecutable
-{}
-
-FreeBSD-6-x86,ProgramFolderAllUsers
-No
-
-FreeBSD-6-x86,ProgramFolderName
-<%AppName%>
-
-FreeBSD-6-x86,ProgramLicense
-<%InstallDir%>/LICENSE.txt
-
-FreeBSD-6-x86,ProgramName
-{}
-
-FreeBSD-6-x86,ProgramReadme
-<%InstallDir%>/README.txt
-
-FreeBSD-6-x86,PromptForRoot
-Yes
-
-FreeBSD-6-x86,RequireRoot
-No
-
-FreeBSD-6-x86,RootInstallDir
-/usr/local/<%ShortAppName%>
-
-FreeBSD-7-x86,Active
-No
-
-FreeBSD-7-x86,BuildSeparateArchives
-No
-
-FreeBSD-7-x86,DefaultDirectoryPermission
-0755
-
-FreeBSD-7-x86,DefaultFilePermission
-0755
-
-FreeBSD-7-x86,Executable
-<%AppName%>-<%Version%>-<%Platform%>-Install<%Ext%>
-
-FreeBSD-7-x86,FallBackToConsole
-Yes
-
-FreeBSD-7-x86,InstallDir
-<%Home%>/<%ShortAppName%>
-
-FreeBSD-7-x86,InstallMode
-Standard
-
-FreeBSD-7-x86,InstallType
-Typical
-
-FreeBSD-7-x86,ProgramExecutable
-{}
-
-FreeBSD-7-x86,ProgramFolderAllUsers
-No
-
-FreeBSD-7-x86,ProgramFolderName
-<%AppName%>
-
-FreeBSD-7-x86,ProgramLicense
-<%InstallDir%>/LICENSE.txt
-
-FreeBSD-7-x86,ProgramName
-{}
-
-FreeBSD-7-x86,ProgramReadme
-<%InstallDir%>/README.txt
-
-FreeBSD-7-x86,PromptForRoot
-Yes
-
-FreeBSD-7-x86,RequireRoot
-No
-
-FreeBSD-7-x86,RootInstallDir
-/usr/local/<%ShortAppName%>
-
-FreeBSD-x86,Active
-No
-
-FreeBSD-x86,BuildSeparateArchives
-No
-
-FreeBSD-x86,DefaultDirectoryPermission
-0755
-
-FreeBSD-x86,DefaultFilePermission
-0755
-
-FreeBSD-x86,Executable
-<%AppName%>-<%Version%>-<%Platform%>-Install<%Ext%>
-
-FreeBSD-x86,FallBackToConsole
-Yes
-
-FreeBSD-x86,InstallDir
-<%Home%>/<%ShortAppName%>
-
-FreeBSD-x86,InstallMode
-Standard
-
-FreeBSD-x86,InstallType
-Typical
-
-FreeBSD-x86,ProgramExecutable
-<%InstallDir%>/calibre
-
-FreeBSD-x86,ProgramFolderAllUsers
-No
-
-FreeBSD-x86,ProgramFolderName
-<%AppName%>
-
-FreeBSD-x86,ProgramLicense
-<%InstallDir%>/LICENSE.txt
-
-FreeBSD-x86,ProgramName
-{}
-
-FreeBSD-x86,ProgramReadme
-<%InstallDir%>/README.txt
-
-FreeBSD-x86,PromptForRoot
-Yes
-
-FreeBSD-x86,RequireRoot
-No
-
-FreeBSD-x86,RootInstallDir
-/usr/local/<%ShortAppName%>
-
-HPUX-hppa,Active
-No
-
-HPUX-hppa,BuildSeparateArchives
-No
-
-HPUX-hppa,DefaultDirectoryPermission
-0755
-
-HPUX-hppa,DefaultFilePermission
-0755
-
-HPUX-hppa,Executable
-<%AppName%>-<%Version%>-<%Platform%>-Install<%Ext%>
-
-HPUX-hppa,FallBackToConsole
-Yes
-
-HPUX-hppa,InstallDir
-<%Home%>/<%ShortAppName%>
-
-HPUX-hppa,InstallMode
-Standard
-
-HPUX-hppa,InstallType
-Typical
-
-HPUX-hppa,ProgramExecutable
-<%InstallDir%>/calibre
-
-HPUX-hppa,ProgramFolderAllUsers
-No
-
-HPUX-hppa,ProgramFolderName
-<%AppName%>
-
-HPUX-hppa,ProgramLicense
-<%InstallDir%>/LICENSE.txt
-
-HPUX-hppa,ProgramName
-{}
-
-HPUX-hppa,ProgramReadme
-<%InstallDir%>/README.txt
-
-HPUX-hppa,PromptForRoot
-Yes
-
-HPUX-hppa,RequireRoot
-No
-
-HPUX-hppa,RootInstallDir
-/usr/local/<%ShortAppName%>
-
-Linux-x86,Active
-No
-
-Linux-x86,BuildSeparateArchives
-No
-
-Linux-x86,DefaultDirectoryPermission
-0755
-
-Linux-x86,DefaultFilePermission
-0755
-
-Linux-x86,Executable
-<%AppName%>-<%Version%>-<%Platform%>-Install<%Ext%>
-
-Linux-x86,FallBackToConsole
-Yes
-
-Linux-x86,InstallDir
-<%Home%>/<%ShortAppName%>
-
-Linux-x86,InstallMode
-Standard
-
-Linux-x86,InstallType
-Typical
-
-Linux-x86,ProgramExecutable
-<%InstallDir%>/calibre
-
-Linux-x86,ProgramFolderAllUsers
-No
-
-Linux-x86,ProgramFolderName
-<%AppName%>
-
-Linux-x86,ProgramLicense
-<%InstallDir%>/LICENSE.txt
-
-Linux-x86,ProgramName
-{}
-
-Linux-x86,ProgramReadme
-<%InstallDir%>/README.txt
-
-Linux-x86,PromptForRoot
-Yes
-
-Linux-x86,RequireRoot
-Yes
-
-Linux-x86,RootInstallDir
-/opt/<%ShortAppName%>
-
-Linux-x86_64,Active
-No
-
-Linux-x86_64,BuildSeparateArchives
-No
-
-Linux-x86_64,DefaultDirectoryPermission
-0755
-
-Linux-x86_64,DefaultFilePermission
-0755
-
-Linux-x86_64,Executable
-<%AppName%>-<%Version%>-<%Platform%>-Install<%Ext%>
-
-Linux-x86_64,FallBackToConsole
-Yes
-
-Linux-x86_64,InstallDir
-<%Home%>/<%ShortAppName%>
-
-Linux-x86_64,InstallMode
-Standard
-
-Linux-x86_64,InstallType
-Typical
-
-Linux-x86_64,ProgramExecutable
-{}
-
-Linux-x86_64,ProgramFolderAllUsers
-No
-
-Linux-x86_64,ProgramFolderName
-<%AppName%>
-
-Linux-x86_64,ProgramLicense
-<%InstallDir%>/LICENSE.txt
-
-Linux-x86_64,ProgramName
-{}
-
-Linux-x86_64,ProgramReadme
-<%InstallDir%>/README.txt
-
-Linux-x86_64,PromptForRoot
-Yes
-
-Linux-x86_64,RequireRoot
-No
-
-Linux-x86_64,RootInstallDir
-/usr/local/<%ShortAppName%>
-
-Solaris-sparc,Active
-No
-
-Solaris-sparc,BuildSeparateArchives
-No
-
-Solaris-sparc,DefaultDirectoryPermission
-0755
-
-Solaris-sparc,DefaultFilePermission
-0755
-
-Solaris-sparc,Executable
-<%AppName%>-<%Version%>-<%Platform%>-Install<%Ext%>
-
-Solaris-sparc,FallBackToConsole
-Yes
-
-Solaris-sparc,InstallDir
-<%Home%>/<%ShortAppName%>
-
-Solaris-sparc,InstallMode
-Standard
-
-Solaris-sparc,InstallType
-Typical
-
-Solaris-sparc,ProgramExecutable
-<%InstallDir%>/calibre
-
-Solaris-sparc,ProgramFolderAllUsers
-No
-
-Solaris-sparc,ProgramFolderName
-<%AppName%>
-
-Solaris-sparc,ProgramLicense
-<%InstallDir%>/LICENSE.txt
-
-Solaris-sparc,ProgramName
-{}
-
-Solaris-sparc,ProgramReadme
-<%InstallDir%>/README.txt
-
-Solaris-sparc,PromptForRoot
-Yes
-
-Solaris-sparc,RequireRoot
-No
-
-Solaris-sparc,RootInstallDir
-/usr/local/<%ShortAppName%>
-
-Solaris-x86,Active
-No
-
-Solaris-x86,BuildSeparateArchives
-No
-
-Solaris-x86,DefaultDirectoryPermission
-0755
-
-Solaris-x86,DefaultFilePermission
-0755
-
-Solaris-x86,Executable
-<%AppName%>-<%Version%>-<%Platform%>-Install<%Ext%>
-
-Solaris-x86,FallBackToConsole
-Yes
-
-Solaris-x86,InstallDir
-<%Home%>/<%ShortAppName%>
-
-Solaris-x86,InstallMode
-Standard
-
-Solaris-x86,InstallType
-Typical
-
-Solaris-x86,ProgramExecutable
-{}
-
-Solaris-x86,ProgramFolderAllUsers
-No
-
-Solaris-x86,ProgramFolderName
-<%AppName%>
-
-Solaris-x86,ProgramLicense
-<%InstallDir%>/LICENSE.txt
-
-Solaris-x86,ProgramName
-{}
-
-Solaris-x86,ProgramReadme
-<%InstallDir%>/README.txt
-
-Solaris-x86,PromptForRoot
-Yes
-
-Solaris-x86,RequireRoot
-No
-
-Solaris-x86,RootInstallDir
-/usr/local/<%ShortAppName%>
-
-TarArchive,Active
-No
-
-TarArchive,BuildSeparateArchives
-No
-
-TarArchive,CompressionLevel
-6
-
-TarArchive,DefaultDirectoryPermission
-0755
-
-TarArchive,DefaultFilePermission
-0755
-
-TarArchive,Executable
-<%AppName%>-<%Version%>-<%Platform%>-Install<%Ext%>
-
-TarArchive,FallBackToConsole
-Yes
-
-TarArchive,InstallDir
-<%Home%>/<%ShortAppName%>
-
-TarArchive,InstallMode
-Standard
-
-TarArchive,InstallType
-Typical
-
-TarArchive,OutputFileName
-<%ShortAppName%>-<%Version%>.tar.gz
-
-TarArchive,ProgramExecutable
-{}
-
-TarArchive,ProgramFolderAllUsers
-No
-
-TarArchive,ProgramFolderName
-<%AppName%>
-
-TarArchive,ProgramLicense
-<%InstallDir%>/LICENSE.txt
-
-TarArchive,ProgramName
-{}
-
-TarArchive,ProgramReadme
-<%InstallDir%>/README.txt
-
-TarArchive,PromptForRoot
-Yes
-
-TarArchive,RequireRoot
-No
-
-TarArchive,RootInstallDir
-/usr/local/<%ShortAppName%>
-
-TarArchive,VirtualTextMap
-{<%InstallDir%> <%ShortAppName%>}
-
-Windows,Active
-Yes
-
-Windows,BuildSeparateArchives
-No
-
-Windows,Executable
-<%AppName%>-<%Version%><%Ext%>
-
-Windows,FileDescription
-{<%AppName%> <%Version%> Setup}
-
-Windows,IncludeTWAPI
-Yes
-
-Windows,InstallDir
-<%PROGRAM_FILES%>/<%AppName%>
-
-Windows,InstallMode
-Standard
-
-Windows,InstallType
-Typical
-
-Windows,LastRequireAdministrator
-Yes
-
-Windows,ProgramExecutable
-<%InstallDir%>/calibre.exe
-
-Windows,ProgramFolderAllUsers
-Yes
-
-Windows,ProgramFolderName
-<%AppName%>
-
-Windows,ProgramLicense
-<%InstallDir%>/LICENSE
-
-Windows,ProgramName
-{}
-
-Windows,ProgramReadme
-<%InstallDir%>/README.txt
-
-Windows,RequireAdministrator
-Yes
-
-Windows,UseUncompressedBinaries
-No
-
-Windows,WindowsIcon
-{Setup Blue Screen.ico}
-
-ZipArchive,Active
-No
-
-ZipArchive,BuildSeparateArchives
-No
-
-ZipArchive,CompressionLevel
-6
-
-ZipArchive,DefaultDirectoryPermission
-0755
-
-ZipArchive,DefaultFilePermission
-0755
-
-ZipArchive,Executable
-<%AppName%>-<%Version%>-<%Platform%>-Install<%Ext%>
-
-ZipArchive,FallBackToConsole
-Yes
-
-ZipArchive,InstallDir
-<%Home%>/<%ShortAppName%>
-
-ZipArchive,InstallMode
-Standard
-
-ZipArchive,InstallType
-Typical
-
-ZipArchive,OutputFileName
-<%ShortAppName%>-<%Version%>.zip
-
-ZipArchive,ProgramExecutable
-{}
-
-ZipArchive,ProgramFolderAllUsers
-No
-
-ZipArchive,ProgramFolderName
-<%AppName%>
-
-ZipArchive,ProgramLicense
-<%InstallDir%>/LICENSE.txt
-
-ZipArchive,ProgramName
-{}
-
-ZipArchive,ProgramReadme
-<%InstallDir%>/README.txt
-
-ZipArchive,PromptForRoot
-Yes
-
-ZipArchive,RequireRoot
-No
-
-ZipArchive,RootInstallDir
-/usr/local/<%ShortAppName%>
-
-ZipArchive,VirtualTextMap
-{<%InstallDir%> <%ShortAppName%>}
-
-}
-
-::msgcat::mcmset de {
-1356216E-90D2-8324-0EEB-975A64F23EB8,Message
-<%InstallingApplicationText%>
-
-442920D9-8A51-9476-14E4-787D5C230E84,Message
-<%UninstallCompleteText%>
-
-C3E9E5D9-58C8-C2C5-DF75-21D908A64782,Message
-<%UninstallingApplicationText%>
-
-E611105F-DC85-9E20-4F7B-E63C54E5DF06,Message
-<%InstallationCompleteText%>
-
-}
-::msgcat::mcmset en {
-1356216E-90D2-8324-0EEB-975A64F23EB8,Message
-<%InstallingApplicationText%>
-
-21B897C4-24BE-70D1-58EA-DE78EFA60719,Message
-{USB Driver installation failed with return code <%DevconStatus%> and console output \n\n<%DevconResult%>}
-
-21B897C4-24BE-70D1-58EA-DE78EFA60719,Title
-{USB Driver installation failed}
-
-27B44808-381F-7202-A0D9-40788CD679D0,Text
-<%CreateQuickLaunchShortcutText%>
-
-3EA07B17-04D8-6508-B535-96CC7173B49A,Caption
-{Welcome to the installer for <%AppName%>}
-
-3EA07B17-04D8-6508-B535-96CC7173B49A,Message
-{<%AppName%> version <%Version%> created by Kovid Goyal
-
-Please make sure that calibre is not running, as this will cause the install to fail. Click Next to continue or Cancel to exit Setup.}
-
-442920D9-8A51-9476-14E4-787D5C230E84,Message
-<%UninstallCompleteText%>
-
-48E8A9D6-B57E-C506-680D-898C65DD2A1B,Message
-<%InstallStartupText%>
-
-48E8A9D6-B57E-C506-680D-898C65DD2A1B,Title
-<%InstallApplicationText%>
-
-64B8D0F3-4B11-DA22-D6E7-7248872D5FA7,Message
-<%UninstallStartupText%>
-
-64B8D0F3-4B11-DA22-D6E7-7248872D5FA7,Title
-<%UninstallApplicationText%>
-
-7C57D3D3-B1DB-0888-B098-B46AD4F99F7E,Text
-<%LaunchApplicationText%>
-
-8A7FD0C2-F053-8764-F204-4BAE71E05708,Caption
-{<%AppName%> Installation complete}
-
-8A7FD0C2-F053-8764-F204-4BAE71E05708,Message
-{Installation of <%AppName%> was successful. Click Finish to quit the installer. <%AppName%> can be launched from the start menu.}
-
-940F7FED-7D20-7264-3BF9-ED78205A76B3,Text
-<%CreateDesktopShortcutText%>
-
-9ACCDC35-E034-F142-ED42-AC8EC2B9AE2D,CancelButton
-<%Cancel%>
-
-9ACCDC35-E034-F142-ED42-AC8EC2B9AE2D,NextButton
-<%Next%>
-
-9ACCDC35-E034-F142-ED42-AC8EC2B9AE2D,Text
-<%License%>
-
-A246E5D4-5489-19CC-C7B1-AA0C98D55F85,Text
-<%CreateQuickLaunchShortcutText%>
-
-C3E9E5D9-58C8-C2C5-DF75-21D908A64782,Message
-<%UninstallingApplicationText%>
-
-C7D6444E-DB8B-EE24-3E12-A2AF8A392C5D,Text
-<%CreateDesktopShortcutText%>
-
-D9ADE41C-B744-690C-2CED-CF826BF03D2E,Description
-<%TypicalInstallDescription%>
-
-E611105F-DC85-9E20-4F7B-E63C54E5DF06,Message
-<%InstallationCompleteText%>
-
-F6829AB7-9F66-4CEE-CA0E-21F54C6D3609,Description
-<%ProgramFilesDescription%>
-
-}
-::msgcat::mcmset es {
-1356216E-90D2-8324-0EEB-975A64F23EB8,Message
-<%InstallingApplicationText%>
-
-442920D9-8A51-9476-14E4-787D5C230E84,Message
-<%UninstallCompleteText%>
-
-C3E9E5D9-58C8-C2C5-DF75-21D908A64782,Message
-<%UninstallingApplicationText%>
-
-E611105F-DC85-9E20-4F7B-E63C54E5DF06,Message
-<%InstallationCompleteText%>
-
-}
-::msgcat::mcmset fr {
-1356216E-90D2-8324-0EEB-975A64F23EB8,Message
-<%InstallingApplicationText%>
-
-442920D9-8A51-9476-14E4-787D5C230E84,Message
-<%UninstallCompleteText%>
-
-C3E9E5D9-58C8-C2C5-DF75-21D908A64782,Message
-<%UninstallingApplicationText%>
-
-E611105F-DC85-9E20-4F7B-E63C54E5DF06,Message
-<%InstallationCompleteText%>
-
-}
-::msgcat::mcmset hu {
-1356216E-90D2-8324-0EEB-975A64F23EB8,Message
-<%InstallingApplicationText%>
-
-442920D9-8A51-9476-14E4-787D5C230E84,Message
-<%UninstallCompleteText%>
-
-C3E9E5D9-58C8-C2C5-DF75-21D908A64782,Message
-<%UninstallingApplicationText%>
-
-E611105F-DC85-9E20-4F7B-E63C54E5DF06,Message
-<%InstallationCompleteText%>
-
-}
-::msgcat::mcmset it {
-1356216E-90D2-8324-0EEB-975A64F23EB8,Message
-<%InstallingApplicationText%>
-
-442920D9-8A51-9476-14E4-787D5C230E84,Message
-<%UninstallCompleteText%>
-
-C3E9E5D9-58C8-C2C5-DF75-21D908A64782,Message
-<%UninstallingApplicationText%>
-
-E611105F-DC85-9E20-4F7B-E63C54E5DF06,Message
-<%InstallationCompleteText%>
-
-}
-::msgcat::mcmset nl {
-1356216E-90D2-8324-0EEB-975A64F23EB8,Message
-<%InstallingApplicationText%>
-
-442920D9-8A51-9476-14E4-787D5C230E84,Message
-<%UninstallCompleteText%>
-
-C3E9E5D9-58C8-C2C5-DF75-21D908A64782,Message
-<%UninstallingApplicationText%>
-
-E611105F-DC85-9E20-4F7B-E63C54E5DF06,Message
-<%InstallationCompleteText%>
-
-}
-::msgcat::mcmset pl {
-1356216E-90D2-8324-0EEB-975A64F23EB8,Message
-<%InstallingApplicationText%>
-
-442920D9-8A51-9476-14E4-787D5C230E84,Message
-<%UninstallCompleteText%>
-
-C3E9E5D9-58C8-C2C5-DF75-21D908A64782,Message
-<%UninstallingApplicationText%>
-
-E611105F-DC85-9E20-4F7B-E63C54E5DF06,Message
-<%InstallationCompleteText%>
-
-}
-::msgcat::mcmset pt_br {
-1356216E-90D2-8324-0EEB-975A64F23EB8,Message
-<%InstallingApplicationText%>
-
-442920D9-8A51-9476-14E4-787D5C230E84,Message
-<%UninstallCompleteText%>
-
-C3E9E5D9-58C8-C2C5-DF75-21D908A64782,Message
-<%UninstallingApplicationText%>
-
-E611105F-DC85-9E20-4F7B-E63C54E5DF06,Message
-<%InstallationCompleteText%>
-
-}
-::msgcat::mcmset ru {
-1356216E-90D2-8324-0EEB-975A64F23EB8,Message
-<%InstallingApplicationText%>
-
-442920D9-8A51-9476-14E4-787D5C230E84,Message
-<%UninstallCompleteText%>
-
-C3E9E5D9-58C8-C2C5-DF75-21D908A64782,Message
-<%UninstallingApplicationText%>
-
-E611105F-DC85-9E20-4F7B-E63C54E5DF06,Message
-<%InstallationCompleteText%>
-
-}
-
diff --git a/setup/installer/windows/en-us.xml b/setup/installer/windows/en-us.xml
new file mode 100644
index 0000000000..4c157e5a4f
--- /dev/null
+++ b/setup/installer/windows/en-us.xml
@@ -0,0 +1,5 @@
+
+
+ If you are upgrading from a {app} version older than 0.6.17, please uninstall {app} first. Click Advanced to change installation settings.
+
+
diff --git a/setup/installer/windows/freeze.py b/setup/installer/windows/freeze.py
index 6868903e72..4960337c1c 100644
--- a/setup/installer/windows/freeze.py
+++ b/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 '
__docformat__ = 'restructuredtext en'
-'''
-Freeze app into executable using py2exe.
-'''
-QT_DIR = 'C:\\Qt\\4.5.2'
+import sys, os, shutil, glob, py_compile, subprocess, re
+
+from setup import Command, modules, functions, basenames, __version__, \
+ __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
-
-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)
+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
- info, warn = self.info, self.warn
- main()
+ self.SW = SW
+ self.opts = opts
+ 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 = '''\
-import sys, os
-if sys.frozen == "windows_exe":
- class Stderr(object):
- softspace = 0
- _file = None
- _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()
+ self.initbase()
+ self.build_launchers()
+ self.freeze()
+ self.embed_manifests()
+ self.install_site_py()
+ self.create_installer()
- #del sys._MessageBox
- #del Stderr
+ def initbase(self):
+ if self.e(self.base):
+ shutil.rmtree(self.base)
+ os.makedirs(self.base)
- class Blackhole(object):
- softspace = 0
- def write(self, text):
- pass
- def flush(self):
- pass
- sys.stdout = Stderr()
- sys.stderr = Stderr()
- del Blackhole
+ def freeze(self):
+ shutil.copy2(self.j(self.src_root, 'LICENSE'), self.base)
-# Disable linecache.getline() which is called by
-# traceback.extract_stack() when an exception occurs to try and read
-# 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')
+ self.info('Adding plugins...')
+ tgt = os.path.join(self.base, 'plugins')
if not os.path.exists(tgt):
os.mkdir(tgt)
- for f in glob.glob(os.path.join(BASE_DIR, 'src', 'calibre', 'plugins', '*.dll')):
- shutil.copyfile(f, os.path.join(self.dist_dir, os.path.basename(f)))
- for f in glob.glob(os.path.join(BASE_DIR, 'src', 'calibre', 'plugins', '*.pyd')):
- shutil.copyfile(f, os.path.join(tgt, os.path.basename(f)))
- 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'))
+ base = self.j(self.SRC, 'calibre', 'plugins')
+ for pat in ('*.pyd', '*.manifest'):
+ for f in glob.glob(self.j(base, pat)):
+ shutil.copy2(f, tgt)
-
- info('\nAdding resources...')
- tgt = os.path.join(self.dist_dir, 'resources')
+ self.info('Adding resources...')
+ tgt = self.j(self.base, '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')
- shutil.copyfile(os.path.join(QT_DIR, 'bin', 'QtXml4.dll'),
- os.path.join(self.dist_dir, 'QtXml4.dll'))
- info('\nAdding Qt plugins...')
+ self.info('Adding Qt and python...')
+ self.dll_dir = self.j(self.base, 'DLLs')
+ shutil.copytree(r'C:\Python%s\DLLs'%self.py_ver, self.dll_dir,
+ 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)
- for pat in ('*.dll', '*.xml'):
+ shutil.copy2(os.path.join(bindir, 'pdftohtml.exe'), self.base)
+ for pat in ('*.dll',):
for f in glob.glob(os.path.join(bindir, pat)):
- shutil.copy2(f, PY2EXE_DIR)
- for x in ('Microsoft.VC90.CRT', 'zlib1.dll', 'libxml2.dll'):
- shutil.copy2(os.path.join(bindir, x+'.manifest'), PY2EXE_DIR)
+ ok = True
+ for ex in ('expatw',):
+ 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'))
-
- print
- print 'Doing DLL redirection' # See http://msdn.microsoft.com/en-us/library/ms682600(VS.85).aspx
- for f in glob.glob(os.path.join(PY2EXE_DIR, '*.exe')):
- open(f + '.local', 'w').write('\n')
-
-
-
-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
+ os.path.join(self.base, 'fontconfig'))
+ # Copy ImageMagick
+ for pat in ('*.dll', '*.xml'):
+ for f in glob.glob(self.j(IMAGEMAGICK, pat)):
+ ok = True
+ 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 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)
diff --git a/setup/installer/windows/main.c b/setup/installer/windows/main.c
new file mode 100644
index 0000000000..d76850504e
--- /dev/null
+++ b/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
diff --git a/setup/installer/windows/notes.rst b/setup/installer/windows/notes.rst
index 9bacab4604..0fdecda27c 100644
--- a/setup/installer/windows/notes.rst
+++ b/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
diff --git a/setup/installer/windows/site.py b/setup/installer/windows/site.py
new file mode 100644
index 0000000000..0e770f3253
--- /dev/null
+++ b/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 '
+__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()
+
+
diff --git a/setup/installer/windows/template.rc b/setup/installer/windows/template.rc
new file mode 100644
index 0000000000..bcdc918682
--- /dev/null
+++ b/setup/installer/windows/template.rc
@@ -0,0 +1,42 @@
+#include
+
+#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}"
diff --git a/setup/installer/windows/util.c b/setup/installer/windows/util.c
new file mode 100644
index 0000000000..7aa2d019e2
--- /dev/null
+++ b/setup/installer/windows/util.c
@@ -0,0 +1,414 @@
+/*
+ * Copyright 2009 Kovid Goyal
+ */
+
+#include "util.h"
+#include
+#include
+#include
+
+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;
+
+}
diff --git a/setup/installer/windows/util.h b/setup/installer/windows/util.h
new file mode 100644
index 0000000000..dcdbc36601
--- /dev/null
+++ b/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
+#ifdef _DLL
+# include
+#endif
+#include
+#include
+#include
+
+#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);
+
diff --git a/setup/installer/windows/wix-template.xml b/setup/installer/windows/wix-template.xml
new file mode 100644
index 0000000000..015ef8c87b
--- /dev/null
+++ b/setup/installer/windows/wix-template.xml
@@ -0,0 +1,130 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {app_components}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ = 501)]]>
+
+
+
+
+ WIXUI_EXITDIALOGOPTIONALCHECKBOX = 1 and NOT Installed
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/setup/installer/windows/wix.py b/setup/installer/windows/wix.py
new file mode 100644
index 0000000000..fe560f43a3
--- /dev/null
+++ b/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 '
+__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(
+ '' %
+ (self.file_id_map[f], f, x))
+ c = process_dir(f)
+ components.extend(c)
+ components.append('')
+ else:
+ checksum = 'Checksum="yes"' if x.endswith('.exe') else ''
+ c = [
+ ('') % (fid,),
+ ('') %
+ (fid, f, x, checksum),
+ ''
+ ]
+ 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)
+
+
+
diff --git a/setup/upload.py b/setup/upload.py
index b99e80ca18..e0bec83a32 100644
--- a/setup/upload.py
+++ b/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)
diff --git a/src/calibre/constants.py b/src/calibre/constants.py
index bdd348b869..af8c3ef970 100644
--- a/src/calibre/constants.py
+++ b/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 "
import re
diff --git a/src/calibre/debug.py b/src/calibre/debug.py
index 575308fe14..55e34c7963 100644
--- a/src/calibre/debug.py
+++ b/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()
diff --git a/src/calibre/devices/eslick/driver.py b/src/calibre/devices/eslick/driver.py
index a0d973bc06..c2c4673bb1 100644
--- a/src/calibre/devices/eslick/driver.py
+++ b/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_CARD_A_MEM = 'ESLICK_USB_DEVICE'
+ WINDOWS_MAIN_MEM = 'ESLICK_USB_DEVIC'
+ WINDOWS_CARD_A_MEM = 'ESLICK_USB_DEVIC'
#OSX_MAIN_MEM = 'Kindle Internal Storage Media'
#OSX_CARD_A_MEM = 'Kindle Card Storage Media'
diff --git a/src/calibre/devices/interface.py b/src/calibre/devices/interface.py
index 11011bcadf..a107129242 100644
--- a/src/calibre/devices/interface.py
+++ b/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
diff --git a/src/calibre/devices/jetbook/driver.py b/src/calibre/devices/jetbook/driver.py
index 8fcbe306a2..4ef9d88afb 100644
--- a/src/calibre/devices/jetbook/driver.py
+++ b/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_CARD_A_MEM = None
+ OSX_MAIN_MEM = 'Linux ebook Media'
+ OSX_CARD_A_MEM = 'Linux ebook Media'
MAIN_MEMORY_VOLUME_LABEL = 'Jetbook Main Memory'
STORAGE_CARD_VOLUME_LABEL = 'Jetbook Storage Card'
diff --git a/src/calibre/devices/linux_mount_helper.c b/src/calibre/devices/linux_mount_helper.c
index 23bab36389..076587c670 100644
--- a/src/calibre/devices/linux_mount_helper.c
+++ b/src/calibre/devices/linux_mount_helper.c
@@ -9,39 +9,46 @@
#include
#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;
- return 0;
+ if (stat(path, &file_info) == 0) return True;
+ return False;
}
int get_root() {
int res;
res = setreuid(0, 0);
- if (res != 0) return 1;
- if (setregid(0, 0) != 0) return 1;
- return 0;
+ if (res != 0) return False;
+ if (setregid(0, 0) != 0) return False;
+ return True;
}
-int do_mount(char *dev, char *mp) {
- char options[1000];
- char marker[2000];
+void ensure_root() {
+ if (!get_root()) {
+ 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));
- strncat(marker, "/", 1);
- strncat(marker, MARKER, strlen(MARKER));
- if (exists(marker) == 0) {
+ snprintf(marker, 2000, "%s/%s", mp, MARKER);
+ if (!exists(marker)) {
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) {
- fprintf(stderr, "Failed to elevate to root privileges\n");
- return EXIT_FAILURE;
- }
+ ensure_root();
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) {
- char marker[2000];
- 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;
- }
+int call_eject(const char *dev, const char *mp) {
+ int ret, pid, errsv, i, status = 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) {
- fprintf(stderr, "Failed to elevate to root privileges\n");
- return EXIT_FAILURE;
- }
+
+ if (pid == 0) { /* Child process */
+ ensure_root();
execlp("eject", "eject", "-s", dev, NULL);
+ /* execlp failed */
errsv = errno;
fprintf(stderr, "Failed to eject with error: %s\n", strerror(errsv));
- return EXIT_FAILURE;
- } else {
- for (i =0; i < 7; i++) {
+ exit(EXIT_FAILURE);
+ } else { /* Parent */
+ 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) {
- strncat(marker, mp, strlen(mp));
- strncat(marker, "/", 1);
- strncat(marker, MARKER, strlen(MARKER));
- if (exists(marker)) {
- int urt = unlink(marker);
- if (urt == -1) {
- fprintf(stderr, "Failed to unlink marker: %s\n", strerror(errno));
- return EXIT_FAILURE;
- }
- rmd = rmdir(mp);
- if (rmd == -1) {
- fprintf(stderr, "Failed to remove mount point: %s\n", strerror(errno));
- return EXIT_FAILURE;
- }
- }
+ return WIFEXITED(status) && WEXITSTATUS(status) == 0;
+ }
+ return False;
+}
+
+int call_umount(const char *dev, const char *mp) {
+ int ret, pid, errsv, i, status = EXIT_FAILURE;
+
+ pid = fork();
+ if (pid == -1) {
+ fprintf(stderr, "Failed to fork\n");
+ exit(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);
- }
- else if (strncmp(action, "eject", 7) == 0) {
- return do_eject(dev, mp);
+ status = do_mount(dev, mp);
+ } else if (strncmp(action, "eject", 5) == 0) {
+ status = 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");
- return EXIT_FAILURE;
+ fprintf(stderr, "Unrecognized action: must be mount, eject or cleanup\n");
}
-
- return EXIT_SUCCESS;
+ return status;
}
diff --git a/src/calibre/devices/usbms/device.py b/src/calibre/devices/usbms/device.py
index 97b4b3ec19..2a048dc5cc 100644
--- a/src/calibre/devices/usbms/device.py
+++ b/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.'))
diff --git a/src/calibre/devices/usbms/driver.py b/src/calibre/devices/usbms/driver.py
index 5650a2f10e..12172f298b 100644
--- a/src/calibre/devices/usbms/driver.py
+++ b/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[ \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)
diff --git a/src/calibre/ebooks/__init__.py b/src/calibre/ebooks/__init__.py
index 4034a8810b..15f172815c 100644
--- a/src/calibre/ebooks/__init__.py
+++ b/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
diff --git a/src/calibre/ebooks/fb2/fb2ml.py b/src/calibre/ebooks/fb2/fb2ml.py
index d2e90b6d44..ff914568d2 100644
--- a/src/calibre/ebooks/fb2/fb2ml.py
+++ b/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('"', '"')
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)
diff --git a/src/calibre/ebooks/pdf/fonts.h b/src/calibre/ebooks/pdf/fonts.h
index c285b1dacc..55202c9573 100644
--- a/src/calibre/ebooks/pdf/fonts.h
+++ b/src/calibre/ebooks/pdf/fonts.h
@@ -4,9 +4,7 @@
*/
-
-#ifndef CALIBRE_REFLOW_FONTS
-#define CALIBRE_REFLOW_FONTS
+#pragma once
#include <vector>
#include <sstream>
@@ -102,4 +100,3 @@ class Fonts : public vector<XMLFont*> {
}
-#endif
diff --git a/src/calibre/ebooks/pdf/images.h b/src/calibre/ebooks/pdf/images.h
index 2bdbc09d8d..7d6f143147 100644
--- a/src/calibre/ebooks/pdf/images.h
+++ b/src/calibre/ebooks/pdf/images.h
@@ -1,5 +1,4 @@
-#ifndef _CALIBRE_REFLOW_IMAGES
-#define _CALIBRE_REFLOW_IMAGES
+#pragma once
#include <vector>
#include <GfxState.h>
@@ -127,4 +126,3 @@ namespace calibre_reflow {
};
*/
}
-#endif
diff --git a/src/calibre/ebooks/pdf/links.h b/src/calibre/ebooks/pdf/links.h
index a84693ed0e..a8a3127a77 100644
--- a/src/calibre/ebooks/pdf/links.h
+++ b/src/calibre/ebooks/pdf/links.h
@@ -5,9 +5,7 @@
-#ifndef _CALIBRE_XML_LINKS
-#define _CALIBRE_XML_LINKS
-
+#pragma once
#include <vector>
#include <sstream>
@@ -65,5 +63,4 @@ class XMLLinks : public vector<XMLLink*> {
}
-#endif
diff --git a/src/calibre/ebooks/pdf/reflow.h b/src/calibre/ebooks/pdf/reflow.h
index fd629602b2..deb1dec326 100644
--- a/src/calibre/ebooks/pdf/reflow.h
+++ b/src/calibre/ebooks/pdf/reflow.h
@@ -4,8 +4,7 @@
* Based on pdftohtml from the poppler project.
*/
-#ifndef CALIBRE_REFLOW
-#define CALIBRE_REFLOW
+#pragma once
#define UNICODE
#ifdef _WIN32
@@ -248,4 +247,3 @@ class XMLOutputDev : public OutputDev {
void process_link(Link* link);
};
}
-#endif
diff --git a/src/calibre/ebooks/pdf/utils.h b/src/calibre/ebooks/pdf/utils.h
index ae342d09da..43f435b1e3 100644
--- a/src/calibre/ebooks/pdf/utils.h
+++ b/src/calibre/ebooks/pdf/utils.h
@@ -4,9 +4,7 @@
*/
-#ifndef _CALIBRE_REFLOW_UTILS
-#define _CALIBRE_REFLOW_UTILS
-
+#pragma once
#include <string>
#include <sstream>
@@ -45,4 +43,3 @@ inline string encode_for_xml(const string &sSrc )
}
-#endif
diff --git a/src/calibre/ebooks/pdf/writer.py b/src/calibre/ebooks/pdf/writer.py
index b87aba7bc0..73ab16cdb6 100644
--- a/src/calibre/ebooks/pdf/writer.py
+++ b/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)
diff --git a/src/calibre/gui2/__init__.py b/src/calibre/gui2/__init__.py
index ff30fff2c1..56dbe4fab6 100644
--- a/src/calibre/gui2/__init__.py
+++ b/src/calibre/gui2/__init__.py
@@ -124,17 +124,22 @@ class CopyButton(QPushButton):
def keyPressEvent(self, ev):
- if ev.key() in self.ACTION_KEYS:
- self.copied()
- else:
- QPushButton.event(self, ev)
+ try:
+ if ev.key() in self.ACTION_KEYS:
+ self.copied()
+ 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:
- QPushButton.event(self, ev)
+ return QPushButton.event(self, ev)
def mouseReleaseEvent(self, ev):
ev.accept()
diff --git a/src/calibre/gui2/device.py b/src/calibre/gui2/device.py
index 1b62ce2f8a..ec1f8984e2 100644
--- a/src/calibre/gui2/device.py
+++ b/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)
diff --git a/src/calibre/gui2/dialogs/metadata_single.py b/src/calibre/gui2/dialogs/metadata_single.py
index 6f1f111e2a..b584037d7b 100644
--- a/src/calibre/gui2/dialogs/metadata_single.py
+++ b/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.QtGui import QPixmap, QListWidgetItem, QErrorMessage, QDialog
+from PyQt4.Qt import SIGNAL, QObject, QCoreApplication, Qt, QTimer, QThread, QDate, \
+ 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())),
- [('Books', BOOK_EXTENSIONS)])
- if not files:
- return
- for _file in files:
+ _("Choose formats for ") + unicode((self.title.text())),
+ [(_('Books'), BOOK_EXTENSIONS)])
+ self._add_formats(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 "+\
- "permission to read the file: " + _file)
+ bad_perms.append(_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()'),
diff --git a/src/calibre/gui2/dialogs/metadata_single.ui b/src/calibre/gui2/dialogs/metadata_single.ui
index 78a4815fd9..e14a8ce4f4 100644
--- a/src/calibre/gui2/dialogs/metadata_single.ui
+++ b/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>
diff --git a/src/calibre/gui2/main.py b/src/calibre/gui2/main.py
index b82b0bd051..b33bf3d619 100644
--- a/src/calibre/gui2/main.py
+++ b/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,
diff --git a/src/calibre/gui2/pictureflow/pictureflow.h b/src/calibre/gui2/pictureflow/pictureflow.h
index 7431dee634..3e0b606d8a 100644
--- a/src/calibre/gui2/pictureflow/pictureflow.h
+++ b/src/calibre/gui2/pictureflow/pictureflow.h
@@ -55,8 +55,7 @@
THE SOFTWARE.
*/
-#ifndef PICTUREFLOW_H
-#define PICTUREFLOW_H
+#pragma once
#include <QWidget>
@@ -202,4 +201,3 @@ private:
PictureFlowPrivate* d;
};
-#endif // PICTUREFLOW_H
diff --git a/src/calibre/gui2/search_box.py b/src/calibre/gui2/search_box.py
index 831f352696..11a10d9b95 100644
--- a/src/calibre/gui2/search_box.py
+++ b/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
'''
diff --git a/src/calibre/gui2/status.py b/src/calibre/gui2/status.py
index 86fe117768..6cd8e83db4 100644
--- a/src/calibre/gui2/status.py
+++ b/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):
diff --git a/src/calibre/gui2/tools.py b/src/calibre/gui2/tools.py
index c976616c95..525efec25b 100644
--- a/src/calibre/gui2/tools.py
+++ b/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)
diff --git a/src/calibre/gui2/widgets.py b/src/calibre/gui2/widgets.py
index c0f8b13e44..190ff920ef 100644
--- a/src/calibre/gui2/widgets.py
+++ b/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):
diff --git a/src/calibre/libunrar.py b/src/calibre/libunrar.py
index 40da8e3efc..ed09d66a46 100644
--- a/src/calibre/libunrar.py
+++ b/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),
- 'unrar.dll'))
-_libunrar = load_library(_librar_name, cdll)
+ lp = os.path.join(os.path.dirname(sys.executable), 'DLLs', 'unrar.dll')
+ _libunrar = cdll.LoadLibrary(lp)
+else:
+ _libunrar = load_library(_librar_name, cdll)
RAR_OM_LIST = 0
RAR_OM_EXTRACT = 1
diff --git a/src/calibre/manual/faq.rst b/src/calibre/manual/faq.rst
index 6593ec4fa1..a4bf0fd275 100644
--- a/src/calibre/manual/faq.rst
+++ b/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?
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/src/calibre/startup.py b/src/calibre/startup.py
index ec22f8b9c8..3a761cca10 100644
--- a/src/calibre/startup.py
+++ b/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):]
################################################################################
diff --git a/src/calibre/trac/plugins/download.py b/src/calibre/trac/plugins/download.py
index 75ea6a5913..92ac83d779 100644
--- a/src/calibre/trac/plugins/download.py
+++ b/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(\
'''
diff --git a/src/calibre/trac/plugins/templates/binary.html b/src/calibre/trac/plugins/templates/binary.html
index 7361e37014..03bfc0bbee 100644
--- a/src/calibre/trac/plugins/templates/binary.html
+++ b/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" />
diff --git a/src/calibre/trac/plugins/templates/linux.html b/src/calibre/trac/plugins/templates/linux.html
index a166810b21..a55105d029 100644
--- a/src/calibre/trac/plugins/templates/linux.html
+++ b/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
- is required for device detection and integration
- with your desktop environment.
- </p>
+ support rar files. In order to compile ${app} successfully
+ poppler headers must include XPdf headers. That is, poppler
+ must have been configured with --enable-xpdf-headers. Also,
+ 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>
diff --git a/src/calibre/translations/ar.po b/src/calibre/translations/ar.po
index 189d84de1d..cc1c893aa8 100644
--- a/src/calibre/translations/ar.po
+++ b/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"
-"PO-Revision-Date: 2009-09-28 06:55+0000\n"
+"POT-Creation-Date: 2009-10-02 05:30+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:118
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:120
+#: /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:1335
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1212
+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:1366
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1323
+#: /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:1547
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1536
+#: /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:1833
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1828
+#: /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:106
-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
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:182
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:204
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:90
+#: /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:205
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:91
+#: /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 ""
diff --git a/src/calibre/translations/calibre.pot b/src/calibre/translations/calibre.pot
index 099a21ac8a..8f86d4f0ee 100644
--- a/src/calibre/translations/calibre.pot
+++ b/src/calibre/translations/calibre.pot
@@ -4,9 +4,9 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: calibre 0.6.16\n"
-"POT-Creation-Date: 2009-10-01 23:15+MDT\n"
-"PO-Revision-Date: 2009-10-01 23:15+MDT\n"
+"Project-Id-Version: calibre 0.6.17\n"
+"POT-Creation-Date: 2009-10-09 19:58+MDT\n"
+"PO-Revision-Date: 2009-10-09 19:58+MDT\n"
"Last-Translator: Automatically generated\n"
"Language-Team: LANGUAGE\n"
"MIME-Version: 1.0\n"
@@ -24,8 +24,9 @@ msgstr ""
#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:53
#: /home/kovid/work/calibre/src/calibre/devices/prs505/books.py:58
#: /home/kovid/work/calibre/src/calibre/devices/prs505/books.py:199
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:703
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:706
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:730
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:733
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:177
#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:410
#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/input.py:65
#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/input.py:67
@@ -93,22 +94,22 @@ msgstr ""
#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:29
#: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:217
#: /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/__init__.py:266
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:273
#: /home/kovid/work/calibre/src/calibre/gui2/add.py:120
#: /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
#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:126
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:539
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:548
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:765
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:768
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:543
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:769
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:772
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:48
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:106
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:139
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:431
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:41
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:42
#: /home/kovid/work/calibre/src/calibre/gui2/library.py:391
@@ -501,25 +502,25 @@ msgstr ""
msgid "Unable to mount main memory (Error code: %d)"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:643
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:645
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:670
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:672
msgid "The reader has no storage card in this slot."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:647
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:674
msgid "Selected slot: %s is not supported."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:671
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:698
msgid "There is insufficient free space in main memory"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:673
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:675
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:700
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:702
msgid "There is insufficient free space on the storage card"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:686
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:713
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:434
#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:122
#: /home/kovid/work/calibre/src/calibre/library/database2.py:1007
@@ -945,7 +946,7 @@ msgstr ""
msgid "Normally, if the input file has no cover and you don't specify one, a default cover is generated with the title, authors, etc. This option disables the generation of this cover."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/fb2ml.py:122
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/fb2ml.py:124
#: /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:77
@@ -1266,7 +1267,7 @@ msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:71
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:64
#: /home/kovid/work/calibre/src/calibre/gui2/library.py:349
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:92
msgid "Comments"
msgstr ""
@@ -1275,7 +1276,7 @@ msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/library.py:338
#: /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/status.py:94
#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:122
msgid "Tags"
msgstr ""
@@ -1283,7 +1284,7 @@ msgstr ""
#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:372
#: /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/status.py:93
#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:122
msgid "Series"
msgstr ""
@@ -1941,15 +1942,15 @@ msgstr ""
msgid "Copied"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:157
msgid "Copy"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:157
msgid "Copy to Clipboard"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:386
msgid "Choose Files"
msgstr ""
@@ -1974,7 +1975,7 @@ 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
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:486
msgid "No books"
msgstr ""
@@ -2175,14 +2176,14 @@ msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:500
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:501
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:533
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:355
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:360
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:374
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:385
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:387
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:386
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:390
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:397
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:126
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:128
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:131
@@ -2377,38 +2378,38 @@ msgid "Set the metadata. The output file will contain as much of this metadata a
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:152
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:96
msgid "Choose cover for "
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:102
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:103
msgid "Cannot read"
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:160
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:104
msgid "You do not have permission to read the file: "
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:168
#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:175
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:112
msgid "Error reading file"
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:169
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:112
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:113
msgid "<p>There was an error reading from file: <br /><b>"
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:176
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:121
msgid " is not a valid picture"
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:166
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:392
msgid "Book Cover"
msgstr ""
@@ -2417,28 +2418,28 @@ msgid "Use cover from &source file"
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:168
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:392
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:393
msgid "Change &cover image:"
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:169
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:394
msgid "Browse for an image to use as the cover of this book."
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:171
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:353
msgid "&Title: "
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:172
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:354
msgid "Change the title of this book"
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:173
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:135
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:357
msgid "&Author(s): "
msgstr ""
@@ -2452,24 +2453,24 @@ msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:176
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:143
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:366
msgid "&Publisher: "
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:177
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:367
msgid "Ta&gs: "
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:178
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:145
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:367
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:368
msgid "Tags categorize the book. This is particularly useful while searching. <br><br>They can be any words or phrases, separated by commas."
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:179
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:150
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:370
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:371
msgid "&Series:"
msgstr ""
@@ -2477,13 +2478,13 @@ msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:181
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:151
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:152
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:371
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:372
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:373
msgid "List of known series. You can add new series."
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:182
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:378
msgid "Book "
msgstr ""
@@ -2598,7 +2599,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:1329
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1358
msgid "Choose the format to view"
msgstr ""
@@ -2676,12 +2677,12 @@ msgid "Footer regular expression:"
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:56
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:73
msgid "Invalid regular expression"
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:74
msgid "Invalid regular expression: %s"
msgstr ""
@@ -2891,185 +2892,185 @@ msgstr ""
msgid "Device no longer connected."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:199
msgid "Get device information"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:210
msgid "Get list of books on device"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:215
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:219
msgid "Send metadata to device"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:224
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:228
msgid "Upload %d books to device"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:243
msgid "Delete books from device"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:256
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:260
msgid "Download books from device"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:266
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:270
msgid "View book on device"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:273
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:277
msgid "and delete from library"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:294
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:298
msgid "Set default send to device action"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:299
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:306
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:308
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:303
#: /home/kovid/work/calibre/src/calibre/gui2/device.py:310
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:312
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:314
msgid "Email to"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:321
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:328
-msgid "Send to main memory"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:323
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:330
-msgid "Send to storage card A"
-msgstr ""
-
#: /home/kovid/work/calibre/src/calibre/gui2/device.py:325
#: /home/kovid/work/calibre/src/calibre/gui2/device.py:332
+msgid "Send to main memory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:327
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:334
+msgid "Send to storage card A"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:329
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:336
msgid "Send to storage card B"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:339
msgid "Send specific format to main memory"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:337
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:341
msgid "Send specific format to storage card A"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:339
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:343
msgid "Send specific format to storage card B"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:483
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:487
msgid "selected to send"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:488
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:492
msgid "Choose format to send to device"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:495
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:499
msgid "No device"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:496
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:500
msgid "Cannot send: No device is connected"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:499
#: /home/kovid/work/calibre/src/calibre/gui2/device.py:503
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:507
msgid "No card"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:500
#: /home/kovid/work/calibre/src/calibre/gui2/device.py:504
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:508
msgid "Cannot send: Device has no storage card"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:546
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:550
msgid "E-book:"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:549
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:553
msgid "Attached, you will find the e-book"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:550
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:554
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:177
msgid "by"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:555
msgid "in the %s format."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:568
msgid "Sending email to"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:594
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:601
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:692
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:806
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:813
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:598
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:696
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:810
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:817
msgid "No suitable formats"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:595
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:599
msgid "Auto convert the following books before sending via email?"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:602
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:606
msgid "Could not email the following books as no suitable formats were found:"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:621
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:625
msgid "Failed to email books"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:626
msgid "Failed to email the following books:"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:626
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:630
msgid "Sent by email:"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:653
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:657
msgid "News:"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:654
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:658
msgid "Attached is the"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:665
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:669
msgid "Sent news to"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:693
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:807
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:697
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:811
msgid "Auto convert the following books before uploading to the device?"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:724
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:728
msgid "Sending news to device."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:776
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:780
msgid "Sending books to device."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:814
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:818
msgid "Could not upload the following books to the device, as no suitable formats were found. Convert the book(s) to a format supported by your device first."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:862
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:866
msgid "No space on device"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:863
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:867
msgid "<p>Cannot upload books to device there is no more free space available "
msgstr ""
@@ -3088,7 +3089,7 @@ msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:86
#: /home/kovid/work/calibre/src/calibre/gui2/library.py:345
#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1007
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:90
msgid "Path"
msgstr ""
@@ -3098,7 +3099,7 @@ msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:92
#: /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/status.py:91
#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:122
msgid "Formats"
msgstr ""
@@ -3202,7 +3203,7 @@ msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:461
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:788
#: /home/kovid/work/calibre/src/calibre/gui2/main.py:140
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1032
#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
msgid "Error"
msgstr ""
@@ -3272,7 +3273,7 @@ msgid "Access log:"
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:645
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:576
msgid "Failed to start content server"
msgstr ""
@@ -3752,7 +3753,7 @@ msgid "Edit Meta information"
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:352
msgid "Meta information"
msgstr ""
@@ -3765,24 +3766,24 @@ msgid "Author s&ort: "
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:138
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:359
msgid "Specify how the author(s) of this book should be sorted. For example Charles Dickens should be sorted as Dickens, Charles."
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:139
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:362
msgid "&Rating:"
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:140
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:141
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:362
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:364
msgid "Rating of this book. 0-5 stars"
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:142
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:365
msgid " stars"
msgstr ""
@@ -3792,8 +3793,8 @@ msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:146
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:147
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:368
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:370
msgid "Open Tag Editor"
msgstr ""
@@ -3809,156 +3810,169 @@ msgstr ""
msgid "Remove &format:"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:120
msgid "Not a valid picture"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:166
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:133
+msgid "Choose formats for "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:872
+msgid "Books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:160
+msgid "You do not have permission to read the following files:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:183
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:184
msgid "No format selected"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:178
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:195
msgid "Could not read metadata"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:196
msgid "Could not read metadata from %s format"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:224
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:241
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:247
msgid "Could not read cover"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:242
msgid "Could not read cover from %s format"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:248
msgid "The cover in the %s format is invalid"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:285
msgid "Abort the editing of all remaining books"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:467
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:488
msgid "Downloading cover..."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:479
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:484
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:490
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:505
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:511
msgid "Cannot fetch cover"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:480
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:491
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:501
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:512
msgid "<b>Could not fetch cover.</b><br/>"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:481
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:502
msgid "The download timed out."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:485
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:506
msgid "Could not find cover for this book. Try specifying the ISBN first."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:497
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:518
msgid "Bad cover"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:498
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:519
msgid "The cover is not a valid picture"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:559
msgid "Cannot fetch metadata"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:560
msgid "You must specify at least one of ISBN, Title, Authors or Publisher"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:591
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:612
msgid "Permission denied"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:592
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:613
msgid "Could not open %s. Is it being used by another program?"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:350
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:351
msgid "Edit Meta Information"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:355
msgid "Swap the author and title"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:358
msgid "Author S&ort: "
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:359
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:360
msgid "Automatically create the author sort entry based on the current author entry"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:374
msgid "Remove unused series (Series that have no books)"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:376
msgid "IS&BN:"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:377
msgid "Publishe&d:"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:379
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:380
msgid "dd MMM yyyy"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:380
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:381
msgid "&Date:"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:382
msgid "&Comments"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:382
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:383
msgid "&Fetch metadata from server"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:384
msgid "Available Formats"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:385
msgid "Add a new format for this book to the database"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:386
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:387
msgid "Remove the selected formats for this book from the database."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:389
msgid "Set the cover for the book from the selected format"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:390
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:391
msgid "Update metadata from the metadata in the selected format"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:396
msgid "Reset cover to default"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:397
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:398
msgid "Download &cover"
msgstr ""
@@ -4432,11 +4446,11 @@ msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:116
#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:79
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:83
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:88
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:93
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:80
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:84
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:96
msgid "No match"
msgstr ""
@@ -4530,7 +4544,7 @@ msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/library.py:337
#: /home/kovid/work/calibre/src/calibre/gui2/library.py:343
#: /home/kovid/work/calibre/src/calibre/gui2/library.py:348
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:408
msgid "None"
msgstr ""
@@ -4658,117 +4672,117 @@ msgstr ""
msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:227
msgid "Edit metadata individually"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:229
msgid "Edit metadata in bulk"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:229
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:231
msgid "Download metadata and covers"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:230
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:232
msgid "Download only metadata"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:231
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:233
msgid "Download only covers"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:234
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:236
msgid "Add books from a single directory"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:235
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:237
msgid "Add books from directories, including sub-directories (One book per directory, assumes every ebook file is the same book in a different format)"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:240
msgid "Add books from directories, including sub directories (Multiple books per directory, assumes every ebook file is a different book)"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:241
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:243
msgid "Add Empty book. (Book entry with no formats)"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:280
#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:353
msgid "Save to disk"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:279
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:281
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:1431
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:282
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1460
msgid "Save only %s format to disk"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:290
#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:359
msgid "View"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:291
msgid "View specific format"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:315
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:317
msgid "Convert individually"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:316
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:318
msgid "Bulk convert"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:333
msgid "Run welcome wizard"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:367
msgid "Similar books..."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:425
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:427
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:428
msgid "Bad database location"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:428
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:430
#: /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:1574
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:440
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1603
msgid "Choose a location for your ebook library."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:617
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:619
msgid "Browse by covers"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:724
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:726
msgid "Device: "
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:726
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:728
msgid " detected."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:748
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:750
msgid "Connected "
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:760
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:762
msgid "Device database corrupted"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:761
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:763
msgid ""
"\n"
" <p>The database of books on the reader is corrupted. Try the following:\n"
@@ -4779,301 +4793,297 @@ msgid ""
" "
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:837
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:880
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:864
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:907
msgid "Uploading books to device."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:845
-msgid "Books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:846
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:873
msgid "EPUB Books"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:847
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:874
msgid "LRF Books"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:848
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:875
msgid "HTML Books"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:849
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:876
msgid "LIT Books"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:850
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:877
msgid "MOBI Books"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:851
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:878
msgid "Text books"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:852
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:879
msgid "PDF Books"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:853
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:880
msgid "Comics"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:854
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:881
msgid "Archives"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:889
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:916
msgid "Failed to read metadata"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:890
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:917
msgid "Failed to read metadata from the following"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:909
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:936
msgid "The selected books will be <b>permanently deleted</b> and the files removed from your computer. Are you sure?"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:936
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:963
msgid "Deleting books from device."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:967
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:994
msgid "Cannot download metadata"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:968
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1016
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1049
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1074
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1186
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:995
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1043
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1076
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1101
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1213
msgid "No books selected"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:977
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1004
msgid "covers"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:977
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1004
msgid "metadata"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:979
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1006
msgid "Downloading %s for %d book(s)"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1000
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1027
msgid "Failed to download some metadata"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1001
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1028
msgid "Failed to download metadata for the following:"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1031
msgid "Failed to download metadata:"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1015
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1048
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1042
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1075
msgid "Cannot edit metadata"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1073
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1100
msgid "Cannot save to disk"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1076
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1103
msgid "Choose destination directory"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1103
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1130
msgid "Error while saving"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1104
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1131
msgid "There was an error while saving."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1111
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1112
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1138
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1139
msgid "Could not save some books"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1113
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1140
msgid "Click the show details button to see which ones."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1132
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1159
msgid "Fetching news from "
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1145
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1172
msgid " fetched."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1185
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1212
msgid "Cannot convert"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1212
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1241
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
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1352
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1371
msgid "No book selected"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1323
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1373
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1352
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1402
msgid "Cannot view"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1341
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1370
msgid "Cannot open folder"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1358
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1387
msgid "Multiple Books Selected"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1359
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1388
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 started the process cannot be stopped until complete. Do you wish to continue?"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1374
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1403
msgid "%s has no available formats."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1415
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1444
msgid "Cannot configure"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1416
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1445
msgid "Cannot configure while there are running jobs."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1459
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1488
msgid "No detailed info available"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1460
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1489
msgid "No detailed information is available for books on the device."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1512
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1541
msgid "Error talking to device"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1513
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1542
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:1536
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1554
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1565
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1583
msgid "Conversion Error"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1537
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1566
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:1555
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1584
msgid "<b>Failed</b>"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1583
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1612
msgid "Invalid library location"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1584
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1613
msgid "Could not access %s. Using %s as the library."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1631
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1660
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:1655
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1684
msgid "There are active jobs. Are you sure you want to quit?"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1658
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1687
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:1662
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1691
msgid "WARNING: Active jobs"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1713
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1742
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:1732
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1761
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:1740
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1769
msgid "Update available"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1741
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1770
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:1759
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1788
msgid "Use the library located at the specified path."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1761
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1790
msgid "Start minimized to system tray."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1763
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1792
msgid "Log debugging information to console"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1765
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1794
msgid "Do not check for updates"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1813
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1842
msgid "If you are sure it is not running"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1815
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1844
msgid "Cannot Start "
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1816
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1845
msgid "%s is already running."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1819
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1848
msgid "may be running in the system tray, in the"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1821
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1850
msgid "upper right region of the screen."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1823
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1852
msgid "lower right region of the screen."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1826
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1855
msgid "try rebooting your computer."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1828
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1840
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1857
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1869
msgid "try deleting the file"
msgstr ""
@@ -5223,31 +5233,31 @@ msgstr ""
msgid "No matches found for this book"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:60
msgid "Search"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:149
msgid "Jobs:"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:158
msgid "Click to see list of active jobs."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:188
msgid "Click to browse books by their covers"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:188
msgid "Click to turn off Cover Browsing"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:193
msgid "<p>Browsing books by their covers is disabled.<br>Import of pictureflow module failed:<br>"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:201
msgid "Click to browse books by tags"
msgstr ""
@@ -5625,67 +5635,67 @@ msgstr ""
msgid "Print eBook"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:198
msgid ""
"Library\n"
"%d\n"
"books"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:199
msgid ""
"Reader\n"
"%s\n"
"available"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:200
msgid ""
"Card A\n"
"%s\n"
"available"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:169
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:201
msgid ""
"Card B\n"
"%s\n"
"available"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:206
msgid "Click to see the books available on your computer"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:207
msgid "Click to see the books in the main memory of your reader"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:176
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:208
msgid "Click to see the books on storage card A in your reader"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:177
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:209
msgid "Click to see the books on storage card B in your reader"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:466
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:498
msgid "Change Case"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:467
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:499
msgid "Upper Case"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:468
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:500
msgid "Lower Case"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:469
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:501
msgid "Swap Case"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:470
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:502
msgid "Title Case"
msgstr ""
@@ -6286,43 +6296,43 @@ msgstr ""
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:555
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:559
msgid "Path to the database in which books are stored"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:557
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:561
msgid "Pattern to guess metadata from filenames"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:559
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:563
msgid "Access key for isbndb.com"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:561
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:565
msgid "Default timeout for network operations (seconds)"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:563
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:567
msgid "Path to directory in which your library of books is stored"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:565
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:569
msgid "The language in which to display the user interface"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:567
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:571
msgid "The default output format for ebook conversions."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:571
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:575
msgid "Ordered list of formats to prefer for input."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:573
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:577
msgid "Read metadata from files"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:575
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:579
msgid "The priority of worker processes"
msgstr ""
diff --git a/src/calibre/translations/da.po b/src/calibre/translations/da.po
index cb5a0abdf5..0c5d4acbee 100644
--- a/src/calibre/translations/da.po
+++ b/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"
-"PO-Revision-Date: 2009-09-24 15:25+0000\n"
-"Last-Translator: Thomas Hildebrandt <Unknown>\n"
+"POT-Creation-Date: 2009-10-02 05:30+0000\n"
+"PO-Revision-Date: 2009-10-02 05:10+0000\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:118
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:120
+#: /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:1335
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1212
+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:1366
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1323
+#: /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:1547
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1536
+#: /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:1833
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1828
+#: /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:106
-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
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:182
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:204
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:90
+#: /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:205
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:91
+#: /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"
diff --git a/src/calibre/translations/de.po b/src/calibre/translations/de.po
index 1f867cace9..bd65201de6 100644
--- a/src/calibre/translations/de.po
+++ b/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"
-"PO-Revision-Date: 2009-09-30 21:25+0000\n"
+"POT-Creation-Date: 2009-10-02 05:30+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:118
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:120
+#: /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:1335
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1212
+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:1366
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1323
+#: /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:1547
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1536
+#: /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:1833
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1828
+#: /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:106
-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
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:182
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:204
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:90
+#: /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:205
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:91
+#: /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"
diff --git a/src/calibre/translations/es.po b/src/calibre/translations/es.po
index baa60fbddb..339e25c187 100644
--- a/src/calibre/translations/es.po
+++ b/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"
-"PO-Revision-Date: 2009-09-29 09:37+0000\n"
+"POT-Creation-Date: 2009-10-02 05:30+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:118
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:120
+#: /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<ro 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:1335
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1212
+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:1366
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1323
+#: /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:1547
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1536
+#: /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:1833
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1828
+#: /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:106
-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
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:182
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:204
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:90
+#: /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:205
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:91
+#: /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"
diff --git a/src/calibre/translations/fr.po b/src/calibre/translations/fr.po
index eb5abc2352..c5867c2076 100644
--- a/src/calibre/translations/fr.po
+++ b/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"
-"PO-Revision-Date: 2009-09-26 11:02+0000\n"
-"Last-Translator: Vincent C. <Unknown>\n"
+"POT-Creation-Date: 2009-10-02 05:30+0000\n"
+"PO-Revision-Date: 2009-10-02 05:11+0000\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:118
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:120
+#: /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:1335
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1212
+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:1366
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1323
+#: /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:1547
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1536
+#: /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:1833
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1828
+#: /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:106
-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
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:182
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:204
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:90
+#: /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:205
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:91
+#: /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"
diff --git a/src/calibre/translations/hr.po b/src/calibre/translations/hr.po
index a39304eee7..97ec82dd9d 100644
--- a/src/calibre/translations/hr.po
+++ b/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"
-"PO-Revision-Date: 2009-09-29 23:18+0000\n"
+"POT-Creation-Date: 2009-10-02 05:30+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:118
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:120
+#: /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:1335
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1212
+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:1366
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1323
+#: /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:1547
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1536
+#: /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:1833
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1828
+#: /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:106
-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
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:182
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:204
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:90
+#: /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:205
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:91
+#: /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"
diff --git a/src/calibre/translations/hu.po b/src/calibre/translations/hu.po
index 745777f6d0..f87cfefeed 100644
--- a/src/calibre/translations/hu.po
+++ b/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"
-"PO-Revision-Date: 2009-09-25 09:10+0000\n"
-"Last-Translator: Muszela Balázs <bazsi86@gmail.com>\n"
+"POT-Creation-Date: 2009-10-02 05:30+0000\n"
+"PO-Revision-Date: 2009-10-06 05:46+0000\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:118
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:120
+#: /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:1335
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1212
+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:1366
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1323
+#: /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:1547
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1536
+#: /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:1833
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1828
+#: /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:106
-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
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:182
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:204
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:90
+#: /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:205
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:91
+#: /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"
diff --git a/src/calibre/translations/it.po b/src/calibre/translations/it.po
index 133ef7f08f..45633dc9f1 100644
--- a/src/calibre/translations/it.po
+++ b/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"
-"PO-Revision-Date: 2009-09-28 07:20+0000\n"
-"Last-Translator: Kovid Goyal <Unknown>\n"
+"POT-Creation-Date: 2009-10-02 05:30+0000\n"
+"PO-Revision-Date: 2009-10-02 21:23+0000\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:118
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:120
+#: /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:1335
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1212
+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:1366
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1323
+#: /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:1547
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1536
+#: /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:1833
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1828
+#: /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:106
-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
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:182
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:204
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:90
+#: /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:205
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:91
+#: /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"
diff --git a/src/calibre/translations/nb.po b/src/calibre/translations/nb.po
index eea205c7f6..549353b806 100644
--- a/src/calibre/translations/nb.po
+++ b/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"
-"PO-Revision-Date: 2009-09-29 01:54+0000\n"
-"Last-Translator: Kovid Goyal <Unknown>\n"
+"POT-Creation-Date: 2009-10-02 05:30+0000\n"
+"PO-Revision-Date: 2009-10-04 16:53+0000\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:118
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:120
+#: /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:1335
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1212
+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:1366
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1323
+#: /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:1547
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1536
+#: /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:1833
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1828
+#: /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:106
-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
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:182
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:204
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:90
+#: /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:205
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:91
+#: /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"
diff --git a/src/calibre/translations/nl.po b/src/calibre/translations/nl.po
index 1fa25fcccd..d7ce0e2a79 100644
--- a/src/calibre/translations/nl.po
+++ b/src/calibre/translations/nl.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-18 19:33+0000\n"
-"PO-Revision-Date: 2009-09-15 05:43+0000\n"
-"Last-Translator: Yentl <y.v.t@scarlet.be>\n"
+"POT-Creation-Date: 2009-10-02 05:30+0000\n"
+"PO-Revision-Date: 2009-10-01 12:00+0000\n"
+"Last-Translator: Robert <Unknown>\n"
"Language-Team: Dutch <nl@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-23 09:42+0000\n"
+"X-Launchpad-Export-Date: 2009-10-02 06:35+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:41
@@ -53,8 +53,7 @@ msgstr "Doet absoluut niets."
#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:444
#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:870
#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdb.py:39
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:34
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:76
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:21
#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/topaz.py:29
#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txt.py:14
#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:44
@@ -68,7 +67,7 @@ msgstr "Doet absoluut niets."
#: /home/kovid/work/calibre/src/calibre/ebooks/odt/input.py:51
#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:886
#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:891
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:947
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:951
#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/reader.py:135
#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/reader.py:137
#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:105
@@ -98,8 +97,8 @@ msgstr "Doet absoluut niets."
#: /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:118
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:120
+#: /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
@@ -111,31 +110,29 @@ msgstr "Doet absoluut niets."
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:48
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:106
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:139
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:402
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:410
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:41
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:42
#: /home/kovid/work/calibre/src/calibre/gui2/library.py:391
#: /home/kovid/work/calibre/src/calibre/gui2/library.py:404
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:874
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1000
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:876
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1002
#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:211
#: /home/kovid/work/calibre/src/calibre/library/cli.py:277
#: /home/kovid/work/calibre/src/calibre/library/database.py:917
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:654
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:666
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1061
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1098
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1428
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:652
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:664
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1063
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1100
#: /home/kovid/work/calibre/src/calibre/library/database2.py:1430
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1539
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1432
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1541
#: /home/kovid/work/calibre/src/calibre/library/server.py:493
#: /home/kovid/work/calibre/src/calibre/library/server.py:565
#: /home/kovid/work/calibre/src/calibre/utils/localization.py:103
#: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:45
#: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:63
#: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:77
-#: /home/kovid/work/calibre/src/calibre/utils/poppler/__init__.py:28
-#: /home/kovid/work/calibre/src/calibre/utils/poppler/__init__.py:32
msgid "Unknown"
msgstr "Onbekend"
@@ -170,6 +167,8 @@ msgid ""
"Character encoding for the input HTML files. Common choices include: cp1252, "
"latin1, iso-8859-1 and utf-8."
msgstr ""
+"Karakter codering voor de invoer HTML bestanden. Mogelijke keuzes zijn: "
+"cp1252, latin1, iso-8859-1 en utf-8."
#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:56
msgid "Extract cover from comic files"
@@ -245,62 +244,64 @@ msgstr ""
#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:44
msgid "Input profile"
-msgstr ""
+msgstr "Invoer profiel"
#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:48
msgid ""
"This profile tries to provide sane defaults and is useful if you know "
"nothing about the input document."
msgstr ""
+"Dit profiel probeert te voorzien in goede standaardinstellingen en is handig "
+"als u niets over het invoer document weet."
#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:56
#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:194
msgid "This profile is intended for the SONY PRS line. The 500/505/700 etc."
-msgstr ""
+msgstr "Dit profiel is bedoeld voor de SONY PRS lijn. De 300/600 etc."
#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:69
#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:229
msgid "This profile is intended for the Microsoft Reader."
-msgstr ""
+msgstr "Dit profiel is bedoeld voor de de Microsoft Reader."
#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:80
#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:240
msgid "This profile is intended for the Mobipocket books."
-msgstr ""
+msgstr "Dit profiel is bedoeld voor de Mobipocket boeken."
#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:93
#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:253
msgid "This profile is intended for the Hanlin V3 and its clones."
-msgstr ""
+msgstr "Dit profiel is bedoeld voor de Hanlin V3 en zijn klonen."
#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:105
#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:265
msgid "This profile is intended for the Cybook G3."
-msgstr ""
+msgstr "Dit profiel is bedoeld voor de Cybook G3."
#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:118
#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:278
msgid "This profile is intended for the Cybook Opus."
-msgstr ""
+msgstr "Dit profiel is bedoeld voor de Cybook Opus."
#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:130
#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:289
msgid "This profile is intended for the Amazon Kindle."
-msgstr ""
+msgstr "Dit profiel is bedoeld voor de Amazon Kindle."
#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:142
#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:322
msgid "This profile is intended for the Irex Illiad."
-msgstr ""
+msgstr "Dit profiel is bedoeld voor de Irex Illiad."
#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:154
#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:335
msgid "This profile is intended for the IRex Digital Reader 1000."
-msgstr ""
+msgstr "Dit profiel is bedoeld voor de IRex Digital Reader 1000."
#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:172
msgid "Output profile"
-msgstr ""
+msgstr "Uitvoer profiel"
#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:176
msgid ""
@@ -311,17 +312,19 @@ msgstr ""
#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:206
msgid "This profile is intended for the 5-inch JetBook."
-msgstr ""
+msgstr "Dit profiel is bedoeld voor de 5-inch JetBook."
#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:217
msgid ""
"This profile is intended for the SONY PRS line. The 500/505/700 etc, in "
"landscape mode. Mainly useful for comics."
msgstr ""
+"Dit profiel is bedoeld voor de SONY PRS lijn. De 300/600 etc, in landschap "
+"mode. Vooral handig voor stripboeken."
#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:306
msgid "This profile is intended for the Amazon Kindle DX."
-msgstr ""
+msgstr "Dit profiel is bedoeld voor de Amazon Kindle DX."
#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
msgid "Installed plugins"
@@ -333,7 +336,7 @@ msgstr ""
#: /home/kovid/work/calibre/src/calibre/customize/ui.py:31
msgid "Local plugin customization"
-msgstr ""
+msgstr "Lokale plugin aanpassing"
#: /home/kovid/work/calibre/src/calibre/customize/ui.py:32
msgid "Disabled plugins"
@@ -343,11 +346,11 @@ msgstr "Gedesactiveerde plugins"
msgid "No valid plugin found in "
msgstr "Geen geldige plugin gevonden in "
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:229
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:232
msgid "Initialization of plugin %s failed with traceback:"
-msgstr ""
+msgstr "Initialisatie van de plugin %s is mislukt met een traceback:"
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:359
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:362
msgid ""
" %prog options\n"
"\n"
@@ -355,49 +358,49 @@ msgid ""
" "
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:365
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:368
msgid "Add a plugin by specifying the path to the zip file containing it."
msgstr ""
"Voeg een plugin toe door het pad op te geven naar het zip bestand waarin het "
"zich bevindt."
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:367
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:370
msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:369
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:372
msgid ""
"Customize plugin. Specify name of plugin and customization string separated "
"by a comma."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:371
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:374
msgid "List all installed plugins"
msgstr "Toon geïnstalleerde plugins"
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:373
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:376
msgid "Enable the named plugin"
msgstr "Activeer de genoemde plugin"
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:375
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:378
msgid "Disable the named plugin"
msgstr "Desactiveer de genoemde plugin"
#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:13
msgid "Communicate with Android phones."
-msgstr ""
+msgstr "Communiceer met Android telefoons."
#: /home/kovid/work/calibre/src/calibre/devices/bebook/driver.py:19
msgid "Communicate with the BeBook eBook reader."
-msgstr ""
+msgstr "Communiceer met de BeBook e-boek lezer."
#: /home/kovid/work/calibre/src/calibre/devices/bebook/driver.py:95
msgid "Communicate with the BeBook Mini eBook reader."
-msgstr ""
+msgstr "Communiceer met de BeBook Mini e-boek lezer."
#: /home/kovid/work/calibre/src/calibre/devices/blackberry/driver.py:12
msgid "Communicate with the Blackberry smart phone."
-msgstr ""
+msgstr "Communiceer met de Blackberry smart phone."
#: /home/kovid/work/calibre/src/calibre/devices/blackberry/driver.py:13
#: /home/kovid/work/calibre/src/calibre/devices/eb600/driver.py:24
@@ -405,11 +408,11 @@ msgstr ""
#: /home/kovid/work/calibre/src/calibre/devices/prs500/driver.py:88
#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_hindu.py:13
msgid "Kovid Goyal"
-msgstr ""
+msgstr "Kovid Goyal"
#: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:21
msgid "Communicate with the Cybook Gen 3 eBook reader."
-msgstr ""
+msgstr "Communiceer met de Cybook Gen 3 e-boek lezer."
#: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:22
#: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:86
@@ -420,7 +423,7 @@ msgstr ""
#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:78
#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:30
msgid "John Schember"
-msgstr ""
+msgstr "John Schember"
#: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:74
#: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:76
@@ -435,19 +438,19 @@ msgstr ""
#: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:85
msgid "Communicate with the Cybook Opus eBook reader."
-msgstr ""
+msgstr "Communiceer met de Cybook Opus e-boek lezer."
#: /home/kovid/work/calibre/src/calibre/devices/eb600/driver.py:23
msgid "Communicate with the EB600 eBook reader."
-msgstr ""
+msgstr "Communiceer met de EB600 e-boek lezer."
#: /home/kovid/work/calibre/src/calibre/devices/eslick/driver.py:16
msgid "Communicate with the ESlick eBook reader."
-msgstr ""
+msgstr "Communiceer met de ESlick e-boek lezer."
#: /home/kovid/work/calibre/src/calibre/devices/iliad/driver.py:16
msgid "Communicate with the IRex Iliad eBook reader."
-msgstr ""
+msgstr "Communiceer met de IRex Illiad e-boek lezer."
#: /home/kovid/work/calibre/src/calibre/devices/interface.py:20
msgid "Device Interface"
@@ -455,28 +458,28 @@ msgstr ""
#: /home/kovid/work/calibre/src/calibre/devices/irexdr/driver.py:16
msgid "Communicate with the IRex Digital Reader 1000 eBook reader."
-msgstr ""
+msgstr "Communiceer met de IRex Digital Reader 1000 e-boek lezer."
#: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:22
msgid "Communicate with the JetBook eBook reader."
-msgstr ""
+msgstr "Communiceer met de JetBook e-boek lezer."
#: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:23
msgid "James Ralston"
-msgstr ""
+msgstr "James Ralston"
#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:21
msgid "Communicate with the Kindle eBook reader."
-msgstr ""
+msgstr "Communiceer met de Kindle e-boek lezer."
#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:66
#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:77
msgid "Communicate with the Kindle 2 eBook reader."
-msgstr ""
+msgstr "Communiceer met de Kindle 2 e-boek lezer."
#: /home/kovid/work/calibre/src/calibre/devices/prs500/driver.py:87
msgid "Communicate with the Sony PRS-500 eBook reader."
-msgstr ""
+msgstr "Communiceer met de Sony PRS-500 e-boek lezer."
#: /home/kovid/work/calibre/src/calibre/devices/prs505/books.py:150
#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:93
@@ -494,12 +497,12 @@ msgstr ""
#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:26
msgid "Communicate with the Sony PRS-300/505 eBook reader."
-msgstr ""
+msgstr "Communiceer met de Sony PRS-300/505 e-boek lezer."
#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:27
#: /home/kovid/work/calibre/src/calibre/devices/prs700/driver.py:18
msgid "Kovid Goyal and John Schember"
-msgstr ""
+msgstr "Kovid Goyal en John Schember"
#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:163
#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:170
@@ -515,7 +518,7 @@ msgstr ""
#: /home/kovid/work/calibre/src/calibre/devices/prs700/driver.py:17
msgid "Communicate with the Sony PRS-600/700 eBook reader."
-msgstr ""
+msgstr "Communiceer met de Sony PRS-600/700 e-boek lezer."
#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:285
#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:357
@@ -551,7 +554,7 @@ msgstr ""
#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:671
msgid "There is insufficient free space in main memory"
-msgstr ""
+msgstr "Er is onvoldoende vrije ruimte in het hoofdgeheugen."
#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:673
#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:675
@@ -560,10 +563,10 @@ msgstr "Er is onvoldoende vrije plaats op de geheugenkaart"
#: /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:83
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1005
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1009
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1332
+#: /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
msgid "News"
msgstr ""
@@ -577,24 +580,24 @@ msgstr ""
#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:17
msgid "Ordered list of formats the device will accept"
-msgstr ""
+msgstr "Gesorteerde lijst van formaten die de lezer ondersteunt"
#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:18
msgid "Place files in sub directories if the device supports them"
-msgstr ""
+msgstr "Plaats bestanden in submappen als de lezer die ondersteunt"
#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:19
#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:64
msgid "Read metadata from files on device"
-msgstr ""
+msgstr "Lees metainformatie van de bestanden op de lezer"
#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:29
msgid "Communicate with an eBook reader."
-msgstr ""
+msgstr "Communiceer met een e-boek lezer."
#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:41
msgid "Get device information..."
-msgstr ""
+msgstr "Haal lezer informatie op..."
#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:107
#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:115
@@ -699,7 +702,7 @@ msgstr ""
#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:434
#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:445
msgid "Page"
-msgstr ""
+msgstr "Pagina"
#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:19
msgid ""
@@ -729,7 +732,7 @@ msgstr ""
#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:97
msgid "INPUT OPTIONS"
-msgstr ""
+msgstr "INVOER OPTIES"
#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:98
msgid "Options to control the processing of the input %s file"
@@ -737,7 +740,7 @@ msgstr ""
#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:104
msgid "OUTPUT OPTIONS"
-msgstr ""
+msgstr "UITVOER OPTIES"
#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:105
msgid "Options to control the processing of the output %s"
@@ -772,7 +775,7 @@ msgstr ""
#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:251
msgid "Output saved to"
-msgstr ""
+msgstr "Uitvoer opgeslagen op"
#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:91
msgid "Level of verbosity. Specify multiple times for greater verbosity."
@@ -887,6 +890,9 @@ msgid ""
"Remove entries from the Table of Contents whose titles match the specified "
"regular expression. Matching entries and all their children are removed."
msgstr ""
+"Verwijder regels uit de inhoudsopgave waarvan de titels overeenkomen met de "
+"opgegeven reguliere expressie. Overeenkomende regels en al hun kinderen "
+"worden verwijderd."
#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:242
msgid ""
@@ -917,26 +923,36 @@ msgstr ""
msgid ""
"An XPath expression. Page breaks are inserted before the specified elements."
msgstr ""
+"Een XPath expressie. Pagina overgangen worden ingevoegd voor de "
+"gespecificeerde elementen."
#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:281
msgid ""
"Set the top margin in pts. Default is %default. Note: 72 pts equals 1 inch"
msgstr ""
+"Zet de boven marge in pts. Standaard is %default. Let op: 72 pts is gelijk "
+"aan 1 inch"
#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:286
msgid ""
"Set the bottom margin in pts. Default is %default. Note: 72 pts equals 1 inch"
msgstr ""
+"Zet de onder marge in pts. Standaard is %default. Let op: 72 pts is gelijk "
+"aan 1 inch"
#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:291
msgid ""
"Set the left margin in pts. Default is %default. Note: 72 pts equals 1 inch"
msgstr ""
+"Zet de linker marge in pts. Standaard is %default. Let op: 72 pts is gelijk "
+"aan 1 inch"
#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:296
msgid ""
"Set the right margin in pts. Default is %default. Note: 72 pts equals 1 inch"
msgstr ""
+"Zet de rechter marge in pts. Standaard is %default. Let op: 72 pts is gelijk "
+"aan 1 inch"
#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:301
msgid ""
@@ -1131,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:72
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/txtml.py:77
msgid "Table of Contents:"
msgstr ""
@@ -1473,7 +1489,7 @@ msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:56
#: /home/kovid/work/calibre/src/calibre/gui2/library.py:158
#: /home/kovid/work/calibre/src/calibre/gui2/library.py:388
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1066
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1068
msgid "Title"
msgstr "Titel"
@@ -1481,7 +1497,7 @@ msgstr "Titel"
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:57
#: /home/kovid/work/calibre/src/calibre/gui2/library.py:159
#: /home/kovid/work/calibre/src/calibre/gui2/library.py:393
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1067
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1069
msgid "Author(s)"
msgstr "Auteur(s)"
@@ -1508,10 +1524,10 @@ msgstr "Opmerkingen"
#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:370
#: /home/kovid/work/calibre/src/calibre/gui2/library.py:165
#: /home/kovid/work/calibre/src/calibre/gui2/library.py:338
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1010
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1070
+#: /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:83
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:122
msgid "Tags"
msgstr "Tags"
@@ -1519,7 +1535,7 @@ msgstr "Tags"
#: /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:83
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:122
msgid "Series"
msgstr "Serie"
@@ -1528,7 +1544,7 @@ msgid "Language"
msgstr ""
#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:375
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1009
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1011
msgid "Timestamp"
msgstr "Tijdsaanduiding"
@@ -1691,7 +1707,7 @@ msgstr ""
"LibraryThing.com\n"
#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1055
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1310
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1314
msgid "Cover"
msgstr ""
@@ -1722,70 +1738,70 @@ msgstr ""
msgid "All articles"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1311
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1315
msgid "Title Page"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1312
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1316
#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/htmltoc.py:15
#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:51
#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:168
msgid "Table of Contents"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1313
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1317
msgid "Index"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1314
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1318
msgid "Glossary"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1315
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1319
msgid "Acknowledgements"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1316
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1320
msgid "Bibliography"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1317
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1321
msgid "Colophon"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1318
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1322
msgid "Copyright"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1319
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1323
msgid "Dedication"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1320
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1324
msgid "Epigraph"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1321
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1325
msgid "Foreword"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1322
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1326
msgid "List of Illustrations"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1323
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1327
msgid "List of Tables"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1324
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1328
msgid "Notes"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1325
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1329
msgid "Preface"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1326
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1330
msgid "Main Text"
msgstr ""
@@ -2252,51 +2268,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 "Duplicaten gevonden!"
-#: /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 ""
@@ -2338,7 +2371,7 @@ msgid "input"
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:84
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:49
#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:41
#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input_ui.py:28
#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:28
@@ -2353,7 +2386,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
@@ -2433,7 +2466,7 @@ msgid "Debug the conversion process."
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug.py:38
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:51
msgid "Choose debug folder"
msgstr ""
@@ -2445,7 +2478,7 @@ msgstr ""
msgid "Failed to create debug directory"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:50
msgid ""
"Choose a folder to put the debug output into. If you specify a folder, "
"calibre will place a lot of debug output into it. This will be useful in "
@@ -2453,8 +2486,8 @@ msgid ""
"conversion parameters like Table of Contents and Chapter Detection."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:48
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:53
#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:170
#: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:44
#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:61
@@ -2465,14 +2498,14 @@ msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:500
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:501
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:533
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:343
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:348
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:362
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:371
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:373
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:375
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:380
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:382
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:360
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:389
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:394
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:396
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:126
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:128
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:131
@@ -2486,6 +2519,13 @@ msgstr ""
msgid "..."
msgstr "..."
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:54
+msgid ""
+"The debug process outputs the intermediate HTML generated at various stages "
+"of the conversion process. This HTML can sometimes serve as a good starting "
+"point for hand editing a conversion."
+msgstr ""
+
#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output.py:15
msgid "EPUB Output"
msgstr ""
@@ -2696,7 +2736,7 @@ msgid " is not a valid picture"
msgstr " is geen geldige afbeelding"
#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:166
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:391
msgid "Book Cover"
msgstr "Boek Omslag"
@@ -2705,28 +2745,28 @@ msgid "Use cover from &source file"
msgstr "Gebruik omslag van &bron bestand"
#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:168
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:392
msgid "Change &cover image:"
msgstr "Verander &Omslag Afbeelding"
#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:169
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:379
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:393
msgid "Browse for an image to use as the cover of this book."
msgstr "Zoek een afbeelding om als omslag voor dit boek te gebruiken."
#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:171
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:352
msgid "&Title: "
msgstr "&Titel: "
#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:172
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:341
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:353
msgid "Change the title of this book"
msgstr "Verander de titel van dit boek"
#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:173
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:135
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:356
msgid "&Author(s): "
msgstr "&Auteur(s) "
@@ -2744,18 +2784,18 @@ msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:176
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:143
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:365
msgid "&Publisher: "
msgstr "&Uitgeverij "
#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:177
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:366
msgid "Ta&gs: "
msgstr "Ta&gs "
#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:178
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:145
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:367
msgid ""
"Tags categorize the book. This is particularly useful while searching. "
"<br><br>They can be any words or phrases, separated by commas."
@@ -2766,7 +2806,7 @@ msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:179
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:150
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:370
msgid "&Series:"
msgstr "&Series:"
@@ -2774,13 +2814,13 @@ msgstr "&Series:"
#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:181
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:151
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:152
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:359
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:360
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:372
msgid "List of known series. You can add new series."
msgstr "Lijst van bekende series. Je kunt nieuwe series toevoegen."
#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:182
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:377
msgid "Book "
msgstr "Boek "
@@ -2895,7 +2935,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:1321
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1329
msgid "Choose the format to view"
msgstr "Kies het te bekijken formaat"
@@ -3039,23 +3079,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 ""
@@ -3263,10 +3303,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 +3433,7 @@ msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:85
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:86
#: /home/kovid/work/calibre/src/calibre/gui2/library.py:345
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1007
#: /home/kovid/work/calibre/src/calibre/gui2/status.py:56
msgid "Path"
msgstr "Pad"
@@ -3409,7 +3445,7 @@ msgstr "Pad"
#: /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:83
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:122
msgid "Formats"
msgstr "Formaten"
@@ -3514,7 +3550,7 @@ msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:461
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:788
#: /home/kovid/work/calibre/src/calibre/gui2/main.py:140
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1005
#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
msgid "Error"
msgstr "Fout"
@@ -3585,7 +3621,7 @@ msgid "Access log:"
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:645
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:573
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:574
msgid "Failed to start content server"
msgstr ""
@@ -4109,7 +4145,7 @@ msgid "Edit Meta information"
msgstr "Verander Meta informatie"
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:339
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:351
msgid "Meta information"
msgstr "Meta informatie"
@@ -4122,7 +4158,7 @@ msgid "Author s&ort: "
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:138
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:346
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:358
msgid ""
"Specify how the author(s) of this book should be sorted. For example Charles "
"Dickens should be sorted as Dickens, Charles."
@@ -4131,19 +4167,19 @@ msgstr ""
"Bijvoorbeeld: Charles Dickens moet worden gesorteerd als: Dickens, Charles"
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:139
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:349
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:361
msgid "&Rating:"
msgstr "&Rangschikking"
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:140
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:141
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:350
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:362
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:363
msgid "Rating of this book. 0-5 stars"
msgstr "Rangschikking van dit boek. 0-5 sterren"
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:142
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:364
msgid " stars"
msgstr " sterren"
@@ -4153,8 +4189,8 @@ msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:146
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:147
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:356
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:369
msgid "Open Tag Editor"
msgstr "Open Tag Editor"
@@ -4205,115 +4241,123 @@ msgstr ""
msgid "Abort the editing of all remaining books"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:459
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:467
msgid "Downloading cover..."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:471
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:476
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:482
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:479
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:484
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:490
msgid "Cannot fetch cover"
msgstr "Kan omslag niet downloaden"
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:472
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:483
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:480
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:491
msgid "<b>Could not fetch cover.</b><br/>"
msgstr "<b>Omslag kon niet worden gedownload</b><br/>"
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:473
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:481
msgid "The download timed out."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:477
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:485
msgid "Could not find cover for this book. Try specifying the ISBN first."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:489
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:497
msgid "Bad cover"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:490
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:498
msgid "The cover is not a valid picture"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:529
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:538
msgid "Cannot fetch metadata"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:539
msgid "You must specify at least one of ISBN, Title, Authors or Publisher"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:591
msgid "Permission denied"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:592
msgid "Could not open %s. Is it being used by another program?"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:338
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:350
msgid "Edit Meta Information"
msgstr "Verander Meta Informatie"
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:342
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:354
msgid "Swap the author and title"
msgstr "Wissel auteur en titel van plaats"
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:345
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:357
msgid "Author S&ort: "
msgstr "Auteur S&ortering: "
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:347
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:359
msgid ""
"Automatically create the author sort entry based on the current author entry"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:373
msgid "Remove unused series (Series that have no books)"
msgstr "Verwijder ongebruikte series (Series die geen boeken bevatten)"
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:375
msgid "IS&BN:"
msgstr "IS&BN:"
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:376
msgid "Publishe&d:"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:367
-msgid "&Comments"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:379
+msgid "dd MMM yyyy"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:368
-msgid "&Fetch metadata from server"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:369
-msgid "Available Formats"
-msgstr "Beschikbare Formaten"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:370
-msgid "Add a new format for this book to the database"
-msgstr "Voeg een nieuw formaat voor dit boek toe aan de database"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:372
-msgid "Remove the selected formats for this book from the database."
-msgstr "Verwijder de geselecteerde formaten voor dit boek van de database."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:374
-msgid "Set the cover for the book from the selected format"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:376
-msgid "Update metadata from the metadata in the selected format"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:380
+msgid "&Date:"
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:381
-msgid "Reset cover to default"
+msgid "&Comments"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:382
+msgid "&Fetch metadata from server"
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:383
+msgid "Available Formats"
+msgstr "Beschikbare Formaten"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:384
+msgid "Add a new format for this book to the database"
+msgstr "Voeg een nieuw formaat voor dit boek toe aan de database"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:386
+msgid "Remove the selected formats for this book from the database."
+msgstr "Verwijder de geselecteerde formaten voor dit boek van de database."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:388
+msgid "Set the cover for the book from the selected format"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:390
+msgid "Update metadata from the metadata in the selected format"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:395
+msgid "Reset cover to default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:397
msgid "Download &cover"
msgstr ""
@@ -4928,12 +4972,12 @@ msgid " - Jobs"
msgstr " - Taken"
#: /home/kovid/work/calibre/src/calibre/gui2/library.py:160
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1068
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1070
msgid "Size (MB)"
msgstr "Grootte (MB)"
#: /home/kovid/work/calibre/src/calibre/gui2/library.py:161
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1069
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1071
msgid "Date"
msgstr "Datum"
@@ -4952,21 +4996,21 @@ msgstr "Geen"
msgid "Book <font face=\"serif\">%s</font> of %s."
msgstr "Boek <font face=\"serif\">%s</font> van %s."
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:832
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:834
msgid "Not allowed"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:833
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:835
msgid ""
"Dropping onto a device is not supported. First add the book to the calibre "
"library."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1004
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1006
msgid "Format"
msgstr "Formaat"
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1058
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1060
msgid "Double click to <b>edit</b> me<br><br>"
msgstr "Dubbel-klik om me te <b>wijzigen</b><br><br>"
@@ -5130,7 +5174,7 @@ msgid "Save to disk in a single directory"
msgstr "Opslaan op schijf in een enkele folder"
#: /home/kovid/work/calibre/src/calibre/gui2/main.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1423
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1431
msgid "Save only %s format to disk"
msgstr "Bewaar alleen %s formaat op schijf"
@@ -5159,42 +5203,42 @@ msgstr ""
msgid "Similar books..."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:424
#: /home/kovid/work/calibre/src/calibre/gui2/main.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:426
msgid "Bad database location"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:427
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:477
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:428
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:478
msgid "Calibre Library"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:437
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1566
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1574
msgid "Choose a location for your ebook library."
msgstr "Kies een locatie voor de eboek bibliotheek"
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:616
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:617
msgid "Browse by covers"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:723
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:724
msgid "Device: "
msgstr "Apparaat: "
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:725
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:726
msgid " detected."
msgstr " gedetecteerd"
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:747
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:748
msgid "Connected "
msgstr "Verbonden "
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:759
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:760
msgid "Device database corrupted"
msgstr "Apparaat Database Beschadigd"
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:760
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:761
msgid ""
"\n"
" <p>The database of books on the reader is corrupted. Try the "
@@ -5223,166 +5267,170 @@ msgstr ""
" </ol>\n"
" "
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:836
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:837
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:880
msgid "Uploading books to device."
msgstr "Boeken worden geupload naar de lezer."
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:844
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:845
msgid "Books"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:845
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:846
msgid "EPUB Books"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:846
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:847
msgid "LRF Books"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:847
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:848
msgid "HTML Books"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:848
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:849
msgid "LIT Books"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:849
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:850
msgid "MOBI Books"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:850
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:851
msgid "Text books"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:851
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:852
msgid "PDF Books"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:852
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:853
msgid "Comics"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:853
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:854
msgid "Archives"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:888
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:889
msgid "Failed to read metadata"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:889
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:890
msgid "Failed to read metadata from the following"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:908
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:909
msgid ""
"The selected books will be <b>permanently deleted</b> and the files removed "
"from your computer. Are you sure?"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:935
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:936
msgid "Deleting books from device."
msgstr "Boeken worden verwijderd van de lezer."
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:966
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:967
msgid "Cannot download metadata"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:967
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1015
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1048
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1073
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1185
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:968
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1016
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1049
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1074
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1186
msgid "No books selected"
msgstr "Geen boeken geselecteerd"
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:976
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:977
msgid "covers"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:976
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:977
msgid "metadata"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:978
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:979
msgid "Downloading %s for %d book(s)"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:999
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1000
msgid "Failed to download some metadata"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1000
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1001
msgid "Failed to download metadata for the following:"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1003
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1004
msgid "Failed to download metadata:"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1014
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1047
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1015
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1048
msgid "Cannot edit metadata"
msgstr "Metedata kan niet worden gewijzigd"
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1072
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1073
msgid "Cannot save to disk"
msgstr "Kan niet naar schijf worden opgeslagen"
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1075
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1076
msgid "Choose destination directory"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1102
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1103
msgid "Error while saving"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1103
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1104
msgid "There was an error while saving."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1110
#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1111
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1112
msgid "Could not save some books"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1112
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1113
msgid "Click the show details button to see which ones."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1131
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1132
msgid "Fetching news from "
msgstr "Downloading nieuws van "
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1144
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1145
msgid " fetched."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1184
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1185
msgid "Cannot convert"
msgstr "Kan niet converteren"
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1315
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1334
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1212
+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 "Geen boek geselecteerd"
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1315
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1365
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1323
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1373
msgid "Cannot view"
msgstr "Kan niet bekijken"
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1333
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1341
msgid "Cannot open folder"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1350
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1358
msgid "Multiple Books Selected"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1351
+#: /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 "
@@ -5390,31 +5438,31 @@ msgid ""
"continue?"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1366
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1374
msgid "%s has no available formats."
msgstr "%s heeft geen beschikbare formaten"
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1407
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1415
msgid "Cannot configure"
msgstr "Kan niet configureren"
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1408
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1416
msgid "Cannot configure while there are running jobs."
msgstr "Can niet configueren terwijl bestaande opdrachten bezig zijn"
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1451
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1459
msgid "No detailed info available"
msgstr "Geen details beschikbaar"
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1452
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1460
msgid "No detailed information is available for books on the device."
msgstr "Geen details zijn beschikbaar voor de boeken op de lezer."
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1504
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1512
msgid "Error talking to device"
msgstr "Fout bij communicatie met lezer"
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1505
+#: /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."
@@ -5422,57 +5470,57 @@ msgstr ""
"Er is een tijdelijke fout opgetreden tijdens de communicatie met de lezer. "
"verwijzer de lezer en plug hem opnieuw in, of herstart."
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1528
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1546
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1536
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1554
msgid "Conversion Error"
msgstr "Converteer Fout"
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1529
+#: /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:1547
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1555
msgid "<b>Failed</b>"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1575
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1583
msgid "Invalid library location"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1576
+#: /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:1623
+#: /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:1647
+#: /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:1650
+#: /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:1654
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1662
msgid "WARNING: Active jobs"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1705
+#: /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:1724
+#: /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>"
@@ -5480,11 +5528,11 @@ msgstr ""
"<span style=\"color:red; font-weight:bold\">Laatste versie: <a "
"href=\"%s\">%s</a></span>"
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1732
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1740
msgid "Update available"
msgstr "Update beschikbaar"
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1733
+#: /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>. "
@@ -5494,52 +5542,52 @@ msgstr ""
"href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">nieuwe functies</a> "
"Bezoek download pagina?"
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1751
+#: /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:1753
+#: /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:1755
+#: /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:1757
+#: /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:1805
+#: /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:1807
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1815
msgid "Cannot Start "
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1808
+#: /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:1811
+#: /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:1813
+#: /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:1815
+#: /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:1818
+#: /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:1820
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1832
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1828
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1840
msgid "try deleting the file"
msgstr ""
@@ -5617,7 +5665,7 @@ msgstr "S"
#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:355
msgid "Fetch news"
-msgstr "Download niews"
+msgstr "Download nieuws"
#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:356
msgid "F"
@@ -5727,57 +5775,52 @@ msgstr ""
msgid "Click to browse books by tags"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:122
msgid "Authors"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:83
+#: /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:106
-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
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:182
msgid "Convert book %d of %d (%s)"
msgstr "Converteer boek %d van %d (%s)"
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:91
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:204
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:202
msgid "Could not convert some books"
msgstr "Sommige boeken konden niet worden geconverteerd"
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:205
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:91
+#: /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 "Download nieuws van "
-#: /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?"
@@ -6229,7 +6272,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 ""
@@ -6780,27 +6823,27 @@ msgstr ""
"\n"
"Voor help met een specifiek commando: %%prog command --help\n"
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1565
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1567
msgid "<p>Migrating old database to ebook library in %s<br><center>"
msgstr "<p>Migreer oude database naar eboek bibliotheek in %s<br><center>"
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1594
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1596
msgid "Copying <b>%s</b>"
msgstr "Copieer <b>%s</b>"
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1611
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1613
msgid "Compacting database"
msgstr "Comprimeren database"
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1699
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1701
msgid "Checking SQL integrity..."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1736
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1738
msgid "Checking for missing files."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1760
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1762
msgid "Checked id"
msgstr ""
@@ -6925,57 +6968,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 "%sGebruik%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 "Gemaakt door "
-#: /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 "Pad naar de database waarin boeken zijn opgeslagen"
-#: /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 "Patroon om metadata uit bestandsnamen te voorspellen"
-#: /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 "Toegangssleutel voor 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 "Standaard timeout voor netwerk operaties"
-#: /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 "Pad naar folder waarin je bibliotheek is opgeslagen"
-#: /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 ""
@@ -7016,6 +7059,7 @@ msgid "Traditional Chinese"
msgstr ""
#: /home/kovid/work/calibre/src/calibre/utils/localization.py:99
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nytimes.py:17
msgid "English"
msgstr ""
@@ -7156,6 +7200,7 @@ msgstr "Artikel download mislukt: %s"
#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_lamujerdemivida.py:60
#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_laprensa_ni.py:64
#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_monitor.py:79
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_nin.py:95
#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_pobjeda.py:84
#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_republika.py:67
msgid "Fetching feed"
@@ -7167,13 +7212,13 @@ msgstr ""
#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_le_monde.py:119
msgid "Skipping duplicated article: %s"
-msgstr ""
+msgstr "Dubbel artikel wordt overgeslagen: %s"
#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/recipe_le_monde.py:126
msgid "Skipping filtered article: %s"
-msgstr ""
+msgstr "Gefilterd artikel wordt overgeslagen: %s"
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:452
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:458
msgid ""
"%prog URL\n"
"\n"
@@ -7183,12 +7228,12 @@ msgstr ""
"\n"
"Waar URL is bijvoorbeeld http://google.com"
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:455
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:461
msgid "Base directory into which URL is saved. Default is %default"
msgstr ""
-"basis folder waar de URL naar toe word geschreven. Standaard is %default"
+"Basis map waar de URL naar toe wordt geschreven. Standaard is %default"
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:458
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:464
msgid ""
"Timeout in seconds to wait for a response from the server. Default: %default "
"s"
@@ -7196,15 +7241,15 @@ msgstr ""
"Timeout in seconden om te wachten op een antwoord van de server. Standaard: "
"%default s"
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:461
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:467
msgid ""
"Maximum number of levels to recurse i.e. depth of links to follow. Default "
"%default"
msgstr ""
-"Maximum aantal level om recursief te zoeken -- de diepte om links te volgen. "
-"Standaard %default"
+"Maximum aantal niveaus om recursief te zoeken -- de diepte van de te volgen "
+"links. Standaard %default"
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:464
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:470
msgid ""
"The maximum number of files to download. This only applies to files from <a "
"href> tags. Default is %default"
@@ -7212,7 +7257,7 @@ msgstr ""
"Het maximum aantal bestanden te downloaden. Dit is alleen van toepassing op "
"bestanden in <a href> tags. Standaard is %default"
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:466
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:472
msgid ""
"Minimum interval in seconds between consecutive fetches. Default is %default "
"s"
@@ -7220,7 +7265,7 @@ msgstr ""
"Minimum inteval in seconden tussen aaneensluitende downloads. Standaard is "
"%default s"
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:468
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:474
msgid ""
"The character encoding for the websites you are trying to download. The "
"default is to try and guess the encoding."
@@ -7228,7 +7273,7 @@ msgstr ""
"De karakter codering voor de websites die je probeert te downloaden. "
"Standaard zal er worden geprobeerd om de codering te raden."
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:470
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:476
msgid ""
"Only links that match this regular expression will be followed. This option "
"can be specified multiple times, in which case as long as a link matches any "
@@ -7239,7 +7284,7 @@ msgstr ""
"link zal worden gevolgd als deze overeenkomt met ten minste een reguliere "
"expressie. Standaard zullen alle links worden gevolgd."
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:472
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:478
msgid ""
"Any link that matches this regular expression will be ignored. This option "
"can be specified multiple times, in which case as long as any regexp matches "
@@ -7253,11 +7298,11 @@ msgstr ""
"geen enkele link overgeslagen. indien zowel --filter-regexp en --match-"
"regexp worden gebruikt, dan zal --filter-regexp allereerst worden toegepast."
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:474
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:480
msgid "Do not download CSS stylesheets."
msgstr "Download geen CSS stylesheets"
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:475
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:481
msgid "Show detailed output information. Useful for debugging"
msgstr ""
"Laat gedetailleerde output informatie zien. Handig bij het opsporen van "
diff --git a/src/calibre/translations/pl.po b/src/calibre/translations/pl.po
index 13a1c8cd15..6f655dc1d9 100644
--- a/src/calibre/translations/pl.po
+++ b/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"
-"PO-Revision-Date: 2009-09-28 07:23+0000\n"
+"POT-Creation-Date: 2009-10-02 05:30+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:118
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:120
+#: /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:1335
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1212
+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:1366
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1323
+#: /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:1547
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1536
+#: /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:1833
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1828
+#: /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:106
-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
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:182
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:204
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:90
+#: /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:205
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:91
+#: /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 ""
diff --git a/src/calibre/translations/ru.po b/src/calibre/translations/ru.po
index dba7c570ae..ad6e590dcc 100644
--- a/src/calibre/translations/ru.po
+++ b/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"
-"PO-Revision-Date: 2009-09-28 07:27+0000\n"
+"POT-Creation-Date: 2009-10-02 05:30+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:118
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:120
+#: /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:1335
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1212
+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:1366
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1323
+#: /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:1547
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1536
+#: /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:1833
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1828
+#: /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:106
-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
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:182
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:204
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:90
+#: /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:205
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:91
+#: /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 "Приоритет рабочих процессов"
diff --git a/src/calibre/translations/zh_CN.po b/src/calibre/translations/zh_CN.po
index 855b03b931..5eeb8c9854 100644
--- a/src/calibre/translations/zh_CN.po
+++ b/src/calibre/translations/zh_CN.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"
-"PO-Revision-Date: 2009-09-30 16:34+0000\n"
-"Last-Translator: Kovid Goyal <Unknown>\n"
+"POT-Creation-Date: 2009-10-02 05:30+0000\n"
+"PO-Revision-Date: 2009-10-02 11:00+0000\n"
+"Last-Translator: Thruth Wang <wanglihao@gmail.com>\n"
"Language-Team: Simplified Chinese <zh_CN@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-10-01 06:38+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 "不做任何处理"
#: /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:118
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:120
+#: /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
@@ -432,7 +432,7 @@ msgstr "与 EB600 eBook reader 通信。"
#: /home/kovid/work/calibre/src/calibre/devices/eslick/driver.py:16
msgid "Communicate with the ESlick eBook reader."
-msgstr ""
+msgstr "与 ESlick eBook reader 通信。"
#: /home/kovid/work/calibre/src/calibre/devices/iliad/driver.py:16
msgid "Communicate with the IRex Iliad eBook reader."
@@ -495,12 +495,12 @@ msgstr "Kovid Goyal 和 John Schember"
#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:119
#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:134
msgid "Removing books from device..."
-msgstr "从设备中删除书籍中..."
+msgstr "正在从设备中删除书籍..."
#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:198
#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:149
msgid "Sending metadata to device..."
-msgstr "传输元数据到设备中..."
+msgstr "正在传输元数据到设备..."
#: /home/kovid/work/calibre/src/calibre/devices/prs700/driver.py:17
msgid "Communicate with the Sony PRS-600/700 eBook reader."
@@ -549,7 +549,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
@@ -618,7 +618,7 @@ msgid ""
"Number of colors for grayscale image conversion. Default: %default. Values "
"of less than 256 may result in blurred text on your device if you are "
"creating your comics in EPUB format."
-msgstr ""
+msgstr "图像转换灰度级别。默认：%default 。若您转换 EPUB 格式漫画，256 以下的数值可能造成设备上显示的文本模糊。"
#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:278
msgid ""
@@ -672,7 +672,7 @@ msgid ""
"The format that images in the created ebook are converted to. You can "
"experiment to see which format gives you optimal size and look on your "
"device."
-msgstr ""
+msgstr "转换的电子书中所含图像格式。您可以试验几种格式，看哪种格式的大小和效果最适合您的设备。"
#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:308
msgid "Apply no processing to the image"
@@ -805,8 +805,8 @@ msgid ""
"fonts in the output bigger and vice versa. By default, the base font size is "
"chosen based on the output profile you chose."
msgstr ""
-"基准字体尺寸(pts). 所有输出文件中的文字将以此为基准进行缩放. 选择一个较大的基准字体可以将所有文字相应放大, 反之亦然. "
-"在默认情况下程序根据您选择的输出配置文件来设定基准字体尺寸."
+"基准字体尺寸(pts)。所有输出文件中的文字将以此为基准进行缩放。选择一个较大的基准字体可以将所有文字相应放大，反之亦然。在默认情况下，程序根据您选择的输"
+"出配置文件来设定基准字体尺寸。"
#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:139
msgid ""
@@ -836,7 +836,7 @@ msgid ""
"page and other artifacts. This option will extract the content from the "
"tables and present it in a linear fashion."
msgstr ""
-"一些布局不佳的源文件使用表格来控制页面布局可能会导致输出文件中的正文超过页面范围. 本选项设定程序将内容从表格中提取出并以线型布局排列输出."
+"一些布局不佳的源文件使用表格来控制页面布局可能会导致输出文件中的正文超过页面范围。本选项设定程序将内容从表格中提取出并以线型布局排列输出。"
#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:176
msgid ""
@@ -864,11 +864,11 @@ msgid ""
"Normally, if the source file already has a Table of Contents, it is used in "
"preference to the auto-generated one. With this option, the auto-generated "
"one is always used."
-msgstr "通常情况下, 程序会引用源文件中已有的目录. 打开本选项来强制使用自动生成的目录."
+msgstr "通常情况下，程序会引用源文件中已有的目录。打开本选项来强制使用自动生成的目录。"
#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:209
msgid "Don't add auto-detected chapters to the Table of Contents."
-msgstr "不要将检测到的章节添加到文件目录中作为链接."
+msgstr "不将自动检测到的章节添加到文件目录。"
#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:216
msgid ""
@@ -1091,7 +1091,7 @@ msgstr "设置书籍制作人。"
#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:454
#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:71
msgid "Set the language."
-msgstr "设置书籍语言"
+msgstr "设置书籍语言。"
#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:546
msgid "Could not find an ebook inside the archive"
@@ -1107,7 +1107,7 @@ msgstr "正在对电子书籍进行转换..."
#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:821
msgid "Creating"
-msgstr "创建中"
+msgstr "正在创建"
#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:57
msgid ""
@@ -1145,7 +1145,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 "目录："
@@ -1188,7 +1188,7 @@ msgstr ""
msgid ""
"Average line length for line breaking if the HTML is from a previous partial "
"conversion of a PDF file. Default is %default which disables this."
-msgstr ""
+msgstr "PDF 文件部分转换为 HTML，在此设定平均换行行宽。默认为 %default 即已禁用。"
#: /home/kovid/work/calibre/src/calibre/ebooks/lit/from_any.py:47
msgid "Creating LIT file from EPUB..."
@@ -1452,7 +1452,7 @@ msgstr "放大文字字体倍数. 默认值 %default"
#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:121
msgid "The serif family of fonts to embed"
-msgstr "将被内嵌的衬线字体"
+msgstr "将被内嵌的衬线字体集"
#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:124
msgid "The sans-serif family of fonts to embed"
@@ -1460,7 +1460,7 @@ msgstr "将被内嵌的sans-serif字体集"
#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:127
msgid "The monospace family of fonts to embed"
-msgstr "将被内嵌的等宽字体"
+msgstr "将被内嵌的等宽字体集"
#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:152
msgid "Comic"
@@ -1511,7 +1511,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 "标签"
@@ -1519,7 +1519,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 "系列"
@@ -1627,7 +1627,7 @@ msgstr "变更的元数据"
#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:188
msgid "OPF created in"
-msgstr "创建 OPF 文件在"
+msgstr "OPF 文件创建在"
#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:194
msgid "Cover saved to"
@@ -1662,37 +1662,37 @@ msgstr ""
#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:105
msgid "The ISBN ID of the book you want metadata for."
-msgstr "待查找信息的书籍的 ISBN ID。"
+msgstr "待查找书籍的 ISBN ID。"
#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:107
msgid "The author whose book to search for."
-msgstr "待查找信息的书籍的作者."
+msgstr "待查找书籍的作者。"
#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:109
msgid "The title of the book to search for."
-msgstr "待查找信息的书籍的标题."
+msgstr "待查找书籍的标题。"
#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:111
msgid "The publisher of the book to search for."
-msgstr "待查找信息的书籍的出版商."
+msgstr "待查找书籍的出版商。"
#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:53
msgid "LibraryThing.com timed out. Try again later."
-msgstr "访问LibraryThing.com超时. 请稍后再试."
+msgstr "访问 LibraryThing.com 超时。请稍后再试。"
#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:60
msgid ""
"Could not fetch cover as server is experiencing high load. Please try again "
"later."
-msgstr "由于服务器繁忙无法获得封面. 请稍后重试."
+msgstr "由于服务器繁忙无法获得封面。请稍后重试。"
#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:61
msgid " not found."
-msgstr " 无法找到."
+msgstr " 无法找到。"
#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:64
msgid "LibraryThing.com server error. Try again later."
-msgstr "LibraryThing.com 服务器错误. 请稍后重试."
+msgstr "LibraryThing.com 服务器错误。请稍后重试。"
#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:71
msgid ""
@@ -1713,26 +1713,26 @@ msgstr "封面"
#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:22
msgid "Modify images to meet Palm device size limitations."
-msgstr "缩放图片使之适应Palm设备的屏幕尺寸."
+msgstr "修改图片以适应 Palm 设备的屏幕尺寸。"
#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:26
msgid "When present, use author sort field as author."
-msgstr "按作者排序时使用作者排序, 如果该字段为非空."
+msgstr "按作者排序时使用作者排序，如果该字段为非空。"
#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:30
msgid ""
"Don't add Table of Contents to end of book. Useful if the book has its own "
"table of contents."
-msgstr "不要自动生成书籍目录. 该选项使用与已有目录的书籍."
+msgstr "不要自动生成书籍目录。该选项对自含目录的书籍尤其有用。"
#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:33
#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/htmltoc.py:56
msgid "Title for any generated in-line table of contents."
-msgstr "生成的行内目录标题"
+msgstr "生成的行内目录标题。"
#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:37
msgid "Disable compression of the file contents."
-msgstr "不压缩文件内容"
+msgstr "不压缩文件内容。"
#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:102
msgid "All articles"
@@ -1775,11 +1775,11 @@ msgstr "版权"
#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1323
msgid "Dedication"
-msgstr "贡献"
+msgstr "献辞"
#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1324
msgid "Epigraph"
-msgstr "题词"
+msgstr "题辞"
#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1325
msgid "Foreword"
@@ -1807,11 +1807,11 @@ msgstr "正文"
#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/factory.py:53
msgid "Options to control e-book conversion."
-msgstr "控制电子书籍转换的选项"
+msgstr "控制电子书籍转换的选项。"
#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/factory.py:60
msgid "Character encoding for input. Default is to auto detect."
-msgstr "源文件的字符编码. 默认为自动检测."
+msgstr "输入文件的字符编码。默认为自动检测。"
#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/factory.py:62
msgid "Output file. Default is derived from input filename."
@@ -1819,11 +1819,11 @@ msgstr "输出文件. 默认使用与输入文件相同的文件名."
#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/factory.py:64
msgid "Produce more human-readable XML output."
-msgstr "生成人类可读的XML输出."
+msgstr "生成更多人类可读的 XML 输出。"
#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/factory.py:66
msgid "Useful for debugging."
-msgstr "调试信息."
+msgstr "有利调试。"
#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/factory.py:71
msgid "Usage: ebook-convert INFILE OUTFILE [OPTIONS..]"
@@ -1831,11 +1831,11 @@ msgstr "用法: ebook-convert INFILE OUTFILE [OPTIONS..]"
#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/iterator.py:38
msgid "%s format books are not supported"
-msgstr "%s 格式电子书不被支持"
+msgstr "不支持 %s 格式电子书"
#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/htmltoc.py:54
msgid "HTML TOC generation options."
-msgstr "HTML 目录生成选项."
+msgstr "HTML 目录生成选项。"
#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:108
msgid "Book Jacket"
@@ -1852,11 +1852,11 @@ msgstr "未命名"
#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/writer.py:32
msgid "OPF/NCX/etc. generation options."
-msgstr "OPF/NCX/等其他文件生成选项."
+msgstr "OPF/NCX 等文件生成选项。"
#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/writer.py:35
msgid "OPF version to generate. Default is %default."
-msgstr "生成的OPF文件版本. 默认值为 %default."
+msgstr "生成的 OPF 文件版本。默认值为 %default 。"
#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/writer.py:37
msgid ""
@@ -1886,6 +1886,7 @@ msgid ""
"spaces) represents a paragraph. Paragraphs end when the next line that "
"starts with an indent is reached."
msgstr ""
+"Calibre 一般将空行作为段落标记。使用此选项将假定有缩进（一个 tab 或者两个以上空格）的行代表一段文字的开始。下一个缩进之前的内容为段尾。"
#: /home/kovid/work/calibre/src/calibre/ebooks/pdb/output.py:23
msgid "Format to use inside the pdb container. Choices are:"
@@ -2065,7 +2066,7 @@ msgstr ""
#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/merge.py:56
msgid "Merge Options:"
-msgstr "合并选项:"
+msgstr "合并选项："
#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/reverse.py:25
msgid ""
@@ -2079,7 +2080,7 @@ msgstr ""
#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/reverse.py:54
msgid "Reverse Options:"
-msgstr "反转选项:"
+msgstr "反转选项："
#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/rotate.py:24
msgid ""
@@ -2093,7 +2094,7 @@ msgstr ""
#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/rotate.py:53
msgid "Rotate Options:"
-msgstr "旋转选项:"
+msgstr "旋转选项："
#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/split.py:25
msgid ""
@@ -2123,7 +2124,7 @@ msgstr ""
#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/split.py:61
msgid "Split Options:"
-msgstr "切分选项:"
+msgstr "切分选项："
#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/output.py:31
msgid ""
@@ -2195,12 +2196,13 @@ msgid ""
"the space after and will exceed the specified value. Also, there is a "
"minimum of 25 characters. Use 0 to disable line splitting."
msgstr ""
+"每行最多容纳字符数。程序将会自动寻找行中最后一个空格换行。如果行内无空格，则行宽将会超过超越此值，在下个空格处换行。此外，最小值为25。使用 0 禁用分行"
#: /home/kovid/work/calibre/src/calibre/ebooks/txt/output.py:48
msgid ""
"Force splitting on the max-line-length value when no space is present. Also "
"allows max-line-length to be below the minimum"
-msgstr ""
+msgstr "不存在空格时强制按照最大行宽拆分。同时允许最大行宽低于最小值"
#: /home/kovid/work/calibre/src/calibre/ebooks/txt/output.py:52
msgid "Add a tab at the beginning of each paragraph."
@@ -2294,7 +2296,7 @@ msgstr "当“传送到设备”按钮被按下时的默认动作"
#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:85
msgid "Maximum number of waiting worker processes"
-msgstr ""
+msgstr "等待中的工作进程最大数量"
#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:123
#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:397
@@ -2311,53 +2313,70 @@ msgstr "复制到剪贴板"
#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:381
msgid "Choose Files"
-msgstr ""
+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 "添加书籍进程似乎已死。请尝试重启 Calibre 并分步添加书籍，直到定位出问题的书籍。"
-#: /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 "已保存"
@@ -2414,7 +2433,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
@@ -2552,7 +2571,7 @@ msgid ""
"The debug process outputs the intermediate HTML generated at various stages "
"of the conversion process. This HTML can sometimes serve as a good starting "
"point for hand editing a conversion."
-msgstr ""
+msgstr "调试过程会输出转换各个阶段种生成的中转 HTML。此 HTML 常可以作为手动编辑转换的起点。"
#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output.py:15
msgid "EPUB Output"
@@ -2919,7 +2938,7 @@ msgstr "将每行文字作为段落处理(&L)"
#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_input_ui.py:33
#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:42
msgid "Assume print formatting"
-msgstr ""
+msgstr "假定打印格式"
#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_output.py:16
msgid "PDB Output"
@@ -2958,25 +2977,25 @@ msgid "RB Output"
msgstr "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 "选择格式进行查看"
#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:82
msgid "Cannot build regex using the GUI builder without a book."
-msgstr ""
+msgstr "缺少书籍，无法使用图形界面构建器构建正则表达式。"
#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:82
msgid "No formats available"
-msgstr ""
+msgstr "无格式何用"
#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:98
msgid "Open book"
-msgstr ""
+msgstr "打开书籍"
#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:98
msgid "~"
-msgstr ""
+msgstr "~"
#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:46
msgid "Regex Builder"
@@ -2984,7 +3003,7 @@ msgstr "正则表达式生成器"
#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:47
msgid "Preview"
-msgstr ""
+msgstr "预览"
#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:48
msgid "Regex:"
@@ -3032,11 +3051,11 @@ msgstr "之前插入分页位置（XPath 表达式）："
#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:37
msgid "Header regular expression:"
-msgstr ""
+msgstr "页眉正则表达式："
#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:40
msgid "Footer regular expression:"
-msgstr ""
+msgstr "页脚正则表达式："
#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:56
#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:72
@@ -3106,23 +3125,23 @@ msgstr "&二级目录（XPath 表达式）："
msgid "Level &3 TOC (XPath expression):"
msgstr "&三级目录（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 "关闭自动章节检测和添加到目录的功能"
-#: /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 "章节开始(&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 "强制使用自动生成目录(&F)"
-#: /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 "目录过滤(&F)："
@@ -3336,10 +3355,6 @@ msgstr "发送指定格式到存储卡 A"
msgid "Send specific format to storage card B"
msgstr "发送指定格式到存储卡 B"
-#: /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 "选择传送"
@@ -3480,7 +3495,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 "格式"
@@ -3954,7 +3969,7 @@ msgstr "Calibre 可以通过电子邮件将电子书籍发送给您或您的设
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:508
msgid "&Maximum number of waiting worker processes (needs restart):"
-msgstr ""
+msgstr "等待中的工作进程最大值（需要重启）(&M)"
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:509
msgid "&Check database integrity"
@@ -4013,7 +4028,7 @@ msgstr "显示密码(&S)"
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:519
msgid "Max. &OPDS items per query:"
-msgstr ""
+msgstr "每次请求最大 OPDS 项(&O)："
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:520
msgid "&Start Server"
@@ -4178,7 +4193,7 @@ msgstr "显示任务信息(&D)"
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs_ui.py:47
msgid "Stop &all jobs"
-msgstr ""
+msgstr "停止所有任务(&A)"
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:133
msgid "Edit Meta information"
@@ -4276,7 +4291,7 @@ msgstr "%s 格式中封面无效"
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:268
msgid "Abort the editing of all remaining books"
-msgstr ""
+msgstr "放弃编辑所有其余书籍"
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:467
msgid "Downloading cover..."
@@ -4356,11 +4371,11 @@ msgstr "出版于(&D)："
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:379
msgid "dd MMM yyyy"
-msgstr ""
+msgstr "dd MMM yyyy"
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:380
msgid "&Date:"
-msgstr ""
+msgstr "日期(&D) :"
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:381
msgid "&Comments"
@@ -5215,7 +5230,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 到磁盘"
@@ -5250,12 +5265,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 "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 "为您的电子书库选择一个位置。"
@@ -5445,25 +5460,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:1335
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1212
+msgid "Starting conversion of %d book(s)"
+msgstr "开始转换 %d 本书"
+
+#: /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:1366
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1323
+#: /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 "
@@ -5471,70 +5490,70 @@ msgid ""
"continue?"
msgstr "您正在试图打开 %d 本书籍。同时打开太多书籍可能会变慢，并对电脑响应速度有消极影响。一旦开始，需等待进程完成。是否继续？"
-#: /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."
msgstr "与设备通讯出现临时性错误。请拔下再重新连接设备，或可能需要重启。"
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1529
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1547
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1536
+#: /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 "<p>无法转换：%s<p> 它是 <a href=\"%s\">DRM</a> 保护书籍。您需要首先使用第三方工具去除 DRM。"
-#: /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>失败</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 "无效书库位置"
-#: /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."
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"
@@ -5544,28 +5563,28 @@ msgstr ""
" 退出可能导致设备损坏。<br>\n"
" 确定退出么？"
-#: /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 "将在系统栏中继续运行。要关闭，在系统栏菜单中选择<b>退出</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>"
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>. "
@@ -5574,52 +5593,52 @@ msgstr ""
"%s 已更新到版本 %s。参见<a "
"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 ""
+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 "%s 正在运行。"
-#: /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:1833
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1828
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1840
msgid "try deleting the file"
msgstr "尝试删除文件"
@@ -5803,57 +5822,52 @@ msgstr "<p>已禁用封面浏览。<br>导入图片流模块失败：<br>"
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:106
-msgid "Starting conversion of %d books"
-msgstr "开始转换 %d 本书"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:64
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:184
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:182
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:204
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:90
+#: /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:205
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:91
+#: /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 "由于未找到适用源格式，无法转换 %d 本书中的 %d 本。"
-#: /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 "为批处理排队书籍"
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:183
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:181
msgid "Queueing "
-msgstr ""
+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?"
@@ -6323,7 +6337,7 @@ msgstr "<p>在 %s 已有无效书库，在试图移动现有书库前删除它
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 "欢迎向导"
@@ -6586,7 +6600,7 @@ msgstr "显示封面最大大小。默认为 %default。"
msgid ""
"The maximum number of matches to return per OPDS query. This affects Stanza, "
"WordPlayer, etc. integration."
-msgstr ""
+msgstr "每次 OPDS 请求所返回的匹配数。此设置影响 Stanza、WordPlayer 等程序整合。"
#: /home/kovid/work/calibre/src/calibre/library/cli.py:117
msgid ""
@@ -7015,57 +7029,57 @@ msgstr ""
"\n"
"启动 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 "%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 "向 %prog 传递包含空格的参数时，确保使用引号。"
-#: /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 "工作流程优先级"
@@ -7087,15 +7101,15 @@ msgstr "工作中..."
#: /home/kovid/work/calibre/src/calibre/utils/localization.py:94
msgid "Brazilian Portuguese"
-msgstr ""
+msgstr "巴西葡萄牙语"
#: /home/kovid/work/calibre/src/calibre/utils/localization.py:95
msgid "English (UK)"
-msgstr ""
+msgstr "英语（英国）"
#: /home/kovid/work/calibre/src/calibre/utils/localization.py:96
msgid "Simplified Chinese"
-msgstr ""
+msgstr "简体中文"
#: /home/kovid/work/calibre/src/calibre/utils/localization.py:97
msgid "Chinese (HK)"
@@ -7365,6 +7379,9 @@ msgstr "显示详细输出信息。有利调试"
#~ "first remove the DRM using 3rd party tools."
#~ msgstr "<p>无法转换：%s<p>这是使用 <a href=\"%s\">DRM</a> 保护的书籍。您必须使用第三方工具先去除其 DRM。"
+#~ msgid "Starting conversion of %d books"
+#~ msgstr "开始转换 %d 本书"
+
#~ msgid "/Unknown"
#~ msgstr "/未知"
diff --git a/src/calibre/utils/PythonMagickWand.py b/src/calibre/utils/PythonMagickWand.py
index 91c37e42ba..16ca8d2935 100644
--- a/src/calibre/utils/PythonMagickWand.py
+++ b/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') \
- if isfrozen else 'CORE_RL_wand_'
+ flib = os.path.join(os.path.dirname(sys.executable), 'DLLs', 'CORE_RL_wand_.dll')
+ _lib = flib if isfrozen else 'CORE_RL_wand_'
else:
if isfrozen:
_lib = os.path.join(sys.frozen_path, 'libMagickWand.so.2')
diff --git a/src/calibre/utils/config.py b/src/calibre/utils/config.py
index e7bc06e7af..c9424717f0 100644
--- a/src/calibre/utils/config.py
+++ b/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)
diff --git a/src/calibre/utils/ipc/job.py b/src/calibre/utils/ipc/job.py
index 16ce85ace6..79db972008 100644
--- a/src/calibre/utils/ipc/job.py
+++ b/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):
diff --git a/src/calibre/utils/lzx/lzc.h b/src/calibre/utils/lzx/lzc.h
index 8a24f2c090..e817a7eb43 100644
--- a/src/calibre/utils/lzx/lzc.h
+++ b/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);
diff --git a/src/calibre/utils/lzx/lzxc.h b/src/calibre/utils/lzx/lzxc.h
index 30da460a81..367094b817 100644
--- a/src/calibre/utils/lzx/lzxc.h
+++ b/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
diff --git a/src/calibre/utils/lzx/lzxd.h b/src/calibre/utils/lzx/lzxd.h
index 15ae17c0aa..ed9ea73273 100644
--- a/src/calibre/utils/lzx/lzxd.h
+++ b/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
diff --git a/src/calibre/utils/lzx/lzxmodule.h b/src/calibre/utils/lzx/lzxmodule.h
index d146694fd7..05159deb3b 100644
--- a/src/calibre/utils/lzx/lzxmodule.h
+++ b/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 */
diff --git a/src/calibre/utils/lzx/mspack.h b/src/calibre/utils/lzx/mspack.h
index b48623fed0..e9d8a875a0 100644
--- a/src/calibre/utils/lzx/mspack.h
+++ b/src/calibre/utils/lzx/mspack.h
@@ -115,8 +115,7 @@
* - #MSPACK_ERR_DECRUNCH indicates an error occured during decompression.
*/
-#ifndef LIB_MSPACK_H
-#define LIB_MSPACK_H 1
+#pragma once
#ifdef __cplusplus
extern "C" {
@@ -1479,4 +1478,3 @@ struct mskwaj_decompressor {
};
#endif
-#endif
diff --git a/src/calibre/utils/lzx/msstdint.h b/src/calibre/utils/lzx/msstdint.h
index e032ff1605..51190b4fa5 100644
--- a/src/calibre/utils/lzx/msstdint.h
+++ b/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_ ]
diff --git a/src/calibre/utils/lzx/system.h b/src/calibre/utils/lzx/system.h
index acc7d23f56..f586bbb495 100644
--- a/src/calibre/utils/lzx/system.h
+++ b/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
-#define MSPACK_SYSTEM_H 1
+#pragma once
#ifdef _MSC_VER
#define inline
@@ -62,5 +61,3 @@ static inline size_t strlen(const char *s) {
return e - s;
}
#endif
-
-#endif
diff --git a/src/calibre/utils/msdes/d3des.h b/src/calibre/utils/msdes/d3des.h
index 08ce78656a..0b654b8337 100644
--- a/src/calibre/utils/msdes/d3des.h
+++ b/src/calibre/utils/msdes/d3des.h
@@ -10,6 +10,8 @@
* (GEnie : OUTER; CIS : [71755,204])
*/
+#pragma once
+
#undef D2_DES
#undef D3_DES
diff --git a/src/calibre/utils/msdes/spr.h b/src/calibre/utils/msdes/spr.h
index 1579892575..d61d5d332f 100644
--- a/src/calibre/utils/msdes/spr.h
+++ b/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,
diff --git a/src/calibre/web/feeds/recipes/__init__.py b/src/calibre/web/feeds/recipes/__init__.py
index cb52d41111..b753886fc7 100644
--- a/src/calibre/web/feeds/recipes/__init__.py
+++ b/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',
)]
diff --git a/src/calibre/web/feeds/recipes/recipe_chr_mon.py b/src/calibre/web/feeds/recipes/recipe_chr_mon.py
index e4c12cc931..f2fec1c24d 100644
--- a/src/calibre/web/feeds/recipes/recipe_chr_mon.py
+++ b/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):
- soup = self.index_to_soup('http://www.csmonitor.com/textedition')
- feeds = []
- for tag in soup.findAll(['h2', 'p']):
- if tag.name == 'h2':
- title = self.tag_to_string(tag)
- feeds.append((title, []))
- elif tag.has_key('class') and tag['class'] == 'story' and feeds:
- a = tag.find('a')
- if a is not None and a.has_key('href'):
- art = {
- 'title': self.tag_to_string(a),
- 'url' : 'http://www.csmonitor.com'+a['href'],
- 'date' : '',
- }
- a.extract()
- art['description'] = self.tag_to_string(tag).strip()
- feeds[-1][1].append(art)
- return feeds
-
+ extra_css = '''
+ h1{ color:#000000;font-family: Georgia,Times,"Times New Roman",serif; font-size: large}
+ .sub{ color:#000000;font-family: Georgia,Times,"Times New Roman",serif; font-size: small;}
+ .byline{ font-family:Arial,Helvetica,sans-serif ; color:#999999; font-size: x-small;}
+ .postdate{color:#999999 ; font-family:Arial,Helvetica,sans-serif ; font-size: x-small; }
+ h3{color:#999999 ; font-family:Arial,Helvetica,sans-serif ; font-size: x-small; }
+ .photoCutline{ color:#333333 ; font-family:Arial,Helvetica,sans-serif ; font-size: x-small; }
+ .photoCredit{ color:#999999 ; font-family:Arial,Helvetica,sans-serif ; font-size: x-small; }
+ #story{font-family:Arial,Tahoma,Verdana,Helvetica,sans-serif ; font-size: small; }
+ #main{font-family:Arial,Tahoma,Verdana,Helvetica,sans-serif ; font-size: small; }
+ #photo-details{ font-family:Arial,Helvetica,sans-serif ; color:#999999; font-size: x-small;}
+ span.name{color:#205B87;font-family: Georgia,Times,"Times New Roman",serif; font-size: x-small}
+ p#dateline{color:#444444 ; font-family:Arial,Helvetica,sans-serif ; font-style:italic;}
+ '''
+ feeds = [
+ (u'Top Stories' , u'http://rss.csmonitor.com/feeds/top'),
+ (u'World' , u'http://rss.csmonitor.com/feeds/world'),
+ (u'USA' , u'http://rss.csmonitor.com/feeds/usa'),
+ (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:
diff --git a/src/calibre/web/feeds/recipes/recipe_daily_mail.py b/src/calibre/web/feeds/recipes/recipe_daily_mail.py
index 3dba0c8d4c..ac2dfd1777 100644
--- a/src/calibre/web/feeds/recipes/recipe_daily_mail.py
+++ b/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'
diff --git a/src/calibre/web/feeds/recipes/recipe_honoluluadvertiser.py b/src/calibre/web/feeds/recipes/recipe_honoluluadvertiser.py
index 99a5d674ae..bc7f8cc874 100644
--- a/src/calibre/web/feeds/recipes/recipe_honoluluadvertiser.py
+++ b/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 = {
- 'comments' : description
- ,'tags' : category
- ,'language' : language
- ,'publisher' : publisher
- }
+ html2lrf_options = [
+ '--comment' , description
+ , '--category' , category
+ , '--publisher' , publisher
+ ]
- keep_only_tags = [dict(name='td')]
+ html2epub_options = 'publisher="' + publisher + '"\ncomments="' + description + '"\ntags="' + category + '"'
- remove_tags = [dict(name=['object','link'])]
- remove_attributes = ['style']
+ keep_only_tags = [dict(name='div', attrs={'class':["hon_article_top","article-bodytext","hon_article_photo","storyphoto","article"]}),
+ 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')
- if st:
- st.name = 'div'
+ for item in soup.findAll(style=True):
+ del item['style']
+ 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')
- root, sep2, article_id = ubody.partition('/article/')
- return u'http://www.honoluluadvertiser.com/apps/pbcs.dll/article?AID=/' + article_id + '&template=printart'
+
+ # def print_version(self, url):
+ # ubody, sep, rest = url.rpartition('/-1/')
+ # root, sep2, article_id = ubody.partition('/article/')
+ # return u'http://www.honoluluadvertiser.com/apps/pbcs.dll/article?AID=/' + article_id + '&template=printart'
diff --git a/src/calibre/web/feeds/recipes/recipe_miami_herald.py b/src/calibre/web/feeds/recipes/recipe_miami_herald.py
index 8488a2a9b3..4500b02097 100644
--- a/src/calibre/web/feeds/recipes/recipe_miami_herald.py
+++ b/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 = [
- '--comment' , description
- , '--category' , category
- , '--publisher' , publisher
- ]
+ extra_css = '''
+ h1{font-family:Arial,Helvetica,sans-serif; font-size:large; color:#1A272F; }
+ .subheadline{font-family:Arial,Helvetica,sans-serif; font-size:30%; color: #666666;}
+ #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
+
+
diff --git a/src/calibre/web/feeds/recipes/recipe_moscow_times.py b/src/calibre/web/feeds/recipes/recipe_moscow_times.py
index 93dcb3d226..3105aba58e 100644
--- a/src/calibre/web/feeds/recipes/recipe_moscow_times.py
+++ b/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):
- return url + '&print=Y'
\ No newline at end of file
+ keep_only_tags = [
+ 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
diff --git a/src/calibre/web/feeds/recipes/recipe_msdnmag_en.py b/src/calibre/web/feeds/recipes/recipe_msdnmag_en.py
index 7fc5adb93a..77b8da17a8 100644
--- a/src/calibre/web/feeds/recipes/recipe_msdnmag_en.py
+++ b/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
- current_issue = 'http://msdn.microsoft.com/en-us/magazine/default.aspx'
- language = 'en'
+ 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'})
]
-
- 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
-
+ remove_tags_after = dict(name='div', attrs={'class':'navpage'})
def preprocess_html(self, soup):
for item in soup.findAll('div',attrs={'class':['FeatureSmallHead','ColumnTypeSubTitle']}):
diff --git a/src/calibre/web/feeds/recipes/recipe_newsweek.py b/src/calibre/web/feeds/recipes/recipe_newsweek.py
index f6c5e85a9e..c32c68d88a 100644
--- a/src/calibre/web/feeds/recipes/recipe_newsweek.py
+++ b/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 = '''
- h1{color:#383733;font-family:Arial,Helvetica,sans-serif;font-size:large;}
- .deck{font-family:Georgia,"Century Schoolbook","Times New Roman",Times,serif;color:#383733;font-size:small;}
- .articleInfo{color:#474537;font-family:Arial,Helvetica,sans-serif; font-size:xx-small;}
- .authorName{color:#B61900;font-family:Arial,Helvetica,sans-serif;font-size:medium;}
- .authorInfo{color:#0066CC;font-family:Arial,Helvetica,sans-serif;font-size:xx-small;}
- .articleUpdated{ font-size:xx-small; color:#73726C; font-family:Arial,Helvetica,sans-serif;}
- .issueDate{font-family :Arial,Helvetica,sans-serif;font-size:xx-small;font-style:italic;}
- .story{color:#333333; font-family:Georgia,"Century Schoolbook","Times New Roman",Times,serif;font-size:small;}
- .photoCredit{color:#999999;font-family:Arial,Helvetica,sans-serif;font-size:xx-small;}
- .photoCaption{color:#0A0A09;font-family:Arial,Helvetica,sans-serif;font-size:xx-small;font-weight:bold;}'''
-
+ extra_css = '''
+ h1{font-family:Arial,Helvetica,sans-serif; font-size:large; color:#383733;}
+ .deck{font-family:Georgia,sans-serif; color:#383733;}
+ .bylineDate{font-family:georgia ; color:#58544A; font-size:x-small;}
+ .authorInfo{font-family:arial,helvetica,sans-serif; color:#0066CC; font-size:x-small;}
+ .articleUpdated{font-family:arial,helvetica,sans-serif; color:#73726C; font-size:x-small;}
+ .issueDate{font-family:arial,helvetica,sans-serif; color:#73726C; font-size:x-small; font-style:italic;}
+ h5{font-family:arial,helvetica,sans-serif; color:#73726C; font-size:x-small;}
+ h6{font-family:arial,helvetica,sans-serif; color:#73726C; font-size:x-small;}
+ .story{font-family:georgia,sans-serif ; color:#363636;}
+ .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
+
diff --git a/src/calibre/web/feeds/recipes/recipe_ourdailybread.py b/src/calibre/web/feeds/recipes/recipe_ourdailybread.py
index f1241da408..6987ab2325 100644
--- a/src/calibre/web/feeds/recipes/recipe_ourdailybread.py
+++ b/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
diff --git a/src/calibre/web/feeds/recipes/recipe_sanjosemercurynews.py b/src/calibre/web/feeds/recipes/recipe_sanjosemercurynews.py
new file mode 100644
index 0000000000..6a78fcd9f0
--- /dev/null
+++ b/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')
+ ]
diff --git a/src/calibre/web/feeds/recipes/recipe_straitstimes.py b/src/calibre/web/feeds/recipes/recipe_straitstimes.py
index 9a87f03a6d..64e50e2f60 100644
--- a/src/calibre/web/feeds/recipes/recipe_straitstimes.py
+++ b/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 = [
- '--comment', description
- , '--category', category
- , '--publisher', publisher
- , '--ignore-tables'
- ]
+ remove_tags = [dict(name=['object','link','map'])]
- html2epub_options = 'publisher="' + publisher + '"\ncomments="' + description + '"\ntags="' + category + '"\nlinearize_tables=True'
-
- remove_tags = [
- dict(name=['object','link'])
- ,dict(name='table', attrs={'width':'980'})
- ,dict(name='td' , attrs={'class':'padlrt10'})
- ]
+ keep_only_tags = [dict(name='div', attrs={'class':['top_headline','story_text']})]
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')
-
diff --git a/src/calibre/web/feeds/recipes/recipe_thestar.py b/src/calibre/web/feeds/recipes/recipe_thestar.py
index 5e662441ef..695e50762a 100644
--- a/src/calibre/web/feeds/recipes/recipe_thestar.py
+++ b/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'})]
- remove_attributes= ['style']
+ keep_only_tags = [dict(name='div', attrs={'class':'ts-article'})]
+ 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
diff --git a/src/calibre/web/feeds/recipes/recipe_toronto_sun.py b/src/calibre/web/feeds/recipes/recipe_toronto_sun.py
new file mode 100644
index 0000000000..996b27c1bd
--- /dev/null
+++ b/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' )
+ ]
diff --git a/src/cherrypy/lib/httpauth.py b/src/cherrypy/lib/httpauth.py
index 083f4c5f9e..ea8448d339 100644
--- a/src/cherrypy/lib/httpauth.py
+++ b/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,
- this list of conditions and the following disclaimer in the documentation
+ * Redistributions in binary form must reproduce the above copyright notice,
+ 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
- may be used to endorse or promote products derived from this software
+ * Neither the name of Sylvain Hellegouarch nor the names of his contributors
+ 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
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+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
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
"""
@@ -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)
-
+