From 7f6b7e9bbe703c62a1f6ca9039264acdf942f2a0 Mon Sep 17 00:00:00 2001
From: Translators <>
Date: Mon, 12 Jul 2010 04:45:36 +0100
Subject: [PATCH] Launchpad automatic translations update.

---
 src/calibre/translations/es.po | 905 ++++++++++++++++--------------
 src/calibre/translations/fr.po | 881 +++++++++++++++--------------
 src/calibre/translations/it.po | 979 ++++++++++++++++++---------------
 src/calibre/translations/nl.po |  72 ++-
 src/calibre/translations/pl.po | 917 ++++++++++++++++--------------
 5 files changed, 2066 insertions(+), 1688 deletions(-)

diff --git a/src/calibre/translations/es.po b/src/calibre/translations/es.po
index 38cbe08cae..ee3fdea96a 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: 2010-07-09 22:00+0000\n"
-"PO-Revision-Date: 2010-07-09 20:32+0000\n"
-"Last-Translator: Kovid Goyal <Unknown>\n"
+"POT-Creation-Date: 2010-07-10 16:12+0000\n"
+"PO-Revision-Date: 2010-07-11 21:55+0000\n"
+"Last-Translator: DiegoJ <diegojromerolopez@gmail.com>\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: 2010-07-10 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-07-12 03:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:465
@@ -47,7 +47,7 @@ msgstr "No hace absolutamente nada"
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:71
 #: /home/kovid/work/calibre/src/calibre/devices/prs500/books.py:267
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:492
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:396
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:398
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:97
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:100
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/metadata.py:56
@@ -131,10 +131,10 @@ msgstr "No hace absolutamente nada"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:110
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:135
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:898
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:907
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1190
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1193
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:899
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:908
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1191
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1194
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:120
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:155
@@ -708,30 +708,30 @@ msgstr "Comunicarse con el Kobo Reader"
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:64
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:67
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:70
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:130
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:137
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:160
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:132
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:139
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:162
 msgid "Getting list of books on device..."
 msgstr "Obteniendo la lista de libros en el dispositivo ..."
 
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:219
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:263
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:244
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:262
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:246
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:264
 msgid "Removing books from device..."
 msgstr "Eliminando libros del dispositivo..."
 
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:267
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:274
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:269
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:274
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:271
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:276
 msgid "Removing books from device metadata listing..."
 msgstr "Eliminando libros del listado de metatados del dispositivo..."
 
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:279
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:313
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:208
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:238
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:210
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:240
 msgid "Adding books to device metadata listing..."
 msgstr "Añadiendo libros al listado de metatados del dispositivo..."
 
@@ -749,7 +749,7 @@ msgstr "Comunicarse con el Sweex MM300"
 
 #: /home/kovid/work/calibre/src/calibre/devices/misc.py:75
 msgid "Communicate with the Pandigital Novel"
-msgstr ""
+msgstr "Comunicarse con el Pandigital Novel"
 
 #: /home/kovid/work/calibre/src/calibre/devices/nokia/driver.py:17
 msgid "Communicate with the Nokia 770 internet tablet."
@@ -902,12 +902,12 @@ msgstr "Comunicar con un lector de libros electrónicos."
 msgid "Get device information..."
 msgstr "Obtener información del dispositivo..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:188
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:192
 msgid "Transferring books to device..."
 msgstr "Transfiriendo libros al dispositivo..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:305
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:307
 msgid "Sending metadata to device..."
 msgstr "Enviando metadatos al dispositivo..."
 
@@ -1681,7 +1681,7 @@ msgstr "Creando"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/__init__.py:18
 msgid "ePub Fixer"
-msgstr ""
+msgstr "Corrector de ePub"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/epubcheck.py:18
 msgid "Workaround epubcheck bugs"
@@ -1690,10 +1690,15 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/epubcheck.py:22
 msgid ""
 "Workarounds for bugs in the latest release of epubcheck. epubcheck reports "
-"many things as errors that are not actually errors. %prog will try to detect "
-"these and replace them with constructs that epubcheck likes. This may cause "
-"significant changes to your epub, complain to the epubcheck project."
+"many things as errors that are not actually errors. epub-fix will try to "
+"detect these and replace them with constructs that epubcheck likes. This may "
+"cause significant changes to your epub, complain to the epubcheck project."
 msgstr ""
+"Solución temporal para los errores de la última versión de epubcheck. "
+"epubcheck informa de muchas errores que realmente no lo son. epub-fix "
+"intentará detectar éstos, y los sustituirá por construcciones que acepted "
+"epubcheck. Esto puede causar cambios significativos a su epub. Dirija sus "
+"quejas al proyecto epubcheck."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/main.py:19
 msgid ""
@@ -1705,19 +1710,27 @@ msgid ""
 "By default, no fixing is done and messages are printed out for each error "
 "detected. Use the options to control which errors are automatically fixed."
 msgstr ""
+"%prog [options] file.epub\n"
+"\n"
+"Corrige problemas comunes en archivos EPUB que puedan hacer que se rechacen "
+"por servicios de publicación mal diseñados.\n"
+"\n"
+"Por defecto, no se realiza ninguna corrección y se imprimen mensajes para "
+"cada error detectado. Use las opciones para controlar qué errores se han de "
+"corregir automáticamente."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/main.py:50
 msgid "You must specify an epub file"
-msgstr ""
+msgstr "Ha de especificar un archivo epub"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:17
 msgid "Fix unmanifested files"
-msgstr ""
+msgstr "Corregir archivos sin manifiesto"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:21
 msgid ""
-"Fix unmanifested files. %prog can either add them to the manifest or delete "
-"them as specified by the delete unmanifested option."
+"Fix unmanifested files. epub-fix can either add them to the manifest or "
+"delete them as specified by the delete unmanifested option."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:32
@@ -3313,14 +3326,14 @@ msgid "Main memory"
 msgstr "Memoria principal"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions.py:519
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:444
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:454
 msgid "Storage Card A"
 msgstr "Tarjeta de almacenamiento A"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions.py:520
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:446
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:455
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:447
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:456
 msgid "Storage Card B"
 msgstr "Tarjeta de almacenamiento B"
 
@@ -3386,7 +3399,7 @@ msgid "Failed to download metadata:"
 msgstr "No se pudieron descargar metadatos:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions.py:659
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:637
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:638
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:523
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:951
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
@@ -3570,7 +3583,7 @@ 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:263
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:840
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "No books"
 msgstr "Sin libros"
 
@@ -3740,12 +3753,12 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:248
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:253
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:259
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:265
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:149
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:186
@@ -3817,7 +3830,7 @@ msgstr "Clic para abrir"
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:467
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:274
 msgid "None"
 msgstr "Ninguno"
 
@@ -4711,12 +4724,12 @@ msgid "Footer regular expression:"
 msgstr "Expresión regular para pies de página:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:56
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:76
 msgid "Invalid regular expression"
 msgstr "Expresión regular no válida"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:77
 msgid "Invalid regular expression: %s"
 msgstr "Expresión regular no valida: %s"
 
@@ -5001,124 +5014,124 @@ msgstr "etiquetas a añadir"
 msgid "tags to remove"
 msgstr "etiquetas a eliminar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:49
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:135
 msgid "No details available."
 msgstr "No hay detalles disponibles."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:155
 msgid "Device no longer connected."
 msgstr "El dispositivo ya no esta conectado."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:270
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:271
 msgid "Get device information"
 msgstr "Obtener información del dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:282
 msgid "Get list of books on device"
 msgstr "Obtener lista de libros en el dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:292
 msgid "Get annotations from device"
 msgstr "Obtener anotaciones del dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:301
 msgid "Send metadata to device"
 msgstr "Enviar metadatos al dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:305
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:306
 msgid "Send collections to device"
 msgstr "Enviar colecciones al dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:329
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:330
 msgid "Upload %d books to device"
 msgstr "Pasar %d libros al dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:345
 msgid "Delete books from device"
 msgstr "Borrar libros del dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:362
 msgid "Download books from device"
 msgstr "Obtener libros del dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:372
 msgid "View book on device"
 msgstr "Ver libro en el dispositvo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:408
 msgid "Set default send to device action"
 msgstr "Asignar acción de enviar al dispositivo por defecto"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:413
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:420
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:422
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:423
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:425
 msgid "Email to"
 msgstr "Enviar por correo electrónico a"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:425
 msgid " and delete from library"
 msgstr " y elimínalo desde la librería"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:434
 msgid "Send to main memory"
 msgstr "Enviar a la memoria principal"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:436
 msgid "Send to storage card A"
 msgstr "Enviar a la tarjeta de memoria A"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:437
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:438
 msgid "Send to storage card B"
 msgstr "Enviar a la tarjeta de memoria B"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:442
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:452
 msgid "Main Memory"
 msgstr "Memoria principal"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:469
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:470
 msgid "Send and delete from library"
 msgstr "Enviar y eliminar de la biblioteca"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:470
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:471
 msgid "Send specific format"
 msgstr "Enviar formato específico"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:509
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:510
 msgid "Connect to folder"
 msgstr "Conectar a carpeta"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:516
 msgid "Connect to iTunes"
 msgstr "Conectar a iTunes"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:520
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:521
 msgid "Eject device"
 msgstr "Desconectar dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:529
 msgid "Fetch annotations (experimental)"
 msgstr "Obtener anotaciones (experimental)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:638
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:639
 msgid "Error communicating with device"
 msgstr "Error en la comunicación con el dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:659
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:660
 msgid "Select folder to open as device"
 msgstr "Seleccionar carpeta para abrir como un dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:704
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:705
 msgid "Failed"
 msgstr "Falló"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:710
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:711
 msgid "Error talking to device"
 msgstr "Error de comunicación con el dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:711
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:712
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
@@ -5126,128 +5139,128 @@ 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/device.py:753
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:754
 msgid "Device: "
 msgstr "Dispositivo: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:755
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:756
 msgid " detected."
 msgstr " detectado."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:842
 msgid "selected to send"
 msgstr "elegido para enviar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:846
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:847
 msgid "Choose format to send to device"
 msgstr "Elige el formato para enviar al dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:855
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:856
 msgid "No device"
 msgstr "Sin dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:856
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:857
 msgid "Cannot send: No device is connected"
 msgstr "No se pudo enviar: no hay ningún dispositivo conectado"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:859
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:863
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:860
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
 msgid "No card"
 msgstr "Sin tarjeta"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:860
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
 msgid "Cannot send: Device has no storage card"
 msgstr "No se pudo enviar: el dispositivo no tiene tarjeta de memoria"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:905
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:906
 msgid "E-book:"
 msgstr "Libro electrónico:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:908
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:909
 msgid "Attached, you will find the e-book"
 msgstr "El libro electrónico está adjunto"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:909
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:910
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:181
 msgid "by"
 msgstr "por"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:910
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:911
 msgid "in the %s format."
 msgstr "en el formato %s."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:923
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:924
 msgid "Sending email to"
 msgstr "Enviando correo electrónico a"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:953
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:961
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1053
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1115
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1234
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1242
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:954
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:962
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1054
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1235
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1243
 msgid "No suitable formats"
 msgstr "No hay formatos adecuados"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:954
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:955
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 "¿Convertir automáticamente los siguientes libros antes de enviar por correo "
 "electrónico?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:962
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:963
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 "No se pudieron enviar por correo electrónico los siguientes libros porque no "
 "se encontraron formatos compatibles:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:980
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:981
 msgid "Failed to email books"
 msgstr "Fallo al enviar libros por correo electrónico"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:981
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:982
 msgid "Failed to email the following books:"
 msgstr "Fallo al enviar por correo electrónico los siguientes libros:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:985
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:986
 msgid "Sent by email:"
 msgstr "Enviado por correo electrónico:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1012
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1013
 msgid "News:"
 msgstr "Noticias:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1014
 msgid "Attached is the"
 msgstr "Adjunto está el"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1024
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1025
 msgid "Sent news to"
 msgstr "Enviar noticias a"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1054
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1235
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1055
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1117
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1236
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 "¿Convertir automáticamente los siguientes libros antes de pasarlos al "
 "dispositivo?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1084
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1085
 msgid "Sending catalogs to device."
 msgstr "Enviando catálogos al dispositivo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1148
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1149
 msgid "Sending news to device."
 msgstr "Enviando noticias al dispositivo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1202
 msgid "Sending books to device."
 msgstr "Enviando libros al dispositivo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1243
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1244
 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."
@@ -5256,11 +5269,11 @@ msgstr ""
 "encontraron formatos adecuados. Convierta el(los) libro(s) a un formato "
 "soportado por su dispositivo antes de volver a intentarlo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1304
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1305
 msgid "No space on device"
 msgstr "No hay espacio en el dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1305
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1306
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
@@ -5551,7 +5564,7 @@ msgid "Access log:"
 msgstr "Registro de accesos:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:794
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:332
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:331
 msgid "Failed to start content server"
 msgstr "Fallo al iniciar el servidor de contenidos"
 
@@ -5621,11 +5634,11 @@ msgstr ""
 "eliminado. Debería comprobarlos manualmente. Esto puede ocurrir si manipula "
 "los ficheros de la carpeta de la biblioteca directamente."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:133
 msgid "TabWidget"
 msgstr "TabWidget"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:134
 msgid ""
 "Here you can control how calibre will read metadata from the files you add "
 "to it. calibre can either read metadata from the contents of the file, or "
@@ -5635,11 +5648,11 @@ msgstr ""
 "se añaden. calibre puede leer los metadatos del contenido del fichero o de "
 "su nombre."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:135
 msgid "Read metadata only from &file name"
 msgstr "Leer metadatos sólo del nombre de &fichero"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:136
 msgid ""
 "Swap the firstname and lastname of the author. This affects only metadata "
 "read from file names."
@@ -5647,11 +5660,11 @@ msgstr ""
 "Intercambiar el nombre y el apellido del autor. Esto sólo afecta a los "
 "metadatos extraídos de nombres de ficheros."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:137
 msgid "&Swap author firstname and lastname"
 msgstr "&Intercambiar nombre y apellido del autor"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:138
 msgid ""
 "If an existing book with a similar title and author is found that does not "
 "have the format being added, the format is added\n"
@@ -5671,7 +5684,7 @@ msgstr ""
 "\"a\", \"an\"), puntuación, mayúsculas o minúsculas, etc. La comparación de "
 "autores es exacta."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:142
 msgid ""
 "If books with similar titles and authors found, &merge the new files "
 "automatically"
@@ -5679,15 +5692,15 @@ msgstr ""
 "Si se encuentran libros con el mismo título y autor, &unir automáticamente "
 "los nuevos ficheros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:143
 msgid "&Configure metadata from file name"
 msgstr "&Configurar los metadatos a partir del nombre de fichero"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:144
 msgid "&Adding books"
 msgstr "&Añadir libros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:145
 msgid ""
 "Here you can control how calibre will save your books when you click the "
 "Save to Disk button:"
@@ -5695,65 +5708,70 @@ msgstr ""
 "Aquí puede controlar cómo guardará calibre los libros cuando se pulse el "
 "botón Guardar a disco:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:146
 msgid "Save &cover separately"
 msgstr "Guardar la &portada por separado"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:147
 msgid "Update &metadata in saved copies"
 msgstr "Actualizar los &metadatos de las copias guardadas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:148
 msgid "Save metadata in &OPF file"
 msgstr "Guardar los metadatos en un fichero &OPF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:149
 msgid "Convert non-English characters to &English equivalents"
 msgstr "Convertir los caracteres no ASCII a &equivalentes ASCII"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:150
 msgid "Format &dates as:"
 msgstr "Escribir fec&has con formato:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:151
 msgid "File &formats to save:"
 msgstr "Guardar ficheros en &formatos:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:152
 msgid "Replace space with &underscores"
 msgstr "Sustituir espacios por guiones ba&jos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:153
 msgid "Change paths to &lowercase"
 msgstr "Cambiar rutas a mi&núsculas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:154
 msgid "&Saving books"
 msgstr "&Guardar libros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:135
-msgid "Preserve device collections."
-msgstr "Mantiene las colecciones del dispositivo"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:155
+msgid "Metadata &management:"
+msgstr "Gestión de &metadatos:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:156
+msgid "Manual management"
+msgstr "Gestión manual"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:157
+msgid "Only on send"
+msgstr "Sólo al enviar"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:158
+msgid "Automatic management"
+msgstr "Gestión automática"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:159
 msgid ""
-"If checked, collections will not be deleted even if a book with changed "
-"metadata is resent and the collection is not in the book's metadata. In "
-"addition, editing collections in the device view will be enabled. If "
-"unchecked, collections will be always reflect only the metadata in the "
-"calibre library."
+"<li><b>Manual Management</b>: Calibre updates the metadata and adds "
+"collections only when a book is sent. With this option, calibre will never "
+"remove a collection.</li>\n"
+"<li><b>Only on send</b>: Calibre updates metadata and adds/removes "
+"collections for a book only when it is sent to the device. </li>\n"
+"<li><b>Automatic management</b>: Calibre automatically keeps metadata on the "
+"device in sync with the calibre library, on every connect</li></ul>"
 msgstr ""
-"Si se activa, las colecciones no se borrarán incluso si un libro con los "
-"metadatos modificados se vuelve a enviar y la colección no está en los "
-"metadatos del libro. Además, se hace posible editar las colecciones en la "
-"vista del dispositivo. Si se desactiva, las colecciones corresponderán "
-"siempre a los metadatos en la biblioteca de calibre."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:137
-msgid "  "
-msgstr "  "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:162
 msgid ""
 "Here you can control how calibre will save your books when you click the "
 "Send to Device button. This setting can be overriden for individual devices "
@@ -5764,13 +5782,14 @@ msgstr ""
 "los dispositivos concretos si se personaliza los complementos de interfaz de "
 "dispositivo en Preferencias -> Complementos."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:163
 msgid "Sending to &device"
 msgstr "Enviar a &dispositivo"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:168
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:174
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:201
 msgid "Preferences"
 msgstr "Preferencias"
@@ -5948,7 +5967,7 @@ msgstr "Desactivar &animaciones"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
 msgid "Show &donate button (restart)"
-msgstr ""
+msgstr "Mostrar botón de &donar (reinicia)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
 msgid "Add an email address to which to send books"
@@ -6392,6 +6411,8 @@ msgid ""
 "All checked books will be <b>permanently deleted</b> from your device. "
 "Please verify the list."
 msgstr ""
+"Todos los libros seleccionados serán <b>eliminados permanentemente</b> de su "
+"dispositivo. Por favor, comprueba la lista."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75
 msgid "Location"
@@ -7259,7 +7280,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:20
 msgid "%s (was %s)"
-msgstr ""
+msgstr "%s (era %s)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:501
@@ -7588,11 +7609,11 @@ msgstr "Expresión regular (?P&lt;title&gt;)"
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:84
-#: /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:98
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:100
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:99
 msgid "No match"
 msgstr "No hay coincidencias"
 
@@ -7691,7 +7712,8 @@ msgid "Add Empty book. (Book entry with no formats)"
 msgstr "Añadir libro en blanco. (Entrada de libro sin ningún formato)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:103
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:276
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:409
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:160
 msgid "Save to disk"
 msgstr "Guardar en el disco"
 
@@ -7700,17 +7722,18 @@ msgid "Save to disk in a single directory"
 msgstr "Guardar en el disco, en un único directorio"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:107
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:394
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:393
 msgid "Save only %s format to disk"
 msgstr "Guardar solamente el formato %s en disco"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:111
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:397
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:396
 msgid "Save only %s format to disk in a single directory"
 msgstr "Guardar sólo el formato %s en un único directorio"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:120
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:166
 msgid "View"
 msgstr "Mostrar"
 
@@ -7754,46 +7777,46 @@ msgstr "Crear catálogo de los libros en la biblioteca de calibre"
 msgid "Run welcome wizard"
 msgstr "Ejecutar el asistente de bienvenida"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:205
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:191
 msgid "Similar books..."
 msgstr "Libros similares..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:223
 msgid "Add books to library"
 msgstr "Añadir libros a la biblioteca"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:232
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:239
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:246
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:253
 msgid "Manage collections"
 msgstr "Administrar colecciones"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:333
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:319
 msgid "Cover Browser"
 msgstr "Explorador de portadas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:337
 msgid "Tag Browser"
 msgstr "Navegador de etiquetas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:372
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:358
 msgid "version"
-msgstr ""
+msgstr "versión"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:359
 msgid "created by Kovid Goyal"
-msgstr ""
+msgstr "creado por Kovid Goyal"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:377
 msgid "Connected "
 msgstr "Conectado "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:400
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:386
 msgid "Update found"
-msgstr ""
+msgstr "Actualización encontrada"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:445
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:454
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:430
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:439
 msgid "Book Details"
 msgstr "Detalles del Libro"
 
@@ -7856,6 +7879,227 @@ msgstr "Pulse para ver las tareas activas."
 msgid " - Jobs"
 msgstr " - tareas"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:64
+msgid ""
+"Library\n"
+"%d books"
+msgstr ""
+"Biblioteca\n"
+"%d libros"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:65
+msgid ""
+"Reader\n"
+"%s"
+msgstr ""
+"Lector\n"
+"%s"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:66
+msgid ""
+"Card A\n"
+"%s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:67
+msgid ""
+"Card B\n"
+"%s"
+msgstr ""
+"Tarjeta B\n"
+"%s"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:71
+msgid "Click to see the books available on your computer"
+msgstr "Pulsar para ver los libros disponibles en el equipo"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:74
+msgid "Click to see the books in the main memory of your reader"
+msgstr "Pulsar para ver los libros en la memoria principal del lector"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:75
+msgid "Click to see the books on storage card A in your reader"
+msgstr "Pulsar para ver los libros en la tarjeta de memoria A del lector"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:76
+msgid "Click to see the books on storage card B in your reader"
+msgstr "Pulsar para ver los libros en la tarjeta de memoria B del lector"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:84
+msgid "Books located at"
+msgstr "Libros ubicados en"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:100
+msgid "free"
+msgstr "libre"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:134
+msgid ""
+"Books display will be restricted to those matching the selected saved search"
+msgstr "Sólo se mostrarán los libros que coincidan con la búsqueda guardada"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:136
+msgid "Advanced search"
+msgstr "Búsqueda avanzada"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:141
+msgid ""
+"<p>Search the list of books by title, author, publisher, tags, comments, "
+"etc.<br><br>Words separated by spaces are ANDed"
+msgstr ""
+"Buscar en la lista de libros por título, autor, editorial, etiquetas, "
+"comentarios, etc.<br><br>Se buscan libros que contengan todas las palabras "
+"separadas por espacios"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:316
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:142
+msgid "Reset Quick Search"
+msgstr "Reiniciar la búsqueda rápida"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:328
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:144
+msgid "Copy current search text (instead of search name)"
+msgstr "Copiar el texto de búsqueda actual (en vez del nombre de búsqueda)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:146
+msgid "Save current search under the name shown in the box"
+msgstr "Guardar la búsqueda actual con el nombre mostrado en el recuadro"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:148
+msgid "Delete current saved search"
+msgstr "Borrar la búsqueda guardada actual"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:150
+msgid "Add books"
+msgstr "Añadir libros"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:151
+msgid "A"
+msgstr "A"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:153
+msgid "Remove books"
+msgstr "Eliminar libros"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:154
+msgid "Del"
+msgstr "Supr"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:406
+msgid "Edit meta info"
+msgstr "Editar metainformación"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:406
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:156
+msgid "E"
+msgstr "E"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:157
+msgid "Merge book records"
+msgstr "Unir registros de libros"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:158
+msgid "M"
+msgstr "M"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:159
+msgid "Send to device"
+msgstr "Enviar al dispositivo"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:409
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:161
+msgid "S"
+msgstr "S"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:162
+msgid "Fetch news"
+msgstr "Descargar noticias (RSS)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:163
+msgid "F"
+msgstr "F"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:164
+msgid "Convert books"
+msgstr "Convertir libros"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:165
+msgid "C"
+msgstr "C"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:167
+msgid "V"
+msgstr "V"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:168
+msgid "Open containing folder"
+msgstr "Abrir la carpeta que lo contiene"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:169
+msgid "Show book details"
+msgstr "Mostrar detalles del libro"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:170
+msgid "Books by same author"
+msgstr "Libros del mismo autor"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:171
+msgid "Books in this series"
+msgstr "Libros de la misma serie"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:172
+msgid "Books by this publisher"
+msgstr "Libros de la misma editorial"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:423
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:173
+msgid "Books with the same tags"
+msgstr "Libros con las mismas etiquetas"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:176
+msgid "Ctrl+P"
+msgstr "Ctrl+P"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:177
+msgid "Help"
+msgstr "Ayuda"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:178
+msgid "Browse the calibre User Manual"
+msgstr "Explorar el manual de usuario de calibre"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:179
+msgid "F1"
+msgstr "F1"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:284
 msgid "N"
 msgstr "N"
@@ -8157,166 +8401,34 @@ msgstr "inténtelo después de reiniciar el equipo."
 msgid "try deleting the file"
 msgstr "pruebe a borrar el fichero"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:131
 msgid "calibre"
 msgstr "calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:249
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:133
 msgid "&Restrict to:"
 msgstr "Restringir a:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:250
-msgid ""
-"Books display will be restricted to those matching the selected saved search"
-msgstr "Sólo se mostrarán los libros que coincidan con la búsqueda guardada"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:135
 msgid "set in ui.py"
 msgstr "ajustado en ui.py"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:252
-msgid "Advanced search"
-msgstr "Búsqueda avanzada"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:138
 msgid "Alt+S"
 msgstr "Alt+S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:255
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:139
 msgid "&Search:"
 msgstr "&Buscar:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:256
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:257
-msgid ""
-"<p>Search the list of books by title, author, publisher, tags, comments, "
-"etc.<br><br>Words separated by spaces are ANDed"
-msgstr ""
-"Buscar en la lista de libros por título, autor, editorial, etiquetas, "
-"comentarios, etc.<br><br>Se buscan libros que contengan todas las palabras "
-"separadas por espacios"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:258
-msgid "Reset Quick Search"
-msgstr "Reiniciar la búsqueda rápida"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:260
-msgid "Copy current search text (instead of search name)"
-msgstr "Copiar el texto de búsqueda actual (en vez del nombre de búsqueda)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:262
-msgid "Save current search under the name shown in the box"
-msgstr "Guardar la búsqueda actual con el nombre mostrado en el recuadro"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:264
-msgid "Delete current saved search"
-msgstr "Borrar la búsqueda guardada actual"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:266
-msgid "Add books"
-msgstr "Añadir libros"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:267
-msgid "A"
-msgstr "A"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:268
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:269
-msgid "Remove books"
-msgstr "Eliminar libros"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:270
-msgid "Del"
-msgstr "Supr"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:271
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:155
 msgid "Edit meta information"
 msgstr "Editar metadatos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:272
-msgid "E"
-msgstr "E"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:273
-msgid "Merge book records"
-msgstr "Unir registros de libros"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:274
-msgid "M"
-msgstr "M"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:275
-msgid "Send to device"
-msgstr "Enviar al dispositivo"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
-msgid "S"
-msgstr "S"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
-msgid "Fetch news"
-msgstr "Descargar noticias (RSS)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
-msgid "F"
-msgstr "F"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
-msgid "Convert E-books"
-msgstr "Convertir libros electrónicos"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
-msgid "C"
-msgstr "C"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
-msgid "V"
-msgstr "V"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
-msgid "Open containing folder"
-msgstr "Abrir la carpeta que lo contiene"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
-msgid "Show book details"
-msgstr "Mostrar detalles del libro"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
-msgid "Books by same author"
-msgstr "Libros del mismo autor"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
-msgid "Books in this series"
-msgstr "Libros de la misma serie"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
-msgid "Books by this publisher"
-msgstr "Libros de la misma editorial"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
-msgid "Books with the same tags"
-msgstr "Libros con las mismas etiquetas"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:175
 msgid "Configure calibre"
 msgstr "Configurar calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
-msgid "Ctrl+P"
-msgstr "Ctrl+P"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
-msgid "Help"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
-msgid "Browse the calibre User Manual"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
-msgid "F1"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:20
 msgid ""
 "Redirect console output to a dialog window (both stdout and stderr). Useful "
@@ -8348,6 +8460,7 @@ msgstr "No se ha encontrado el libro"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:553
 msgid "Search"
 msgstr "Buscar"
 
@@ -8369,15 +8482,19 @@ msgid "Choose saved search or enter name for new saved search"
 msgstr ""
 "Elija una búsqueda guardada o asigne un nombre para guardar la nueva búsqueda"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:10
+msgid "Restrict to"
+msgstr "Restringir a"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:48
 msgid "({0} of {1})"
 msgstr "({0} de {1})"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:54
 msgid "(all books)"
 msgstr "(todos los libros)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:56
 msgid "({0} of all)"
 msgstr "({0} de todos)"
 
@@ -8502,7 +8619,7 @@ msgstr "Ordenar por calificación promedio"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:772
 msgid "Set the sort order for entries in the Tag Browser"
-msgstr ""
+msgstr "Establece el orden de las entradas en el navegador de etiquetas"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:778
 msgid "Match all"
@@ -8523,7 +8640,7 @@ msgstr "Administrar categorías de &usuario"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:790
 msgid "Add your own categories to the Tag Browser"
-msgstr ""
+msgstr "Añada sus propias categorías al navegador de etiquetas"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:182
@@ -8588,34 +8705,34 @@ msgstr "&Reiniciar"
 msgid "Calibre Quick Start Guide"
 msgstr "Guía de inicio rápido de calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:380
 msgid "Cannot configure"
 msgstr "No se puede configurar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:376
 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/ui.py:382
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:381
 msgid "Cannot configure before calibre is restarted."
 msgstr "No se puede configurar antes de reiniciar calibre."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:424
 msgid "No detailed info available"
 msgstr "No hay información detallada disponible"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:425
 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/ui.py:478
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:506
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:477
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:505
 msgid "Conversion Error"
 msgstr "Error de conversión"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:479
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:478
 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."
@@ -8624,26 +8741,29 @@ msgstr ""
 "href=\"%s\">DRM</a>. Debe eliminar primero el DRM con herramientas de "
 "terceros."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:492
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:491
 msgid "Recipe Disabled"
 msgstr "Receta deshabilitada"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:507
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:506
 msgid "<b>Failed</b>"
 msgstr "<b>Fallo</b>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:547
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:546
 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. "
 "Your donation helps keep calibre development going."
 msgstr ""
+"es el resultado de los esfuerzos de muchos voluntarios por todo el mundo. Si "
+"lo encuentra útil, considere donar para apoyar su desarrollo. Su donación es "
+"lo que hace que el desarrollo de calibre continúe."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:573
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:572
 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/ui.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:575
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
@@ -8654,11 +8774,11 @@ msgstr ""
 "de datos en el dispositivo.<br>\n"
 "                      ¿Está seguro de que desea salir?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:579
 msgid "WARNING: Active jobs"
 msgstr "AVISO: Tareas activas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:633
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:632
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -9154,91 +9274,43 @@ msgstr "Mayús+F3"
 msgid "Print eBook"
 msgstr "Imprimir libro electrónico"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
 msgid "Copy Image"
 msgstr "Copiar imagen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:240
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:239
 msgid "Paste Image"
 msgstr "Pegar imagen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:270
-msgid ""
-"Library\n"
-"%d books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:271
-msgid ""
-"Reader\n"
-"%s"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:272
-msgid ""
-"Card A\n"
-"%s"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:273
-msgid ""
-"Card B\n"
-"%s"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:277
-msgid "Click to see the books available on your computer"
-msgstr "Pulsar para ver los libros disponibles en el equipo"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:280
-msgid "Click to see the books in the main memory of your reader"
-msgstr "Pulsar para ver los libros en la memoria principal del lector"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:281
-msgid "Click to see the books on storage card A in your reader"
-msgstr "Pulsar para ver los libros en la tarjeta de memoria A del lector"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:282
-msgid "Click to see the books on storage card B in your reader"
-msgstr "Pulsar para ver los libros en la tarjeta de memoria B del lector"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:290
-msgid "Books located at"
-msgstr "Libros ubicados en"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:306
-msgid "free"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:364
 msgid "Change Case"
 msgstr "Cambiar mayúsculas/minúsculas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:558
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:365
 msgid "Upper Case"
 msgstr "Mayúsculas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:559
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:366
 msgid "Lower Case"
 msgstr "Minúsculas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:367
 msgid "Swap Case"
 msgstr "Invertir mayúsculas/minúsculas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:561
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:368
 msgid "Title Case"
 msgstr "Formato de título (todas las iniciales en mayúscula)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:983
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:837
 msgid "Drag to resize"
 msgstr "Arrastre para ajustar el tamaño"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1015
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:869
 msgid "Show"
 msgstr "Mostrar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1022
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:876
 msgid "Hide"
 msgstr "Ocultar"
 
@@ -10617,10 +10689,8 @@ msgid "User-created tag browser categories"
 msgstr "Categorías del explorador de etiquetas creadas por el usuario"
 
 #: /home/kovid/work/calibre/src/calibre/utils/config.py:702
-msgid "Preserve all collections even if not in library metadata."
-msgstr ""
-"Mantener todas las colecciones aunque no estén en los metadatos de la "
-"biblioteca."
+msgid "How and when calibre updates metadata on the device."
+msgstr "Cómo y cuándo actualiza calibre los metadatos del dispositivo."
 
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:43
 msgid "Waiting..."
@@ -12986,6 +13056,9 @@ msgstr "No descargar estilos CSS."
 #~ "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">nuevas "
 #~ "características</a>. ¿Visitar la página de descarga?"
 
+#~ msgid "Convert E-books"
+#~ msgstr "Convertir libros electrónicos"
+
 #~ msgid "Click to turn off Cover Browsing"
 #~ msgstr "Pulse para desactivar la exploración de portadas"
 
@@ -13354,3 +13427,27 @@ msgstr "No descargar estilos CSS."
 
 #~ msgid "The name %s is already used."
 #~ msgstr "El nombre %s ya está en uso."
+
+#~ msgid "  "
+#~ msgstr "  "
+
+#~ msgid "Preserve device collections."
+#~ msgstr "Mantiene las colecciones del dispositivo"
+
+#~ msgid ""
+#~ "If checked, collections will not be deleted even if a book with changed "
+#~ "metadata is resent and the collection is not in the book's metadata. In "
+#~ "addition, editing collections in the device view will be enabled. If "
+#~ "unchecked, collections will be always reflect only the metadata in the "
+#~ "calibre library."
+#~ msgstr ""
+#~ "Si se activa, las colecciones no se borrarán incluso si un libro con los "
+#~ "metadatos modificados se vuelve a enviar y la colección no está en los "
+#~ "metadatos del libro. Además, se hace posible editar las colecciones en la "
+#~ "vista del dispositivo. Si se desactiva, las colecciones corresponderán "
+#~ "siempre a los metadatos en la biblioteca de calibre."
+
+#~ msgid "Preserve all collections even if not in library metadata."
+#~ msgstr ""
+#~ "Mantener todas las colecciones aunque no estén en los metadatos de la "
+#~ "biblioteca."
diff --git a/src/calibre/translations/fr.po b/src/calibre/translations/fr.po
index d7ed4a50af..3df8e3f9a0 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: 2010-07-09 22:00+0000\n"
-"PO-Revision-Date: 2010-07-09 20:36+0000\n"
-"Last-Translator: Kovid Goyal <Unknown>\n"
+"POT-Creation-Date: 2010-07-10 16:12+0000\n"
+"PO-Revision-Date: 2010-07-11 18:00+0000\n"
+"Last-Translator: mcstrother <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: 2010-07-10 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-07-12 03:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Bookmarks: 1177,-1,-1,-1,-1,-1,-1,-1,-1,-1\n"
 "Generated-By: pygettext.py 1.5\n"
@@ -29,7 +29,7 @@ msgstr "Ne fait strictement rien"
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:71
 #: /home/kovid/work/calibre/src/calibre/devices/prs500/books.py:267
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:492
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:396
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:398
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:97
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:100
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/metadata.py:56
@@ -113,10 +113,10 @@ msgstr "Ne fait strictement rien"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:110
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:135
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:898
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:907
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1190
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1193
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:899
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:908
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1191
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1194
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:120
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:155
@@ -702,30 +702,30 @@ msgstr "Communiquer avec le lecteur Kobo"
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:64
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:67
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:70
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:130
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:137
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:160
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:132
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:139
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:162
 msgid "Getting list of books on device..."
 msgstr "Lit la liste des livres de l'appareil..."
 
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:219
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:263
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:244
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:262
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:246
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:264
 msgid "Removing books from device..."
 msgstr "Supprime les livres de l'appareil..."
 
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:267
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:274
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:269
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:274
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:271
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:276
 msgid "Removing books from device metadata listing..."
 msgstr "Supprime les livres de la liste des métadonnées de l'appareil..."
 
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:279
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:313
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:208
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:238
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:210
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:240
 msgid "Adding books to device metadata listing..."
 msgstr "Ajoute les livres à liste des métadonnées de l'appareil..."
 
@@ -897,12 +897,12 @@ msgstr "Communiquer avec un lecteur d'ebook."
 msgid "Get device information..."
 msgstr "Lit les informations de l'appareil..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:188
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:192
 msgid "Transferring books to device..."
 msgstr "Transfère les livres vers l'appareil..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:305
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:307
 msgid "Sending metadata to device..."
 msgstr "Envoie les métadonnées vers l'appareil..."
 
@@ -1701,9 +1701,9 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/epubcheck.py:22
 msgid ""
 "Workarounds for bugs in the latest release of epubcheck. epubcheck reports "
-"many things as errors that are not actually errors. %prog will try to detect "
-"these and replace them with constructs that epubcheck likes. This may cause "
-"significant changes to your epub, complain to the epubcheck project."
+"many things as errors that are not actually errors. epub-fix will try to "
+"detect these and replace them with constructs that epubcheck likes. This may "
+"cause significant changes to your epub, complain to the epubcheck project."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/main.py:19
@@ -1719,7 +1719,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/main.py:50
 msgid "You must specify an epub file"
-msgstr ""
+msgstr "Vous devez préciser un fichier epub"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:17
 msgid "Fix unmanifested files"
@@ -1727,8 +1727,8 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:21
 msgid ""
-"Fix unmanifested files. %prog can either add them to the manifest or delete "
-"them as specified by the delete unmanifested option."
+"Fix unmanifested files. epub-fix can either add them to the manifest or "
+"delete them as specified by the delete unmanifested option."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:32
@@ -3338,14 +3338,14 @@ msgid "Main memory"
 msgstr "Mémoire principale"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions.py:519
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:444
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:454
 msgid "Storage Card A"
 msgstr "Carte mémoire A"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions.py:520
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:446
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:455
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:447
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:456
 msgid "Storage Card B"
 msgstr "Carte mémoire B"
 
@@ -3411,7 +3411,7 @@ msgid "Failed to download metadata:"
 msgstr "Le téléchargement des métadonnées a échoué:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions.py:659
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:637
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:638
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:523
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:951
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
@@ -3598,7 +3598,7 @@ msgid "The specified directory could not be processed."
 msgstr "Le chemin spécifié ne peut pas être traité."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:840
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "No books"
 msgstr "Aucun livre"
 
@@ -3769,12 +3769,12 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:248
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:253
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:259
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:265
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:149
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:186
@@ -3846,7 +3846,7 @@ msgstr "Cliquer pour ouvrir"
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:467
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:274
 msgid "None"
 msgstr "Aucun"
 
@@ -4741,12 +4741,12 @@ msgid "Footer regular expression:"
 msgstr "Expression régulière pour le pied de page:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:56
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:76
 msgid "Invalid regular expression"
 msgstr "Expression régulière incorrecte"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:77
 msgid "Invalid regular expression: %s"
 msgstr "Expression régulière incorrecte: %s"
 
@@ -5034,124 +5034,124 @@ msgstr "étiquettes à ajouter"
 msgid "tags to remove"
 msgstr "étiquettes à supprimer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:49
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:135
 msgid "No details available."
 msgstr "Pas de détail disponible."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:155
 msgid "Device no longer connected."
 msgstr "L'appareil n'est plus connecté."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:270
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:271
 msgid "Get device information"
 msgstr "Lit les informations de l'appareil"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:282
 msgid "Get list of books on device"
 msgstr "Lire la liste de livres à partir de l'appareil"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:292
 msgid "Get annotations from device"
 msgstr "Obtenir les annotations à partir de l'appareil"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:301
 msgid "Send metadata to device"
 msgstr "Envoie les métadonnées vers l'appareil"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:305
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:306
 msgid "Send collections to device"
 msgstr "Envoyer les collections vers l'appareil"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:329
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:330
 msgid "Upload %d books to device"
 msgstr "Envoie le livre %d dans l'appareil"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:345
 msgid "Delete books from device"
 msgstr "Supprimer les livres dans l'appareil"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:362
 msgid "Download books from device"
 msgstr "Télécharger les livres à partir de l'appareil"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:372
 msgid "View book on device"
 msgstr "Afficher le livre sur l'appareil"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:408
 msgid "Set default send to device action"
 msgstr "Indiquer l'action par défaut pour 'envoyer au lecteur'"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:413
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:420
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:422
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:423
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:425
 msgid "Email to"
 msgstr "Email vers"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:425
 msgid " and delete from library"
 msgstr " et efface de la bibliothèque"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:434
 msgid "Send to main memory"
 msgstr "Envoyer vers la mémoire du lecteur"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:436
 msgid "Send to storage card A"
 msgstr "Envoyer vers la carte mémoire A"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:437
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:438
 msgid "Send to storage card B"
 msgstr "Envoyer vers la carte mémoire B"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:442
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:452
 msgid "Main Memory"
 msgstr "Mémoire principale"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:469
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:470
 msgid "Send and delete from library"
 msgstr "Envoyer et effacer de la bibliothèque"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:470
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:471
 msgid "Send specific format"
 msgstr "Envoyer un format spécifique"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:509
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:510
 msgid "Connect to folder"
 msgstr "Connecter au dossier"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:516
 msgid "Connect to iTunes"
 msgstr "Connecter à iTunes"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:520
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:521
 msgid "Eject device"
 msgstr "Ejecter l'appareil"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:529
 msgid "Fetch annotations (experimental)"
 msgstr "Récupérer les annotations (expérimental)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:638
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:639
 msgid "Error communicating with device"
 msgstr "Erreur pendant la communication avec le lecteur électronique"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:659
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:660
 msgid "Select folder to open as device"
 msgstr "Sélectionner le dossier à ouvrir comme appareil"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:704
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:705
 msgid "Failed"
 msgstr "Echec"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:710
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:711
 msgid "Error talking to device"
 msgstr "Erreur pendant la communication avec le lecteur électronique"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:711
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:712
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
@@ -5160,128 +5160,128 @@ msgstr ""
 "lecteur électronique. Veuillez déconnecter et reconnecter le lecteur "
 "électronique et redémarrer."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:753
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:754
 msgid "Device: "
 msgstr "Appareil: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:755
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:756
 msgid " detected."
 msgstr " detecté."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:842
 msgid "selected to send"
 msgstr "sélectionné pour l'envoi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:846
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:847
 msgid "Choose format to send to device"
 msgstr "Choisir le format à envoyer au lecteur"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:855
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:856
 msgid "No device"
 msgstr "Aucun appareil"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:856
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:857
 msgid "Cannot send: No device is connected"
 msgstr "Impossible d'envoyer: Aucun appareil connecté"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:859
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:863
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:860
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
 msgid "No card"
 msgstr "Aucune carte"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:860
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
 msgid "Cannot send: Device has no storage card"
 msgstr "Impossible d'envoyer: L'appareil n'a pas de carte mémoire"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:905
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:906
 msgid "E-book:"
 msgstr "E-book:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:908
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:909
 msgid "Attached, you will find the e-book"
 msgstr "En pièce jointe, vous trouverez l'ebook"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:909
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:910
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:181
 msgid "by"
 msgstr "par"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:910
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:911
 msgid "in the %s format."
 msgstr "dans le format %s."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:923
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:924
 msgid "Sending email to"
 msgstr "Envoi d'un email à"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:953
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:961
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1053
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1115
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1234
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1242
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:954
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:962
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1054
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1235
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1243
 msgid "No suitable formats"
 msgstr "Pas de format convenable"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:954
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:955
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 "Convertir automatiquement les livres suivants avant de les envoyer par email "
 "?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:962
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:963
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 "Impossible d'envoyer par email les livres suivants car aucun format "
 "convenable n'a été trouvé :"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:980
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:981
 msgid "Failed to email books"
 msgstr "L'envoi par email des livres a échoué"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:981
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:982
 msgid "Failed to email the following books:"
 msgstr "L'envoi par email des livres suivants a échoué:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:985
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:986
 msgid "Sent by email:"
 msgstr "Envoyer par email:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1012
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1013
 msgid "News:"
 msgstr "News:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1014
 msgid "Attached is the"
 msgstr "Le fichier attaché est"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1024
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1025
 msgid "Sent news to"
 msgstr "Envoi des News vers"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1054
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1235
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1055
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1117
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1236
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 "Convertir automatiquement les livres suivants avant de les télécharger dans "
 "l'appareil ?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1084
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1085
 msgid "Sending catalogs to device."
 msgstr "Envoie les catalogues vers l'appareil."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1148
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1149
 msgid "Sending news to device."
 msgstr "Envoi les News vers l'appareil."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1202
 msgid "Sending books to device."
 msgstr "Envoie les livres dans l'appareil."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1243
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1244
 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."
@@ -5290,11 +5290,11 @@ msgstr ""
 "convenable n'a été trouvé. Convertissez avant le(s) livre(s) vers un format "
 "supporté par votre appareil."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1304
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1305
 msgid "No space on device"
 msgstr "Le lecteur électronique n'a plus d'espace mémoire disponible"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1305
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1306
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
@@ -5583,7 +5583,7 @@ msgid "Access log:"
 msgstr "Journal des accès:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:794
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:332
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:331
 msgid "Failed to start content server"
 msgstr "A échoué lors du démarrage du serveur de contenu"
 
@@ -5654,11 +5654,11 @@ msgstr ""
 "Vous devrez les vérifier manuellement. Ceci peut arriver si vous avez "
 "manipulé les fichiers directement dans le dossier de la bibliothèque."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:133
 msgid "TabWidget"
 msgstr "Widget avec onglet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:134
 msgid ""
 "Here you can control how calibre will read metadata from the files you add "
 "to it. calibre can either read metadata from the contents of the file, or "
@@ -5668,11 +5668,11 @@ msgstr ""
 "fichiers que vous ajoutez. Calibre peut lire les métadonnées à partir du "
 "contenu du fichier, ou du nom de fichier."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:135
 msgid "Read metadata only from &file name"
 msgstr "Lire les métadonnées uniquement à partir du nom de &fichier"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:136
 msgid ""
 "Swap the firstname and lastname of the author. This affects only metadata "
 "read from file names."
@@ -5680,11 +5680,11 @@ msgstr ""
 "Echanger le prénom et le nom de l'auteur. Ceci affecte seulement les "
 "métadonnées lues à partir des noms de fichiers."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:137
 msgid "&Swap author firstname and lastname"
 msgstr "&Echanger le prénom et le nom de l'auteur"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:138
 msgid ""
 "If an existing book with a similar title and author is found that does not "
 "have the format being added, the format is added\n"
@@ -5704,7 +5704,7 @@ msgstr ""
 "la ponctuation, la casse, etc. La recherche de correspondance est exacte "
 "pour l'auteur."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:142
 msgid ""
 "If books with similar titles and authors found, &merge the new files "
 "automatically"
@@ -5712,15 +5712,15 @@ msgstr ""
 "Si des livres avec des titres et des auteurs similaires sont trouvés, "
 "&fusionner les nouveaux fichiers automatiquement"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:143
 msgid "&Configure metadata from file name"
 msgstr "&Configurer les métadonnées à partir du nom de fichier"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:144
 msgid "&Adding books"
 msgstr "&Ajout de livres"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:145
 msgid ""
 "Here you can control how calibre will save your books when you click the "
 "Save to Disk button:"
@@ -5728,65 +5728,70 @@ msgstr ""
 "Ici vous pouvez contrôler comment Calibre va sauvegarder vos livres quand "
 "vous cliquez sur le bouton Sauvegarder sur le disque:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:146
 msgid "Save &cover separately"
 msgstr "Sauvegarder les &couvertures séparément"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:147
 msgid "Update &metadata in saved copies"
 msgstr "Mettre à jour les &métadonnées dans les copies sauvegardées"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:148
 msgid "Save metadata in &OPF file"
 msgstr "Sauvegarder les métadonnées dans le fichier &OPF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:149
 msgid "Convert non-English characters to &English equivalents"
 msgstr "Convertir les caractères non-Anglais vers des équivalents &Anglais"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:150
 msgid "Format &dates as:"
 msgstr "Format de &dates comme:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:151
 msgid "File &formats to save:"
 msgstr "&Formats de fichier à sauvegarder:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:152
 msgid "Replace space with &underscores"
 msgstr "Remplacer les espaces par des &underscores"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:153
 msgid "Change paths to &lowercase"
 msgstr "Changer les chemins en minuscu&les"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:154
 msgid "&Saving books"
 msgstr "&Sauvegarde de livres"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:135
-msgid "Preserve device collections."
-msgstr "Conserver les collections de l'appareil"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:136
-msgid ""
-"If checked, collections will not be deleted even if a book with changed "
-"metadata is resent and the collection is not in the book's metadata. In "
-"addition, editing collections in the device view will be enabled. If "
-"unchecked, collections will be always reflect only the metadata in the "
-"calibre library."
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:155
+msgid "Metadata &management:"
 msgstr ""
-"Si cette case est cochée, les collections ne seront pas effacées même si un "
-"livre avec des métadonnées modifiées est renvoyé et la collection n'est pas "
-"dans les métadonnées du livre. En plus, l'édition des collections sur "
-"l'appareil va être activée. Si elle est décochée, les collections seront "
-"seulement le reflet des métadonnées de la bibliothèque de Calibre."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:137
-msgid "  "
-msgstr "  "
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:156
+msgid "Manual management"
+msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:157
+msgid "Only on send"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:158
+msgid "Automatic management"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:159
+msgid ""
+"<li><b>Manual Management</b>: Calibre updates the metadata and adds "
+"collections only when a book is sent. With this option, calibre will never "
+"remove a collection.</li>\n"
+"<li><b>Only on send</b>: Calibre updates metadata and adds/removes "
+"collections for a book only when it is sent to the device. </li>\n"
+"<li><b>Automatic management</b>: Calibre automatically keeps metadata on the "
+"device in sync with the calibre library, on every connect</li></ul>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:162
 msgid ""
 "Here you can control how calibre will save your books when you click the "
 "Send to Device button. This setting can be overriden for individual devices "
@@ -5797,13 +5802,14 @@ msgstr ""
 "peuvent être outrepassés par votre lecteur en personnalisant l'interface de "
 "gestion des pluggins des lecteurs dans Préférences->Plugins"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:163
 msgid "Sending to &device"
 msgstr "Envoi vers l'&appareil"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:168
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:174
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:201
 msgid "Preferences"
 msgstr "Préférences"
@@ -7644,11 +7650,11 @@ msgstr "Expression régulière (?P&lt;title&gt;)"
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:84
-#: /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:98
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:100
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:99
 msgid "No match"
 msgstr "Pas de correspondance"
 
@@ -7745,7 +7751,8 @@ msgid "Add Empty book. (Book entry with no formats)"
 msgstr "Ajouter un livre vide. (Une entrée sans aucun format)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:103
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:276
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:409
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:160
 msgid "Save to disk"
 msgstr "Sauvegarder sur le disque"
 
@@ -7754,18 +7761,19 @@ 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/init.py:107
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:394
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:393
 msgid "Save only %s format to disk"
 msgstr "Sauvegarder seulement le format %s vers le disque"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:111
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:397
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:396
 msgid "Save only %s format to disk in a single directory"
 msgstr ""
 "Sauvegarder seulement le format %s sur le disque dans un repertoire unique"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:120
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:166
 msgid "View"
 msgstr "Visualiser"
 
@@ -7810,46 +7818,46 @@ msgstr "Créer le catalogue des livres dans votre bibliothèque Calibre"
 msgid "Run welcome wizard"
 msgstr "Démarrer l'assistant de bienvenue"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:205
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:191
 msgid "Similar books..."
 msgstr "Livres similaires..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:223
 msgid "Add books to library"
 msgstr "Ajouter des livres à la bibliothèque"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:232
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:239
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:246
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:253
 msgid "Manage collections"
 msgstr "Gérer les collections"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:333
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:319
 msgid "Cover Browser"
 msgstr "Navigateur de couvertures"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:337
 msgid "Tag Browser"
 msgstr "Navigateur d'étiquettes"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:372
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:358
 msgid "version"
-msgstr ""
+msgstr "version"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:359
 msgid "created by Kovid Goyal"
-msgstr ""
+msgstr "créé par Kovid Goyal"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:377
 msgid "Connected "
 msgstr "Connecté: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:400
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:386
 msgid "Update found"
-msgstr ""
+msgstr "Mise à jour trouvée"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:445
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:454
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:430
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:439
 msgid "Book Details"
 msgstr "Détails du livre"
 
@@ -7913,6 +7921,227 @@ msgstr "Cliquer pour voir la liste des travaux actifs."
 msgid " - Jobs"
 msgstr " - Travaux"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:64
+msgid ""
+"Library\n"
+"%d books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:65
+msgid ""
+"Reader\n"
+"%s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:66
+msgid ""
+"Card A\n"
+"%s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:67
+msgid ""
+"Card B\n"
+"%s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:71
+msgid "Click to see the books available on your computer"
+msgstr "Cliquer pour voir les livres disponibles sur votre ordinateur"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:74
+msgid "Click to see the books in the main memory of your reader"
+msgstr ""
+"Cliquer pour voir les livres dans la mémoire principale de votre lecteur"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:75
+msgid "Click to see the books on storage card A in your reader"
+msgstr ""
+"Cliquer pour voir les livres dans la carte mémoire A de votre lecteur"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:76
+msgid "Click to see the books on storage card B in your reader"
+msgstr ""
+"Cliquer pour voir les livres dans la carte mémoire B de votre lecteur"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:84
+msgid "Books located at"
+msgstr "Livres situés à"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:100
+msgid "free"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:134
+msgid ""
+"Books display will be restricted to those matching the selected saved search"
+msgstr ""
+"Les livres affichés seront limités à ceux correspondant à la recherche "
+"sauvegardée sélectionnée"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:136
+msgid "Advanced search"
+msgstr "Recherche avancée"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:141
+msgid ""
+"<p>Search the list of books by title, author, publisher, tags, comments, "
+"etc.<br><br>Words separated by spaces are ANDed"
+msgstr ""
+"<p>Recherche la liste des livres par titre, auteur, éditeur, étiquettes, "
+"commentaires, etc...<br><br>Les mots séparés par des espaces sont traités "
+"avec des AND"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:316
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:142
+msgid "Reset Quick Search"
+msgstr "Réinitialisation de la recherche rapide"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:328
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:144
+msgid "Copy current search text (instead of search name)"
+msgstr ""
+"Copier le texte de recherche courant (au lieu du nom de la recherche)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:146
+msgid "Save current search under the name shown in the box"
+msgstr "Sauvegarder la recherche courante avec le nom indiqué dans la boite"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:148
+msgid "Delete current saved search"
+msgstr "Supprimer la recherche sauvegardée actuelle"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:150
+msgid "Add books"
+msgstr "Ajouter des livres"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:151
+msgid "A"
+msgstr "A"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:153
+msgid "Remove books"
+msgstr "Supprimer des livres"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:154
+msgid "Del"
+msgstr "Suppression"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:406
+msgid "Edit meta info"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:406
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:156
+msgid "E"
+msgstr "E"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:157
+msgid "Merge book records"
+msgstr "Fusionner les enregistrements de livres"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:158
+msgid "M"
+msgstr "M"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:159
+msgid "Send to device"
+msgstr "Envoyer au lecteur"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:409
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:161
+msgid "S"
+msgstr "S"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:162
+msgid "Fetch news"
+msgstr "Récupérer des News"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:163
+msgid "F"
+msgstr "F"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:164
+msgid "Convert books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:165
+msgid "C"
+msgstr "C"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:167
+msgid "V"
+msgstr "V"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:168
+msgid "Open containing folder"
+msgstr "Ouvrir le dossier contenant"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:169
+msgid "Show book details"
+msgstr "Afficher les détails du livre"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:170
+msgid "Books by same author"
+msgstr "Livres du même auteur"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:171
+msgid "Books in this series"
+msgstr "Livres dans cette série"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:172
+msgid "Books by this publisher"
+msgstr "Livres de cet éditeur"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:423
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:173
+msgid "Books with the same tags"
+msgstr "Livres avec les mêmes étiquettes"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:176
+msgid "Ctrl+P"
+msgstr "Ctrl+P"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:177
+msgid "Help"
+msgstr "Aide"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:178
+msgid "Browse the calibre User Manual"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:179
+msgid "F1"
+msgstr "F1"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:284
 msgid "N"
 msgstr "N"
@@ -8215,169 +8444,34 @@ msgstr "Essayer de redémarrer l'ordinateur."
 msgid "try deleting the file"
 msgstr "Essayer de supprimer le fichier"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:131
 msgid "calibre"
 msgstr "Calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:249
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:133
 msgid "&Restrict to:"
 msgstr "&Limiter à:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:250
-msgid ""
-"Books display will be restricted to those matching the selected saved search"
-msgstr ""
-"Les livres affichés seront limités à ceux correspondant à la recherche "
-"sauvegardée sélectionnée"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:135
 msgid "set in ui.py"
 msgstr "indiquer dans ui.py"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:252
-msgid "Advanced search"
-msgstr "Recherche avancée"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:138
 msgid "Alt+S"
 msgstr "Alt+S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:255
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:139
 msgid "&Search:"
 msgstr "&Recherche :"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:256
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:257
-msgid ""
-"<p>Search the list of books by title, author, publisher, tags, comments, "
-"etc.<br><br>Words separated by spaces are ANDed"
-msgstr ""
-"<p>Recherche la liste des livres par titre, auteur, éditeur, étiquettes, "
-"commentaires, etc...<br><br>Les mots séparés par des espaces sont traités "
-"avec des AND"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:258
-msgid "Reset Quick Search"
-msgstr "Réinitialisation de la recherche rapide"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:260
-msgid "Copy current search text (instead of search name)"
-msgstr ""
-"Copier le texte de recherche courant (au lieu du nom de la recherche)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:262
-msgid "Save current search under the name shown in the box"
-msgstr "Sauvegarder la recherche courante avec le nom indiqué dans la boite"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:264
-msgid "Delete current saved search"
-msgstr "Supprimer la recherche sauvegardée actuelle"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:266
-msgid "Add books"
-msgstr "Ajouter des livres"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:267
-msgid "A"
-msgstr "A"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:268
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:269
-msgid "Remove books"
-msgstr "Supprimer des livres"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:270
-msgid "Del"
-msgstr "Suppression"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:271
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:155
 msgid "Edit meta information"
 msgstr "Editer les métadonnées"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:272
-msgid "E"
-msgstr "E"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:273
-msgid "Merge book records"
-msgstr "Fusionner les enregistrements de livres"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:274
-msgid "M"
-msgstr "M"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:275
-msgid "Send to device"
-msgstr "Envoyer au lecteur"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
-msgid "S"
-msgstr "S"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
-msgid "Fetch news"
-msgstr "Récupérer des News"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
-msgid "F"
-msgstr "F"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
-msgid "Convert E-books"
-msgstr "Convertir des ebooks"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
-msgid "C"
-msgstr "C"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
-msgid "V"
-msgstr "V"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
-msgid "Open containing folder"
-msgstr "Ouvrir le dossier contenant"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
-msgid "Show book details"
-msgstr "Afficher les détails du livre"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
-msgid "Books by same author"
-msgstr "Livres du même auteur"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
-msgid "Books in this series"
-msgstr "Livres dans cette série"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
-msgid "Books by this publisher"
-msgstr "Livres de cet éditeur"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
-msgid "Books with the same tags"
-msgstr "Livres avec les mêmes étiquettes"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:175
 msgid "Configure calibre"
 msgstr "Configurer Calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
-msgid "Ctrl+P"
-msgstr "Ctrl+P"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
-msgid "Help"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
-msgid "Browse the calibre User Manual"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
-msgid "F1"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:20
 msgid ""
 "Redirect console output to a dialog window (both stdout and stderr). Useful "
@@ -8409,6 +8503,7 @@ msgstr "Aucune correspondance pour ce livre"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:553
 msgid "Search"
 msgstr "Trouver"
 
@@ -8433,15 +8528,19 @@ msgstr ""
 "Choisir la recherche sauvegardée ou entrer un nom pour une nouvelle "
 "recherche à sauvegarder"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:10
+msgid "Restrict to"
+msgstr "Limiter à"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:48
 msgid "({0} of {1})"
 msgstr "({0} de {1})"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:54
 msgid "(all books)"
 msgstr "(tous les livres)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:56
 msgid "({0} of all)"
 msgstr "({0} de tout)"
 
@@ -8587,7 +8686,7 @@ msgstr "Gérer les catégories de l'&utilisateur"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:790
 msgid "Add your own categories to the Tag Browser"
-msgstr ""
+msgstr "Ajouter vos propres catégories au navigateur d'étiquettes"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:182
@@ -8652,34 +8751,34 @@ msgstr "&Redémarrer"
 msgid "Calibre Quick Start Guide"
 msgstr "Guide De Démarrage Rapide Calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:380
 msgid "Cannot configure"
 msgstr "Configuration impossible"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:376
 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/ui.py:382
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:381
 msgid "Cannot configure before calibre is restarted."
 msgstr "Configuration impossible avant que Calibre n'ait été redémarré."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:424
 msgid "No detailed info available"
 msgstr "Pas d'information détaillée disponible"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:425
 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/ui.py:478
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:506
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:477
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:505
 msgid "Conversion Error"
 msgstr "Erreur lors de la conversion"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:479
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:478
 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."
@@ -8688,26 +8787,26 @@ msgstr ""
 "href=\"%s\">DRM</a>. Vous devez d'abord enlever les DRM avec des outils "
 "tiers."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:492
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:491
 msgid "Recipe Disabled"
 msgstr "Recette désactivée"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:507
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:506
 msgid "<b>Failed</b>"
 msgstr "<b>Échoué</b>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:547
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:546
 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. "
 "Your donation helps keep calibre development going."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:573
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:572
 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/ui.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:575
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
@@ -8718,11 +8817,11 @@ msgstr ""
 "l'appareil.<br>\n"
 "                      Êtes-vous sûr de vouloir quitter ?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:579
 msgid "WARNING: Active jobs"
 msgstr "ATTENTION: Travaux actifs"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:633
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:632
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -9220,94 +9319,43 @@ msgstr "Maj+F3"
 msgid "Print eBook"
 msgstr "Imprimer un ebook"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
 msgid "Copy Image"
 msgstr "Copier l'image"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:240
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:239
 msgid "Paste Image"
 msgstr "Coller l'image"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:270
-msgid ""
-"Library\n"
-"%d books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:271
-msgid ""
-"Reader\n"
-"%s"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:272
-msgid ""
-"Card A\n"
-"%s"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:273
-msgid ""
-"Card B\n"
-"%s"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:277
-msgid "Click to see the books available on your computer"
-msgstr "Cliquer pour voir les livres disponibles sur votre ordinateur"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:280
-msgid "Click to see the books in the main memory of your reader"
-msgstr ""
-"Cliquer pour voir les livres dans la mémoire principale de votre lecteur"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:281
-msgid "Click to see the books on storage card A in your reader"
-msgstr ""
-"Cliquer pour voir les livres dans la carte mémoire A de votre lecteur"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:282
-msgid "Click to see the books on storage card B in your reader"
-msgstr ""
-"Cliquer pour voir les livres dans la carte mémoire B de votre lecteur"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:290
-msgid "Books located at"
-msgstr "Livres situés à"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:306
-msgid "free"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:364
 msgid "Change Case"
 msgstr "Modifier la casse"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:558
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:365
 msgid "Upper Case"
 msgstr "Majuscule"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:559
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:366
 msgid "Lower Case"
 msgstr "Minuscule"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:367
 msgid "Swap Case"
 msgstr "Basculer la casse"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:561
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:368
 msgid "Title Case"
 msgstr "Casse du titre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:983
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:837
 msgid "Drag to resize"
 msgstr "Faire glisser pour redimensionner"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1015
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:869
 msgid "Show"
 msgstr "Afficher"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1022
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:876
 msgid "Hide"
 msgstr "Masquer"
 
@@ -10691,10 +10739,8 @@ msgid "User-created tag browser categories"
 msgstr "Catégories définies par l'utilisateur du navigateur d'étiquettes"
 
 #: /home/kovid/work/calibre/src/calibre/utils/config.py:702
-msgid "Preserve all collections even if not in library metadata."
+msgid "How and when calibre updates metadata on the device."
 msgstr ""
-"Conserver toutes les collections même si elles ne font pas parti des "
-"métadonnées de la bibliothèque"
 
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:43
 msgid "Waiting..."
@@ -11353,6 +11399,9 @@ msgstr "Ne pas télécharger les feuilles de style CSS."
 #~ "Recherche les livres par titre, auteur, éditeur, tags et commentaires "
 #~ "<br><br>Recherche en ET pour les mots séparés par des espaces."
 
+#~ msgid "Convert E-books"
+#~ msgstr "Convertir des ebooks"
+
 #~ msgid "Don't add links to the table of contents."
 #~ msgstr "Ne pas ajouter de liens à la table des matières."
 
@@ -13563,3 +13612,27 @@ msgstr "Ne pas télécharger les feuilles de style CSS."
 
 #~ msgid "Connect to iTunes (EXPERIMENTAL)"
 #~ msgstr "Connecter à iTunes (EXPERIMENTAL)"
+
+#~ msgid "Preserve device collections."
+#~ msgstr "Conserver les collections de l'appareil"
+
+#~ msgid ""
+#~ "If checked, collections will not be deleted even if a book with changed "
+#~ "metadata is resent and the collection is not in the book's metadata. In "
+#~ "addition, editing collections in the device view will be enabled. If "
+#~ "unchecked, collections will be always reflect only the metadata in the "
+#~ "calibre library."
+#~ msgstr ""
+#~ "Si cette case est cochée, les collections ne seront pas effacées même si un "
+#~ "livre avec des métadonnées modifiées est renvoyé et la collection n'est pas "
+#~ "dans les métadonnées du livre. En plus, l'édition des collections sur "
+#~ "l'appareil va être activée. Si elle est décochée, les collections seront "
+#~ "seulement le reflet des métadonnées de la bibliothèque de Calibre."
+
+#~ msgid "  "
+#~ msgstr "  "
+
+#~ msgid "Preserve all collections even if not in library metadata."
+#~ msgstr ""
+#~ "Conserver toutes les collections même si elles ne font pas parti des "
+#~ "métadonnées de la bibliothèque"
diff --git a/src/calibre/translations/it.po b/src/calibre/translations/it.po
index dd6f939410..16d3fe045d 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: 2010-07-09 22:00+0000\n"
-"PO-Revision-Date: 2010-07-09 20:23+0000\n"
-"Last-Translator: Kovid Goyal <Unknown>\n"
+"POT-Creation-Date: 2010-07-10 16:12+0000\n"
+"PO-Revision-Date: 2010-07-11 17:14+0000\n"
+"Last-Translator: MeltingShell <Unknown>\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: 2010-07-10 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-07-12 03:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Bookmarks: -1,-1,-1,-1,-1,1105,-1,1312,-1,-1\n"
 "Generated-By: pygettext.py 1.5\n"
@@ -31,7 +31,7 @@ msgstr "Non fa assolutamente niente"
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:71
 #: /home/kovid/work/calibre/src/calibre/devices/prs500/books.py:267
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:492
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:396
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:398
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:97
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:100
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/metadata.py:56
@@ -115,10 +115,10 @@ msgstr "Non fa assolutamente niente"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:110
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:135
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:898
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:907
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1190
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1193
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:899
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:908
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1191
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1194
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:120
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:155
@@ -703,30 +703,30 @@ msgstr "Comunica con il Kobo Reader"
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:64
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:67
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:70
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:130
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:137
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:160
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:132
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:139
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:162
 msgid "Getting list of books on device..."
 msgstr "Recupero della lista dei libri sul dispositivo..."
 
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:219
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:263
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:244
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:262
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:246
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:264
 msgid "Removing books from device..."
 msgstr "Rimozione dei libri dal dispositivo..."
 
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:267
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:274
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:269
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:274
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:271
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:276
 msgid "Removing books from device metadata listing..."
 msgstr "Cancellazione libri dalla lista metadati del dispositivo..."
 
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:279
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:313
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:208
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:238
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:210
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:240
 msgid "Adding books to device metadata listing..."
 msgstr "Aggiunta dei libri alla lista metadati del dispositivo..."
 
@@ -744,7 +744,7 @@ msgstr "Comunica con il Sweex MM300"
 
 #: /home/kovid/work/calibre/src/calibre/devices/misc.py:75
 msgid "Communicate with the Pandigital Novel"
-msgstr ""
+msgstr "Comunica con il Pandigital Novel"
 
 #: /home/kovid/work/calibre/src/calibre/devices/nokia/driver.py:17
 msgid "Communicate with the Nokia 770 internet tablet."
@@ -896,12 +896,12 @@ msgstr "Comunicare con un lettore di eBook."
 msgid "Get device information..."
 msgstr "Recupero informazioni del dispositivo..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:188
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:192
 msgid "Transferring books to device..."
 msgstr "Trasferimento dei libri nel dispositivo..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:305
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:307
 msgid "Sending metadata to device..."
 msgstr "Invio dei metadati al dispositivo..."
 
@@ -1207,8 +1207,7 @@ msgstr "Output salvato in"
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:95
 msgid "Level of verbosity. Specify multiple times for greater verbosity."
 msgstr ""
-"Livello di dettagli dell'output. Specificare piu' volte per maggiori "
-"dettagli."
+"Livello di dettagli dell'output. Specificare più volte per maggiori dettagli."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:102
 msgid ""
@@ -1254,9 +1253,9 @@ msgid ""
 msgstr ""
 "Dimensione base dei caratteri in punti. Tutte le dimensioni dei caratteri "
 "nel libro prodotto saranno scalate in base a questa dimensione. Scegliendo "
-"una dimensione maggiore si possono ottenere caratteri piu' grandi "
-"nell'output e viceversa. Per default, la dimensione base dei caratteri è "
-"scelta in base al profilo scelto."
+"una dimensione maggiore si possono ottenere caratteri più grandi nell'output "
+"e viceversa. Per default, la dimensione base dei caratteri è scelta in base "
+"al profilo scelto."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:143
 msgid ""
@@ -1683,18 +1682,18 @@ msgstr "Creazione in corso"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/__init__.py:18
 msgid "ePub Fixer"
-msgstr ""
+msgstr "ePub Fixer"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/epubcheck.py:18
 msgid "Workaround epubcheck bugs"
-msgstr ""
+msgstr "Soluzione ai bug di epubcheck"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/epubcheck.py:22
 msgid ""
 "Workarounds for bugs in the latest release of epubcheck. epubcheck reports "
-"many things as errors that are not actually errors. %prog will try to detect "
-"these and replace them with constructs that epubcheck likes. This may cause "
-"significant changes to your epub, complain to the epubcheck project."
+"many things as errors that are not actually errors. epub-fix will try to "
+"detect these and replace them with constructs that epubcheck likes. This may "
+"cause significant changes to your epub, complain to the epubcheck project."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/main.py:19
@@ -1707,10 +1706,18 @@ msgid ""
 "By default, no fixing is done and messages are printed out for each error "
 "detected. Use the options to control which errors are automatically fixed."
 msgstr ""
+"%prog [opzioni] file.epub\n"
+"\n"
+"Corregge i problemi comuni nei file EPUB che possono causarne il rifiuto dai "
+"dispositivi mal progettati.\n"
+"\n"
+"Di default, non viene effettuata alcuna correzione e vengono visualizzati i "
+"messaggi per ogni errore individuato. Usare le opzioni per controllare quali "
+"errori correggere automaticamente."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/main.py:50
 msgid "You must specify an epub file"
-msgstr ""
+msgstr "Specificare un file epub"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:17
 msgid "Fix unmanifested files"
@@ -1718,8 +1725,8 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:21
 msgid ""
-"Fix unmanifested files. %prog can either add them to the manifest or delete "
-"them as specified by the delete unmanifested option."
+"Fix unmanifested files. epub-fix can either add them to the manifest or "
+"delete them as specified by the delete unmanifested option."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:32
@@ -3027,11 +3034,11 @@ msgstr "Chiedi conferma prima di eliminare"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:37
 msgid "Toolbar icon size"
-msgstr "Dimensione bottoni nella barra degli strumenti"
+msgstr "Dimensione pulsanti nella barra degli strumenti"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:39
 msgid "Show button labels in the toolbar"
-msgstr "Mostra testo nei bottoni della barra degli strumenti"
+msgstr "Mostra testo dei pulsanti della barra degli strumenti"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:41
 msgid "Main window geometry"
@@ -3097,7 +3104,7 @@ msgid ""
 "Show the cover flow in a separate window instead of in the main calibre "
 "window"
 msgstr ""
-"Fai vedere la vetrina delle copertine in una finestra separata invece della "
+"Mostra la vetrina delle copertine in una finestra separata invece della "
 "finestra principale di Calibre."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:69
@@ -3328,14 +3335,14 @@ msgid "Main memory"
 msgstr "Memoria principale"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions.py:519
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:444
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:454
 msgid "Storage Card A"
 msgstr "Scheda di memoria A"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions.py:520
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:446
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:455
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:447
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:456
 msgid "Storage Card B"
 msgstr "Scheda di memoria B"
 
@@ -3401,7 +3408,7 @@ msgid "Failed to download metadata:"
 msgstr "Lo scaricamento dei metadati è fallito:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions.py:659
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:637
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:638
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:523
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:951
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
@@ -3584,7 +3591,7 @@ msgid "The specified directory could not be processed."
 msgstr "Impossibile elaborare la cartella indicata."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:840
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "No books"
 msgstr "Nessun libro."
 
@@ -3602,7 +3609,7 @@ msgid ""
 "the books in smaller increments, until you find the problem book."
 msgstr ""
 "Sembra che la procedura per aggiungere libri si sia bloccata. Si consiglia "
-"di far ripartire Calibre e aggiungere i libri in incrementi piu' piccoli, "
+"di far ripartire Calibre e aggiungere i libri in incrementi più piccoli, "
 "fino a quando si indentifica il libro che causa il problema."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:356
@@ -3755,12 +3762,12 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:248
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:253
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:259
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:265
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:149
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:186
@@ -3831,7 +3838,7 @@ msgstr "Fare clic per aprire"
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:467
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:274
 msgid "None"
 msgstr "Nessuno"
 
@@ -4725,12 +4732,12 @@ msgid "Footer regular expression:"
 msgstr "Espressione regolare per il piè di pagina."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:56
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:76
 msgid "Invalid regular expression"
 msgstr "Espressione regolare non valida"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:77
 msgid "Invalid regular expression: %s"
 msgstr "Espressione regolare non valida: %s"
 
@@ -5016,124 +5023,124 @@ msgstr "tag da aggiungere"
 msgid "tags to remove"
 msgstr "tag da eliminare"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:49
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:135
 msgid "No details available."
 msgstr "Nessun dettaglio disponibile."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:155
 msgid "Device no longer connected."
 msgstr "Dispositivo non più collegato."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:270
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:271
 msgid "Get device information"
 msgstr "Recupera informazioni sul dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:282
 msgid "Get list of books on device"
 msgstr "Recupera la lista dei libri del dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:292
 msgid "Get annotations from device"
 msgstr "Ricevi annotazioni dal dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:301
 msgid "Send metadata to device"
 msgstr "Invia metadati al dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:305
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:306
 msgid "Send collections to device"
 msgstr "Invia collezioni al dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:329
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:330
 msgid "Upload %d books to device"
 msgstr "Invia %d libri al dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:345
 msgid "Delete books from device"
 msgstr "Cancella i libri dal dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:362
 msgid "Download books from device"
 msgstr "Scarica libri dal dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:372
 msgid "View book on device"
 msgstr "Visualizza libro sul dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:408
 msgid "Set default send to device action"
 msgstr "Imposta azione predefinita di invio"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:413
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:420
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:422
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:423
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:425
 msgid "Email to"
 msgstr "Invia messaggio elettronico a"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:425
 msgid " and delete from library"
 msgstr " ed elimina dalla biblioteca"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:434
 msgid "Send to main memory"
 msgstr "Invia alla memoria principale"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:436
 msgid "Send to storage card A"
 msgstr "Invia alla scheda di memoria A"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:437
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:438
 msgid "Send to storage card B"
 msgstr "Invia alla scheda di memoria B"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:442
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:452
 msgid "Main Memory"
 msgstr "Memoria principale"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:469
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:470
 msgid "Send and delete from library"
 msgstr "Invia ed elimina dalla biblioteca"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:470
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:471
 msgid "Send specific format"
 msgstr "Invia uno specifico formato"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:509
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:510
 msgid "Connect to folder"
 msgstr "Connetti alla cartella"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:516
 msgid "Connect to iTunes"
 msgstr "Connetti ad iTunes"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:520
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:521
 msgid "Eject device"
 msgstr "Espelli dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:529
 msgid "Fetch annotations (experimental)"
 msgstr "Preleva annotazioni (sperimentale)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:638
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:639
 msgid "Error communicating with device"
 msgstr "Errore di comunicazione col dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:659
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:660
 msgid "Select folder to open as device"
 msgstr "Selezionare la cartella da aprire come dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:704
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:705
 msgid "Failed"
 msgstr "Fallito"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:710
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:711
 msgid "Error talking to device"
 msgstr "Errore di comunicazione col dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:711
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:712
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
@@ -5141,127 +5148,127 @@ 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/device.py:753
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:754
 msgid "Device: "
 msgstr "Dispositivo: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:755
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:756
 msgid " detected."
 msgstr " individuato."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:842
 msgid "selected to send"
 msgstr "Selezione per l'invio"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:846
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:847
 msgid "Choose format to send to device"
 msgstr "Selezionare il formato da inviare al dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:855
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:856
 msgid "No device"
 msgstr "Nessun dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:856
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:857
 msgid "Cannot send: No device is connected"
 msgstr "Impossibile inviare: nessun dispositivo connesso"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:859
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:863
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:860
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
 msgid "No card"
 msgstr "Nessuna scheda"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:860
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
 msgid "Cannot send: Device has no storage card"
 msgstr "Impossibile inviare: il dispositivo non ha schede di memoria"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:905
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:906
 msgid "E-book:"
 msgstr "Libro elettronico"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:908
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:909
 msgid "Attached, you will find the e-book"
 msgstr "Troverete allegato il libro elettronico"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:909
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:910
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:181
 msgid "by"
 msgstr "di"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:910
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:911
 msgid "in the %s format."
 msgstr "nel formato %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:923
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:924
 msgid "Sending email to"
 msgstr "Spedizione di un messaggio elettronico a"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:953
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:961
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1053
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1115
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1234
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1242
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:954
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:962
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1054
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1235
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1243
 msgid "No suitable formats"
 msgstr "Nessun formato adatto"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:954
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:955
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 "Convertire automaticamente i libri selezionati prima di inviare con posta "
 "eletrronica?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:962
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:963
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 "Non é stato possibile inviare ilibri indicati via posta elettronica poiché "
 "non sono stati trovati formati adatti:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:980
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:981
 msgid "Failed to email books"
 msgstr "Non é stato possibile inviare dei libri via posta elettronica"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:981
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:982
 msgid "Failed to email the following books:"
 msgstr "Non é stato possibile inviare via posta elettronica questi libri:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:985
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:986
 msgid "Sent by email:"
 msgstr "Inviato per posta elettronica"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1012
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1013
 msgid "News:"
 msgstr "Notizie:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1014
 msgid "Attached is the"
 msgstr "Allegato c'é"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1024
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1025
 msgid "Sent news to"
 msgstr "Notizie inviate a"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1054
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1235
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1055
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1117
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1236
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 "Convertire automaticamente i libri seguenti prima di inviarli al dispositivo?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1084
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1085
 msgid "Sending catalogs to device."
 msgstr "Inviando i cataloghi al dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1148
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1149
 msgid "Sending news to device."
 msgstr "Invio delle notizie al dispositivo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1202
 msgid "Sending books to device."
 msgstr "Invio dei libri al dispositivo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1243
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1244
 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."
@@ -5270,11 +5277,11 @@ msgstr ""
 "trovato un formato adeguato. É prima necessario convertire i libri in un "
 "formato supportato dal dispositivo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1304
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1305
 msgid "No space on device"
 msgstr "Spazio sul dispositivo insufficiente"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1305
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1306
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
@@ -5563,7 +5570,7 @@ msgid "Access log:"
 msgstr "File di log degli accessi:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:794
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:332
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:331
 msgid "Failed to start content server"
 msgstr "Avvio del server dei contenuti fallito"
 
@@ -5634,11 +5641,11 @@ msgstr ""
 "controllarli manualmente. Questo problema puó sorgere se i documenti nella "
 "cartella della biblioteca vengono modificati direttamente."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:133
 msgid "TabWidget"
 msgstr "Assistente per i TAB"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:134
 msgid ""
 "Here you can control how calibre will read metadata from the files you add "
 "to it. calibre can either read metadata from the contents of the file, or "
@@ -5648,11 +5655,11 @@ msgstr ""
 "vengono aggiunti. Calibre puó leggere i metadati sia dal contenuto dei "
 "documenti che dai nomi dei documenti."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:135
 msgid "Read metadata only from &file name"
 msgstr "Leggi i metadati solo dal nome del &file"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:136
 msgid ""
 "Swap the firstname and lastname of the author. This affects only metadata "
 "read from file names."
@@ -5660,11 +5667,11 @@ msgstr ""
 "Inverti nome e cognome dell'autore. Questo influisce esclusivamente sui "
 "metadati letti dai nomi dei files."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:137
 msgid "&Swap author firstname and lastname"
 msgstr "&Inverti i nomi e i cognomi dell'autore"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:138
 msgid ""
 "If an existing book with a similar title and author is found that does not "
 "have the format being added, the format is added\n"
@@ -5682,7 +5689,7 @@ msgstr ""
 "Il contronto del titolo ignora gli articoli (\"il\", \"un\", \"una\"), la "
 "punteggiatura, la dimensione, ecc. L'autore viene confrontato interamente."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:142
 msgid ""
 "If books with similar titles and authors found, &merge the new files "
 "automatically"
@@ -5690,15 +5697,15 @@ msgstr ""
 "Se vengono trovati libri con titoli e autori simili, &unisci i nuovi file "
 "automaticamente"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:143
 msgid "&Configure metadata from file name"
 msgstr "&Configura i metadati dal nome del documento"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:144
 msgid "&Adding books"
 msgstr "&Aggiunta libri"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:145
 msgid ""
 "Here you can control how calibre will save your books when you click the "
 "Save to Disk button:"
@@ -5706,66 +5713,79 @@ msgstr ""
 "Qui é possibile controllare come Calibre salva i tuoi libri quando si selezi "
 "il comando Salva sul disco:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:146
 msgid "Save &cover separately"
 msgstr "Salva la &copertina separatamente"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:147
 msgid "Update &metadata in saved copies"
 msgstr "Aggiorna &metadati nelle copie salvate"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:148
 msgid "Save metadata in &OPF file"
 msgstr "Salva i metadati nei file &OPF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:149
 msgid "Convert non-English characters to &English equivalents"
 msgstr ""
 "Conversione dei caratteri non anglofoni nei loro corrispondenti &inglesi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:150
 msgid "Format &dates as:"
 msgstr "Formattato &date:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:151
 msgid "File &formats to save:"
 msgstr "&Formato dei documenti da salvare:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:152
 msgid "Replace space with &underscores"
 msgstr "Sostituire gli spazi con &sottolineature"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:153
 msgid "Change paths to &lowercase"
 msgstr "Cambiare percorsi in &minuscolo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:154
 msgid "&Saving books"
 msgstr "&Salvataggio libri"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:135
-msgid "Preserve device collections."
-msgstr "Conserva le collezioni del dispositivo."
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:155
+msgid "Metadata &management:"
+msgstr "Gestione &metadati:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:156
+msgid "Manual management"
+msgstr "Gestione manuale"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:157
+msgid "Only on send"
+msgstr "Solo all'invio"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:158
+msgid "Automatic management"
+msgstr "Gestione automatica"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:159
 msgid ""
-"If checked, collections will not be deleted even if a book with changed "
-"metadata is resent and the collection is not in the book's metadata. In "
-"addition, editing collections in the device view will be enabled. If "
-"unchecked, collections will be always reflect only the metadata in the "
-"calibre library."
+"<li><b>Manual Management</b>: Calibre updates the metadata and adds "
+"collections only when a book is sent. With this option, calibre will never "
+"remove a collection.</li>\n"
+"<li><b>Only on send</b>: Calibre updates metadata and adds/removes "
+"collections for a book only when it is sent to the device. </li>\n"
+"<li><b>Automatic management</b>: Calibre automatically keeps metadata on the "
+"device in sync with the calibre library, on every connect</li></ul>"
 msgstr ""
-"Se attivo, le collezioni non verranno eliminate anche se un libro con i "
-"metadati cambiati viene inviato e la collezione non è tra i metadati del "
-"libro. In più, viene abilitata la modifica delle collezioni nel dispositivo. "
-"Se disattivato, le collezioni rifletteranno sempre e solo i metadati nella "
-"biblioteca di calibre."
+"<li><b>Gestione manuale</b>: Calibre aggiorna i metadati e aggiunge le "
+"collezioni solo quando un libro viene inviato. Con questa opzione, calibre "
+"non eliminerà mai una collezione.</li>\n"
+"<li><b>Solo all'inivio</b>: Calibre aggiorna i metadati e aggiunge/rimuove "
+"collezioni per un libro solo quando viene inviato al dispositivo. </li>\n"
+"<li><b>Gestione automatica</b>: Calibre mantiene automaticamente "
+"sincronizzati i metadata sul dispositivo con la biblioteca di calibre ad "
+"ogni collegamento</li></ul>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:137
-msgid "  "
-msgstr "  "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:162
 msgid ""
 "Here you can control how calibre will save your books when you click the "
 "Send to Device button. This setting can be overriden for individual devices "
@@ -5776,13 +5796,14 @@ msgstr ""
 "sovrascritte per ogni dispositivo personalizzando il plugin di controllo dei "
 "dispositivi in Preferenze->Plugins"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:163
 msgid "Sending to &device"
 msgstr "Invio al &dispositivo"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:168
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:174
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:201
 msgid "Preferences"
 msgstr "Preferenze"
@@ -5865,7 +5886,7 @@ msgstr "Abilita l'icona nel vassoio di sistema (richiede il riavvio)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
 msgid "Show &notifications in system tray"
-msgstr "Visualizza le &notifiche nella barra di sistema."
+msgstr "Visualizza le &notifiche nella barra di sistema"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
 msgid "Show &splash screen at startup"
@@ -5922,7 +5943,7 @@ msgstr "&Dimensione dei pulsanti nella barra degli strumenti"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
 msgid "Show &text in toolbar buttons"
-msgstr "&Mostra testo nei bottoni della barra degli strumenti"
+msgstr "&Mostra testo nei pulsanti della barra degli strumenti"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
 msgid "Select visible &columns in library view"
@@ -5958,7 +5979,7 @@ msgstr "Disattiva &animazioni"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
 msgid "Show &donate button (restart)"
-msgstr ""
+msgstr "Mostra pulsante &donazioni (richiede riavvio)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
 msgid "Add an email address to which to send books"
@@ -6395,6 +6416,8 @@ msgid ""
 "All checked books will be <b>permanently deleted</b> from your device. "
 "Please verify the list."
 msgstr ""
+"Tutti i libri selezionati verranno <b>definitivamente eliminati</b> dal "
+"dispositivo. Controllare la lista."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75
 msgid "Location"
@@ -6904,7 +6927,7 @@ msgstr "Ultimo scaricamento"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:216
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:192
 msgid "Schedule news download"
-msgstr "Programmare lo scaricamento delle notizie"
+msgstr "Programma lo scaricamento delle notizie"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:219
 msgid "Add a custom news source"
@@ -6920,7 +6943,7 @@ msgstr "Nessuna connessione internet"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:322
 msgid "Cannot download news as no internet connection is active"
-msgstr "Impossibile scaricare le notizie perchè la connessione non è attiva"
+msgstr "Impossibile scaricare le notizie perché la connessione non è attiva"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:193
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:278
@@ -7251,7 +7274,7 @@ msgstr "Aggiungi il tag a quelli disponibili e applicalo al libro corrente"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:20
 msgid "%s (was %s)"
-msgstr ""
+msgstr "%s (era %s)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:501
@@ -7580,11 +7603,11 @@ msgstr "Espressione regolare (?P&lt;title&gt;)"
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:84
-#: /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:98
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:100
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:99
 msgid "No match"
 msgstr "Nessuna corrispondenza"
 
@@ -7666,23 +7689,23 @@ msgid ""
 "directory, assumes every ebook file is the same book in a different format)"
 msgstr ""
 "Aggiungi libri da cartelle includendo le sotto-cartelle (Un libro per "
-"cartella, si assume che ogni documento di libro elettronico é lo stesso "
-"libro in formati differenti)."
+"cartella, si assume che ebook sia lo stesso libro in formati differenti)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:90
 msgid ""
 "Add books from directories, including sub directories (Multiple books per "
 "directory, assumes every ebook file is a different book)"
 msgstr ""
-"Aggiungi libri da cartelle includendo le sotto-cartelle (Piú di un libro per "
-"cartella, si assume che ogni documento di libro elettronico é differente)."
+"Aggiungi libri da cartelle includendo le sotto-cartelle (Piú libri per "
+"cartella, si assume che ogni ebook sia un libro differente)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:93
 msgid "Add Empty book. (Book entry with no formats)"
 msgstr "Aggiungi un libro vuoto (Libro senza formati iniziali)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:103
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:276
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:409
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:160
 msgid "Save to disk"
 msgstr "Salva su disco"
 
@@ -7691,17 +7714,18 @@ msgid "Save to disk in a single directory"
 msgstr "Salva su disco in una singola cartella"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:107
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:394
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:393
 msgid "Save only %s format to disk"
 msgstr "Salva sul disco solo il formato %s"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:111
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:397
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:396
 msgid "Save only %s format to disk in a single directory"
 msgstr "Salva solo il formato %s su disco in una cartella unica"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:120
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:166
 msgid "View"
 msgstr "Leggi"
 
@@ -7739,52 +7763,52 @@ msgstr "Converti in gruppo"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:161
 msgid "Create catalog of books in your calibre library"
-msgstr "Crea un catologo di libri dalla vostra collezione in Calibre"
+msgstr "Crea un catologo di libri dalla biblioteca di Calibre"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:169
 msgid "Run welcome wizard"
-msgstr "Fai partire l'assistente di configurazione iniziale"
+msgstr "Avvia l'assistente di configurazione iniziale"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:205
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:191
 msgid "Similar books..."
 msgstr "Libri simili..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:223
 msgid "Add books to library"
 msgstr "Aggiungi i libri alla biblioteca"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:232
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:239
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:246
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:253
 msgid "Manage collections"
 msgstr "Gestione collezioni"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:333
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:319
 msgid "Cover Browser"
 msgstr "Browser delle copertine"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:337
 msgid "Tag Browser"
 msgstr "Browser dei tag"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:372
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:358
 msgid "version"
-msgstr ""
+msgstr "versione"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:359
 msgid "created by Kovid Goyal"
-msgstr ""
+msgstr "creato da Kovid Goyal"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:377
 msgid "Connected "
 msgstr "Connesso "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:400
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:386
 msgid "Update found"
-msgstr ""
+msgstr "Aggiornamento trovato"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:445
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:454
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:430
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:439
 msgid "Book Details"
 msgstr "Dettagli del libro"
 
@@ -7847,6 +7871,236 @@ msgstr "Fare clic per vedere una lista dei lavori attivi"
 msgid " - Jobs"
 msgstr " - Lavori"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:64
+msgid ""
+"Library\n"
+"%d books"
+msgstr ""
+"Biblioteca\n"
+"%d libri"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:65
+msgid ""
+"Reader\n"
+"%s"
+msgstr ""
+"Lettore\n"
+"%s"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:66
+msgid ""
+"Card A\n"
+"%s"
+msgstr ""
+"Scheda A\n"
+"%s"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:67
+msgid ""
+"Card B\n"
+"%s"
+msgstr ""
+"Scheda B\n"
+"%s"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:71
+msgid "Click to see the books available on your computer"
+msgstr "Fare clic per visualizzare i libri presenti sul computer"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:74
+msgid "Click to see the books in the main memory of your reader"
+msgstr ""
+"Fare clic per visualizzare i libri presenti sulla memoria principale del "
+"dispositivo"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:75
+msgid "Click to see the books on storage card A in your reader"
+msgstr ""
+"Fare clic per visualizzare i libri presenti sulla scheda di memoria A del "
+"dispositivo"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:76
+msgid "Click to see the books on storage card B in your reader"
+msgstr ""
+"Fare clic per visualizzare i libri presenti sulla scheda di memoria A del "
+"dispositivo"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:84
+msgid "Books located at"
+msgstr "Libri presenti in"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:100
+msgid "free"
+msgstr "libero"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:134
+msgid ""
+"Books display will be restricted to those matching the selected saved search"
+msgstr ""
+"I libri visualizzati saranno limitati a quelli corrispondenti alla ricerca "
+"salvata selezionata"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:136
+msgid "Advanced search"
+msgstr "Ricerca avanzata"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:141
+msgid ""
+"<p>Search the list of books by title, author, publisher, tags, comments, "
+"etc.<br><br>Words separated by spaces are ANDed"
+msgstr ""
+"<p>Cerca nella lista dei libri per titolo, autore, editore, tag, commenti, "
+"etc.<br><br> Parole separate da spazi usano l'operatore AND"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:316
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:142
+msgid "Reset Quick Search"
+msgstr "Resetta ricerca veloce"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:328
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:144
+msgid "Copy current search text (instead of search name)"
+msgstr "Copia il testo della ricerca corrente (invece di cercare il nome)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:146
+msgid "Save current search under the name shown in the box"
+msgstr "Salva ricerca corrente sotto il nome indicato nella casella"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:148
+msgid "Delete current saved search"
+msgstr "Elimina ricerca salvata corrente"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:150
+msgid "Add books"
+msgstr "Aggiungi libri"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:151
+msgid "A"
+msgstr "A"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:153
+msgid "Remove books"
+msgstr "Cancella libri"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:154
+msgid "Del"
+msgstr "Canc"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:406
+msgid "Edit meta info"
+msgstr "Modifica metadati"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:406
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:156
+msgid "E"
+msgstr "E"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:157
+msgid "Merge book records"
+msgstr "Unisci i record dei libri"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:158
+msgid "M"
+msgstr "M"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:159
+msgid "Send to device"
+msgstr "Invia al dispositivo"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:409
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:161
+msgid "S"
+msgstr "S"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:162
+msgid "Fetch news"
+msgstr "Scarica notizie"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:163
+msgid "F"
+msgstr "F"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:164
+msgid "Convert books"
+msgstr "Converti libri"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:165
+msgid "C"
+msgstr "C"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:167
+msgid "V"
+msgstr "V"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:168
+msgid "Open containing folder"
+msgstr "Apri la cartella contenente"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:169
+msgid "Show book details"
+msgstr "Visualizza i dettagli del libro"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:170
+msgid "Books by same author"
+msgstr "Libri dello stesso autore"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:171
+msgid "Books in this series"
+msgstr "Libri in questa serie"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:172
+msgid "Books by this publisher"
+msgstr "Libri di questo editore"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:423
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:173
+msgid "Books with the same tags"
+msgstr "Libri con lo stesso tag"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:176
+msgid "Ctrl+P"
+msgstr "Ctrl+P"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:177
+msgid "Help"
+msgstr "Aiuto"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:178
+msgid "Browse the calibre User Manual"
+msgstr "Consulta il manuale utente di calibre"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:179
+msgid "F1"
+msgstr "F1"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:284
 msgid "N"
 msgstr "N"
@@ -8144,167 +8398,34 @@ msgstr "Provate a far ripartire il computer."
 msgid "try deleting the file"
 msgstr "provate a rimuovere il documento"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:131
 msgid "calibre"
 msgstr "calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:249
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:133
 msgid "&Restrict to:"
 msgstr "&Limita a:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:250
-msgid ""
-"Books display will be restricted to those matching the selected saved search"
-msgstr ""
-"I libri visualizzati saranno limitati a quelli corrispondenti alla ricerca "
-"salvata selezionata"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:135
 msgid "set in ui.py"
 msgstr "posta in ui,py"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:252
-msgid "Advanced search"
-msgstr "Ricerca avanzata"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:138
 msgid "Alt+S"
 msgstr "Alt+S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:255
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:139
 msgid "&Search:"
 msgstr "&Cerca:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:256
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:257
-msgid ""
-"<p>Search the list of books by title, author, publisher, tags, comments, "
-"etc.<br><br>Words separated by spaces are ANDed"
-msgstr ""
-"<p>Cerca nella lista dei libri per titolo, autore, editore, tag, commenti, "
-"etc.<br><br> Parole separate da spazi usano l'operatore AND"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:258
-msgid "Reset Quick Search"
-msgstr "Resetta ricerca veloce"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:260
-msgid "Copy current search text (instead of search name)"
-msgstr "Copia il testo della ricerca corrente (invece di cercare il nome)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:262
-msgid "Save current search under the name shown in the box"
-msgstr "Salva ricerca corrente sotto il nome indicato nella casella"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:264
-msgid "Delete current saved search"
-msgstr "Elimina ricerca salvata corrente"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:266
-msgid "Add books"
-msgstr "Aggiungi libri"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:267
-msgid "A"
-msgstr "A"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:268
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:269
-msgid "Remove books"
-msgstr "Cancella libri"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:270
-msgid "Del"
-msgstr "Canc"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:271
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:155
 msgid "Edit meta information"
 msgstr "Modifica metadati"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:272
-msgid "E"
-msgstr "E"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:273
-msgid "Merge book records"
-msgstr "Unisci i record dei libri"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:274
-msgid "M"
-msgstr "M"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:275
-msgid "Send to device"
-msgstr "Invia al dispositivo"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
-msgid "S"
-msgstr "S"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
-msgid "Fetch news"
-msgstr "Scarica notizie"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
-msgid "F"
-msgstr "F"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
-msgid "Convert E-books"
-msgstr "Converti libri"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
-msgid "C"
-msgstr "C"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
-msgid "V"
-msgstr "V"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
-msgid "Open containing folder"
-msgstr "Apri la cartella contenente"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
-msgid "Show book details"
-msgstr "Visualizza i dettagli del libro"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
-msgid "Books by same author"
-msgstr "Libri dello stesso autore"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
-msgid "Books in this series"
-msgstr "Libri in questa serie"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
-msgid "Books by this publisher"
-msgstr "Libri di questo editore"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
-msgid "Books with the same tags"
-msgstr "Libri con lo stesso tag"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:175
 msgid "Configure calibre"
 msgstr "Configurazione di Calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
-msgid "Ctrl+P"
-msgstr "Ctrl+P"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
-msgid "Help"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
-msgid "Browse the calibre User Manual"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
-msgid "F1"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:20
 msgid ""
 "Redirect console output to a dialog window (both stdout and stderr). Useful "
@@ -8335,6 +8456,7 @@ msgstr "Nessun risultato é stato trovato per questo libro"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:553
 msgid "Search"
 msgstr "Cerca"
 
@@ -8355,15 +8477,19 @@ msgstr "Ricerche Salvate"
 msgid "Choose saved search or enter name for new saved search"
 msgstr "Scegliere ricerca salvata o inserire il nome per la nuova ricerca"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:10
+msgid "Restrict to"
+msgstr "Limita a"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:48
 msgid "({0} of {1})"
 msgstr "({0} di {1})"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:54
 msgid "(all books)"
 msgstr "(tutti i libri)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:56
 msgid "({0} of all)"
 msgstr "({0} di tutti)"
 
@@ -8488,7 +8614,7 @@ msgstr "Ordina per valutazione media"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:772
 msgid "Set the sort order for entries in the Tag Browser"
-msgstr ""
+msgstr "Imposta l'ordinamento degli elementi nel browser dei tag"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:778
 msgid "Match all"
@@ -8502,6 +8628,8 @@ msgstr "Fai corrispondere uno qualsiasi"
 msgid ""
 "When selecting multiple entries in the Tag Browser match any or all of them"
 msgstr ""
+"Quando vengono selezionati più elementi nel browser dei tag fai "
+"corrisponderne qualsiasi o tutti"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:787
 msgid "Manage &user categories"
@@ -8509,7 +8637,7 @@ msgstr "Gestione categorie &utente"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:790
 msgid "Add your own categories to the Tag Browser"
-msgstr ""
+msgstr "Aggiungi categorie personalizzate al browser dei tag"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:182
@@ -8560,7 +8688,7 @@ msgstr "&Ripristina"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/ui.py:164
 msgid "&Donate to support calibre"
-msgstr "&donate per supportare Calibre"
+msgstr "&Donazione per sostenere Calibre"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/ui.py:168
 msgid "&Eject connected device"
@@ -8574,33 +8702,33 @@ msgstr "&Riavvia"
 msgid "Calibre Quick Start Guide"
 msgstr "Guida rapida di Calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:380
 msgid "Cannot configure"
 msgstr "Impossibile configurare"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:376
 msgid "Cannot configure while there are running jobs."
 msgstr "Impossibile configurare mentre ci sono lavori in esecuzione"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:382
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:381
 msgid "Cannot configure before calibre is restarted."
 msgstr "Impossibile configurare prima che calibre sia riavviato."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:424
 msgid "No detailed info available"
 msgstr "Nessuna informazione dettagliata disponibile"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:425
 msgid "No detailed information is available for books on the device."
 msgstr "Non è disponibile alcun dettaglio per i libri nel dispositivo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:478
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:506
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:477
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:505
 msgid "Conversion Error"
 msgstr "Errore di conversione"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:479
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:478
 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."
@@ -8609,26 +8737,30 @@ msgstr ""
 "href=\"%s\">DRM</a>. É necessario rimuovere la DRM usando un prodotto da "
 "terzi."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:492
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:491
 msgid "Recipe Disabled"
 msgstr "Ricetta deattivata"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:507
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:506
 msgid "<b>Failed</b>"
 msgstr "<b>Operazione Fallita</b>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:547
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:546
 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. "
 "Your donation helps keep calibre development going."
 msgstr ""
+"è il risultato dell'impegno di molti volontari da tutto il mondo. Se lo "
+"trovi utile, considera la possibilità di fare una donazione per supportare "
+"lo sviluppo. La tua donazione aiuterà a mantenere attivo lo sviluppo di "
+"calibre."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:573
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:572
 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/ui.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:575
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
@@ -8639,11 +8771,11 @@ msgstr ""
 "sul dispositivo.<br>\n"
 "                      Interrompere l'operazione?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:579
 msgid "WARNING: Active jobs"
 msgstr "ATTENZIONE: Lavori attivi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:633
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:632
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -8798,8 +8930,8 @@ msgstr "&language predefinito per sillabazione:"
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:173
 msgid "&Resize images larger than the viewer window (needs restart)"
 msgstr ""
-"&Resize le immagini piu' grandi della finestra del visializzatore (richiede "
-"riavvio)"
+"&Ridimensiona le immagini più grandi della finestra del visualizzatore "
+"(richiede riavvio)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:174
 msgid "&User stylesheet"
@@ -8846,8 +8978,8 @@ msgstr "Larghezza maassima della finestra di visualizzazione in pixel."
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:48
 msgid "Resize images larger than the viewer window to fit inside it"
 msgstr ""
-"Modifica la grandezza delle immagini piu' grandi della finestra del "
-"visualizzatore per farle rientrare nella pagina"
+"&Ridimensiona le immagini più grandi della finestra del visualizzatore per "
+"farle entrare nella finestra"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:49
 msgid "Hyphenate text"
@@ -9143,97 +9275,43 @@ msgstr "Shift+F3"
 msgid "Print eBook"
 msgstr "Stampa del libro elettronico"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
 msgid "Copy Image"
 msgstr "Copia immagine"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:240
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:239
 msgid "Paste Image"
 msgstr "Incolla immagine"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:270
-msgid ""
-"Library\n"
-"%d books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:271
-msgid ""
-"Reader\n"
-"%s"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:272
-msgid ""
-"Card A\n"
-"%s"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:273
-msgid ""
-"Card B\n"
-"%s"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:277
-msgid "Click to see the books available on your computer"
-msgstr "Seleziona per vedere i libri disponibili sul vostro computer"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:280
-msgid "Click to see the books in the main memory of your reader"
-msgstr ""
-"Fare clic per vedere i libri disponibili sulla memoria principale del "
-"dispositivo"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:281
-msgid "Click to see the books on storage card A in your reader"
-msgstr ""
-"Fare clic per vedere i libri disponibili sulla scheda di memoria A del "
-"dispositivo"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:282
-msgid "Click to see the books on storage card B in your reader"
-msgstr ""
-"Fare clic per vedere i libri disponibili sulla scheda di memoria B del "
-"dispositivo"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:290
-msgid "Books located at"
-msgstr "Libri presenti in"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:306
-msgid "free"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:364
 msgid "Change Case"
 msgstr "Modificare capitalizzazioned dei caratteri"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:558
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:365
 msgid "Upper Case"
 msgstr "Maiuscole"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:559
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:366
 msgid "Lower Case"
 msgstr "Minuscole"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:367
 msgid "Swap Case"
 msgstr "Inverti capitalizzazione dei caratteri"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:561
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:368
 msgid "Title Case"
 msgstr "Caratteri per titolo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:983
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:837
 msgid "Drag to resize"
 msgstr "Trasinare per ridimensionare"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1015
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:869
 msgid "Show"
 msgstr "Visualizza"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1022
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:876
 msgid "Hide"
 msgstr "Nascondi"
 
@@ -9862,7 +9940,9 @@ msgstr "Processa cartelle ricorsivamente"
 msgid ""
 "Add books to database even if they already exist. Comparison is done based "
 "on book titles."
-msgstr "Aggiunge libri al database anche se esistono già."
+msgstr ""
+"Aggiunge libri al database anche se esistono già. Il confronto è basato sui "
+"titoli."
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:282
 msgid "Add an empty book (a book with no formats)"
@@ -10604,13 +10684,11 @@ msgstr "Elenco delle ricerche salvate"
 
 #: /home/kovid/work/calibre/src/calibre/utils/config.py:700
 msgid "User-created tag browser categories"
-msgstr ""
+msgstr "Categorie del browser di tag create dall'utente"
 
 #: /home/kovid/work/calibre/src/calibre/utils/config.py:702
-msgid "Preserve all collections even if not in library metadata."
-msgstr ""
-"Conserva tutte le collezioni anche se non presenti nei metadati della "
-"biblioteca."
+msgid "How and when calibre updates metadata on the device."
+msgstr "Come e quando calibre aggiorna i metadati nel dispositivo."
 
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:43
 msgid "Waiting..."
@@ -11601,6 +11679,9 @@ msgstr "Non scaricare i fogli di stile CSS"
 #~ "Cerca nella lista dei libri per titolo, autore, editore, tag e "
 #~ "commenti<br><br>Parole separate da spazi hanno come operatore AND"
 
+#~ msgid "Convert E-books"
+#~ msgstr "Converti libri"
+
 #~ msgid ""
 #~ "%%prog [options] ARG\n"
 #~ "\n"
@@ -12774,3 +12855,27 @@ msgstr "Non scaricare i fogli di stile CSS"
 
 #~ msgid "Connect to iTunes (EXPERIMENTAL)"
 #~ msgstr "Connetti ad iTunes (SPERIMENTALE)"
+
+#~ msgid "Preserve device collections."
+#~ msgstr "Conserva le collezioni del dispositivo."
+
+#~ msgid ""
+#~ "If checked, collections will not be deleted even if a book with changed "
+#~ "metadata is resent and the collection is not in the book's metadata. In "
+#~ "addition, editing collections in the device view will be enabled. If "
+#~ "unchecked, collections will be always reflect only the metadata in the "
+#~ "calibre library."
+#~ msgstr ""
+#~ "Se attivo, le collezioni non verranno eliminate anche se un libro con i "
+#~ "metadati cambiati viene inviato e la collezione non è tra i metadati del "
+#~ "libro. In più, viene abilitata la modifica delle collezioni nel dispositivo. "
+#~ "Se disattivato, le collezioni rifletteranno sempre e solo i metadati nella "
+#~ "biblioteca di calibre."
+
+#~ msgid "  "
+#~ msgstr "  "
+
+#~ msgid "Preserve all collections even if not in library metadata."
+#~ msgstr ""
+#~ "Conserva tutte le collezioni anche se non presenti nei metadati della "
+#~ "biblioteca."
diff --git a/src/calibre/translations/nl.po b/src/calibre/translations/nl.po
index 952e6cd90c..e60391ffd3 100644
--- a/src/calibre/translations/nl.po
+++ b/src/calibre/translations/nl.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-07-10 16:12+0000\n"
-"PO-Revision-Date: 2010-07-10 12:21+0000\n"
+"PO-Revision-Date: 2010-07-11 12:11+0000\n"
 "Last-Translator: Koen Mercken <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: 2010-07-11 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-07-12 03:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:365
@@ -5743,6 +5743,15 @@ msgid ""
 "<li><b>Automatic management</b>: Calibre automatically keeps metadata on the "
 "device in sync with the calibre library, on every connect</li></ul>"
 msgstr ""
+"<li><b>Handmatig beleid</b>: Calibre past de metadata aan en voegt "
+"collecties toe enkel op het moment dat er een boek wordt verstuurd. Als deze "
+"optie aan staat zal calibre nooit een collectie verwijderen.</li>\n"
+"<li><b>Enkel verzenden</b>: Calibre past de metadata aan en voegt collecties "
+"toe of verwijderd ze alleen op het moment dat er een boek naar het apparaat "
+"wordt verstuurd.</li>\n"
+"<li><b>Automatisch beleid</b>: Calibre syncroniseert metadata op het "
+"apparaat met de metadata in de calibre bibliotheek bij iedere connectie met "
+"het apparaat.</li></ul>"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:162
 msgid ""
@@ -5936,7 +5945,7 @@ msgstr "Blokkeer &animaties"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
 msgid "Show &donate button (restart)"
-msgstr ""
+msgstr "Geef &donatieknop weer (herstart)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
 msgid "Add an email address to which to send books"
@@ -6177,7 +6186,7 @@ msgstr "Maak en wijzig tag-gebaseerde kolommen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:19
 msgid "Text, column shown in the tag browser"
-msgstr ""
+msgstr "Text, kolom weergegeven in de label bladeraar"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:22
 msgid "Comma separated text, like tags, shown in the tag browser"
@@ -6185,11 +6194,11 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:25
 msgid "Long text, like comments, not shown in the tag browser"
-msgstr ""
+msgstr "Lange text, zoals commentaren, niet weergeven in de label bladeraar."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:28
 msgid "Text column for keeping series-like information"
-msgstr ""
+msgstr "Text kolom voor het bewaren van series informatie"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:33
 msgid "Floating point numbers"
@@ -6275,6 +6284,8 @@ msgstr ""
 msgid ""
 "Column heading in the library view and category name in the tag browser"
 msgstr ""
+"Kolom hoofd in de bibliotheek weergave en categorie naam in de label "
+"bladeraar"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column_ui.py:106
 msgid "Column &type"
@@ -6373,6 +6384,8 @@ msgid ""
 "All checked books will be <b>permanently deleted</b> from your device. "
 "Please verify the list."
 msgstr ""
+"Alle aangevinkte boeken zullen <b>definitief verwijderd worden</b> van het "
+"apparaat. Gelieve de lijst te verifiëren."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75
 msgid "Location"
@@ -6670,11 +6683,13 @@ msgstr "Dit ISBN nummer is ongeldig"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:521
 msgid "Cannot use tag editor"
-msgstr ""
+msgstr "Het is niet mogelijk om het labelopmaakprogramma te gebruiken"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:522
 msgid "The tags editor cannot be used if you have modified the tags"
 msgstr ""
+"Het labelopmaakprogramma kan niet gebruikt worden als u de labels hebt "
+"gewijzigd"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:542
 msgid "Downloading cover..."
@@ -6859,7 +6874,7 @@ msgstr "Voeg de nieuwe opgeslagen zoekopdracht toe"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:91
 msgid "Change the contents of the saved search"
-msgstr ""
+msgstr "Verander de inhoud van de opgeslagen zoekopdracht"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:119
 msgid "Need username and password"
@@ -7132,54 +7147,58 @@ msgstr " (in geen enkel boek)"
 msgid ""
 "The current tag category will be <b>permanently deleted</b>. Are you sure?"
 msgstr ""
+"De huidige labelcategorie zal <b>definitief verwijderd worden</b>. Bent u "
+"zeker??"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:153
 msgid "User Categories Editor"
-msgstr ""
+msgstr "Gebruiker categorien opmaakprogramma"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:154
 msgid "A&vailable items"
-msgstr ""
+msgstr "Beschikbare items"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:155
 msgid "Apply tags to current tag category"
-msgstr ""
+msgstr "Pas labels toe op de huidige labelcategorie"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:157
 msgid "A&pplied items"
-msgstr ""
+msgstr "Toegepaste items"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:158
 msgid "Unapply (remove) tag from current tag category"
-msgstr ""
+msgstr "Verwijder het label van de huidige labelcategorie"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:160
 msgid "Category name: "
-msgstr ""
+msgstr "Categorienaam: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:161
 msgid "Select a category to edit"
-msgstr ""
+msgstr "Selecteer een categorie om te wijzigen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:162
 msgid "Delete this selected tag category"
-msgstr ""
+msgstr "Verwijder de geselecteerde labelcategory"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:164
 msgid "Enter a new category name. Select the kind before adding it."
 msgstr ""
+"Geef een nieuwe categorienaam in. Selecteer het type voor dat u de naam "
+"toevoegd."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:165
 msgid "Add the new category"
-msgstr ""
+msgstr "Voeg de nieuwe categorie toe"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:167
 msgid "Category filter: "
-msgstr ""
+msgstr "Categoriefilter: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:168
 msgid "Select the content kind of the new category"
-msgstr ""
+msgstr "Selecteer het type inhoud voor de nieuwe categorie"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor.py:68
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:101
@@ -7241,37 +7260,38 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:20
 msgid "%s (was %s)"
-msgstr ""
+msgstr "%s (was %)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:501
 msgid "Item is blank"
-msgstr ""
+msgstr "Veld is leeg"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:71
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:502
 msgid "An item cannot be set to nothing. Delete it instead."
-msgstr ""
+msgstr "Een veld kan niet leeg zijn. U dient het te verwijderen."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:87
 msgid "No item selected"
-msgstr ""
+msgstr "Geen item geselecteerd"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:88
 msgid "You must select one item from the list of Available items."
 msgstr ""
+"U dient één van de items te selecteren uit de lijst van beschikbare items."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:97
 msgid "No items selected"
-msgstr ""
+msgstr "Geen items geselecteerd"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:98
 msgid "You must select at least one items from the list."
-msgstr ""
+msgstr "Je dient minstens één van de items uit de lijst te selecteren."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:102
 msgid "Are you certain you want to delete the following items?"
-msgstr ""
+msgstr "Bent je zeker dat je deze items wilt verwijderen?"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:72
 msgid "Category Editor"
diff --git a/src/calibre/translations/pl.po b/src/calibre/translations/pl.po
index 01193151cd..58bc87ee20 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: 2010-07-09 22:00+0000\n"
-"PO-Revision-Date: 2010-07-09 20:33+0000\n"
-"Last-Translator: Bartosz Kaszubowski <gosimek@gmail.com>\n"
+"POT-Creation-Date: 2010-07-10 16:12+0000\n"
+"PO-Revision-Date: 2010-07-11 14:18+0000\n"
+"Last-Translator: Maciej Jędrusik <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: 2010-07-10 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-07-12 03:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
@@ -28,7 +28,7 @@ msgstr "Ta opcja zupełnie nic nie zmienia"
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:71
 #: /home/kovid/work/calibre/src/calibre/devices/prs500/books.py:267
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:492
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:396
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:398
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:97
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:100
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/metadata.py:56
@@ -112,10 +112,10 @@ msgstr "Ta opcja zupełnie nic nie zmienia"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:110
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:135
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:898
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:907
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1190
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1193
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:899
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:908
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1191
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1194
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:120
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:155
@@ -489,7 +489,7 @@ msgstr "Umożliwia komunikację z telefonami S60."
 
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:87
 msgid "Communicate with iTunes/iBooks."
-msgstr ""
+msgstr "Umożliwia komunikację z aplikacjami iTunes/iBooks."
 
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:93
 msgid "Apple device detected, launching iTunes, please wait ..."
@@ -517,7 +517,7 @@ msgstr "zakończone"
 
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:544
 msgid "Use Series as Category in iTunes/iBooks"
-msgstr ""
+msgstr "Używaj serii jako kategorii w iTunes/iBooks"
 
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:546
 msgid "Cache covers from iTunes/iBooks"
@@ -529,12 +529,17 @@ msgid ""
 "Delete using the iBooks app.\n"
 "Click 'Show Details' for a list."
 msgstr ""
+"Niektóre książki nie zostały znalezione w bazie danych iTunes.\n"
+"Usuwam używając aplikacji iBooks.\n"
+"Kliknij 'Pokaż szczegóły', aby zobaczyć listę."
 
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:886
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
 msgstr ""
+"Niektóre grafiki okładek nie mogły zostać przekonwertowane.\n"
+"Kliknij 'Pokaż szczegóły', aby zobaczyć listę."
 
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2471
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:807
@@ -550,7 +555,7 @@ msgstr "Aktualności"
 
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2698
 msgid "Communicate with iTunes."
-msgstr ""
+msgstr "Umożliwia komunikację z aplikacją iTunes"
 
 #: /home/kovid/work/calibre/src/calibre/devices/binatone/driver.py:17
 msgid "Communicate with the Binatone Readme eBook reader."
@@ -576,7 +581,7 @@ msgstr "Umożliwia komunikację z czytnikiem książek EB600."
 
 #: /home/kovid/work/calibre/src/calibre/devices/eb600/driver.py:193
 msgid "Communicate with the Astak Mentor EB600"
-msgstr ""
+msgstr "Umożliwia komunikację z czytnikiem Astak Mentor EB600"
 
 #: /home/kovid/work/calibre/src/calibre/devices/eb600/driver.py:216
 msgid "Communicate with the PocketBook 301 reader."
@@ -695,30 +700,30 @@ msgstr "Umożliwia komunikację z czytnikiem Kobo Reader."
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:64
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:67
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:70
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:130
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:137
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:160
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:132
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:139
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:162
 msgid "Getting list of books on device..."
 msgstr "Pobieranie listy książek znajdujących się na urządzeniu"
 
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:219
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:263
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:244
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:262
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:246
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:264
 msgid "Removing books from device..."
 msgstr "Usuwanie książek z urządzenia..."
 
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:267
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:274
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:269
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:274
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:271
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:276
 msgid "Removing books from device metadata listing..."
 msgstr "Usuwanie książki z urządzenia metadanych lista"
 
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:279
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:313
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:208
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:238
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:210
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:240
 msgid "Adding books to device metadata listing..."
 msgstr "Dodanie książki do urządzenia metadanych lista..."
 
@@ -732,11 +737,11 @@ msgstr "Umożliwia komunikację z czytnikiem Booq Avant"
 
 #: /home/kovid/work/calibre/src/calibre/devices/misc.py:55
 msgid "Communicate with the Sweex MM300"
-msgstr ""
+msgstr "Umożliwia komunikację z czytnikiem Sweex MM300."
 
 #: /home/kovid/work/calibre/src/calibre/devices/misc.py:75
 msgid "Communicate with the Pandigital Novel"
-msgstr ""
+msgstr "Umożliwia komunikację z czytnikiem Pandigital Novel."
 
 #: /home/kovid/work/calibre/src/calibre/devices/nokia/driver.py:17
 msgid "Communicate with the Nokia 770 internet tablet."
@@ -748,7 +753,7 @@ msgstr "Umożliwia komunikację z tabletem internetowym Nokia 810."
 
 #: /home/kovid/work/calibre/src/calibre/devices/nokia/driver.py:74
 msgid "Communicate with the Nokia E52"
-msgstr ""
+msgstr "Umożliwia komunikację z telefonem Nokia E52."
 
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:20
 msgid "The Nook"
@@ -887,12 +892,12 @@ msgstr "Umożliwia komunikację z czytnikiem książek."
 msgid "Get device information..."
 msgstr "Pobierz informacje o urządzeniu..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:188
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:192
 msgid "Transferring books to device..."
 msgstr "Przenoszenie książek na urządzenie..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:305
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:307
 msgid "Sending metadata to device..."
 msgstr "Przesyłanie danych meta do urządzenia..."
 
@@ -1267,6 +1272,9 @@ msgid ""
 "preference to the auto-generated one. With this option, the auto-generated "
 "one is always used."
 msgstr ""
+"Zazwyczaj, jeżeli plik źródłowy ma już spis treści, jest on używany zamiast "
+"wygenerowanego automatycznie. Z tą opcją, wygenerowany automatycznie spis "
+"treści jest zawsze używany."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:213
 msgid "Don't add auto-detected chapters to the Table of Contents."
@@ -1572,9 +1580,9 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/epubcheck.py:22
 msgid ""
 "Workarounds for bugs in the latest release of epubcheck. epubcheck reports "
-"many things as errors that are not actually errors. %prog will try to detect "
-"these and replace them with constructs that epubcheck likes. This may cause "
-"significant changes to your epub, complain to the epubcheck project."
+"many things as errors that are not actually errors. epub-fix will try to "
+"detect these and replace them with constructs that epubcheck likes. This may "
+"cause significant changes to your epub, complain to the epubcheck project."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/main.py:19
@@ -1590,7 +1598,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/main.py:50
 msgid "You must specify an epub file"
-msgstr ""
+msgstr "Musisz wybrać plik EPUB"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:17
 msgid "Fix unmanifested files"
@@ -1598,8 +1606,8 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:21
 msgid ""
-"Fix unmanifested files. %prog can either add them to the manifest or delete "
-"them as specified by the delete unmanifested option."
+"Fix unmanifested files. epub-fix can either add them to the manifest or "
+"delete them as specified by the delete unmanifested option."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:32
@@ -1661,7 +1669,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:169
 msgid "Start"
-msgstr ""
+msgstr "Rozpocznij"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/fb2/fb2ml.py:144
 #: /home/kovid/work/calibre/src/calibre/ebooks/rb/rbml.py:102
@@ -2135,7 +2143,7 @@ msgstr "Nie znaleziono okładki"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/covers.py:15
 msgid "Cover download"
-msgstr ""
+msgstr "Pobiranie okładki"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/douban.py:42
 msgid "Downloads metadata from Douban.com"
@@ -2183,7 +2191,7 @@ msgstr "Pobierz metadane społecznościowe z amazon.com"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:213
 msgid "Downloads series/tags/rating information from librarything.com"
-msgstr ""
+msgstr "Pobieraj serię/etykiety/oceny z librarything.com"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:95
 msgid ""
@@ -2287,6 +2295,7 @@ msgstr "Wszystkie artykuły"
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:258
 msgid "This is an Amazon Topaz book. It cannot be processed."
 msgstr ""
+"To jest książka z czytnika Amazon Topaz. Nie może ona zostać przetworzona."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1400
 msgid "Title Page"
@@ -3002,7 +3011,7 @@ msgstr "Nie można było odczytać metadanych z nastepujących"
 #: /home/kovid/work/calibre/src/calibre/gui2/actions.py:429
 #: /home/kovid/work/calibre/src/calibre/gui2/actions.py:434
 msgid "Add to library"
-msgstr ""
+msgstr "Dodaj do biblioteki"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions.py:429
 #: /home/kovid/work/calibre/src/calibre/gui2/actions.py:459
@@ -3040,14 +3049,14 @@ msgid "Main memory"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions.py:519
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:444
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:454
 msgid "Storage Card A"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions.py:520
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:446
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:455
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:447
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:456
 msgid "Storage Card B"
 msgstr ""
 
@@ -3111,7 +3120,7 @@ msgid "Failed to download metadata:"
 msgstr "Nie udało się pobrać metadanych:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions.py:659
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:637
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:638
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:523
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:951
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
@@ -3281,7 +3290,7 @@ msgid "The specified directory could not be processed."
 msgstr "Wybrany folder nie może byc przetworzony."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:840
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "No books"
 msgstr "Brak książek"
 
@@ -3437,12 +3446,12 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:248
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:253
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:259
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:265
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:149
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:186
@@ -3499,7 +3508,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:56
 msgid "Click to open"
-msgstr ""
+msgstr "Kliknij, aby otworzyć"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:305
@@ -3510,13 +3519,13 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:467
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:274
 msgid "None"
 msgstr "Brak"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:310
 msgid "Click to open Book Details window"
-msgstr ""
+msgstr "Kliknij, aby otworzyć szczegóły ksiązki w oknie"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_csv_xml.py:16
 msgid "CSV/XML Options"
@@ -4359,12 +4368,12 @@ msgid "Footer regular expression:"
 msgstr "Wyrażenie regularne dla stopki:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:56
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:76
 msgid "Invalid regular expression"
 msgstr "Nieprawidłowe wyrażenie regularne"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:77
 msgid "Invalid regular expression: %s"
 msgstr "Niewłaściwe wyrażenie regularne: %s"
 
@@ -4637,124 +4646,124 @@ msgstr ""
 msgid "tags to remove"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:49
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:135
 msgid "No details available."
 msgstr "Brak szczegółów."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:155
 msgid "Device no longer connected."
 msgstr "Urządzenie zostało już odłączone."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:270
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:271
 msgid "Get device information"
 msgstr "Pobierz informacje o urządzeniach"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:282
 msgid "Get list of books on device"
 msgstr "Pozyskaj listę książek na urządzeniu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:292
 msgid "Get annotations from device"
 msgstr "Pobierz adnotacje  z urządzenia"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:301
 msgid "Send metadata to device"
 msgstr "Prześlij metadane do urządzenia"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:305
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:306
 msgid "Send collections to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:329
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:330
 msgid "Upload %d books to device"
 msgstr "Prześlij %d książek na urządzenie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:345
 msgid "Delete books from device"
 msgstr "Usuń książki na urządzeniu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:362
 msgid "Download books from device"
 msgstr "Pobierz książki z urządzenia"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:372
 msgid "View book on device"
 msgstr "Zobacz ksiązki na urządzeniu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:408
 msgid "Set default send to device action"
 msgstr "Ustaw domyślne działanie przesyłania na urządzenie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:413
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:420
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:422
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:423
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:425
 msgid "Email to"
 msgstr "Prześlij emailem do"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:425
 msgid " and delete from library"
-msgstr ""
+msgstr " i usuń z biblioteki"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:434
 msgid "Send to main memory"
 msgstr "Prześlij do głównej pamięci"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:436
 msgid "Send to storage card A"
 msgstr "Prześlij na kartę pamięci A"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:437
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:438
 msgid "Send to storage card B"
 msgstr "Prześlij na kartę pamięci B"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:442
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:452
 msgid "Main Memory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:469
-msgid "Send and delete from library"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:470
+msgid "Send and delete from library"
+msgstr "Wyślij i usuń z biblioteki"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:471
 msgid "Send specific format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:509
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:510
 msgid "Connect to folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:516
 msgid "Connect to iTunes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:520
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:521
 msgid "Eject device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:529
 msgid "Fetch annotations (experimental)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:638
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:639
 msgid "Error communicating with device"
 msgstr "Błąd podczas komunikacji z urządzeniem"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:659
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:660
 msgid "Select folder to open as device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:704
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:705
 msgid "Failed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:710
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:711
 msgid "Error talking to device"
 msgstr "Błąd komunikacji z urządzeniem"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:711
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:712
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
@@ -4762,138 +4771,138 @@ 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/device.py:753
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:754
 msgid "Device: "
 msgstr "Urządzenie: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:755
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:756
 msgid " detected."
 msgstr " wykryte"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:842
 msgid "selected to send"
 msgstr "wybranych do wysłania"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:846
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:847
 msgid "Choose format to send to device"
 msgstr "Wybierz format plików przesyłanych na urządzenie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:855
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:856
 msgid "No device"
 msgstr "Brak urządzenia"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:856
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:857
 msgid "Cannot send: No device is connected"
 msgstr "Nie można było przesłać: Żadne urządenie nie jest podłączone"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:859
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:863
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:860
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
 msgid "No card"
 msgstr "Brak karty"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:860
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
 msgid "Cannot send: Device has no storage card"
 msgstr "Nie można przesłać: Urządzenie nie posiada karty pamięci"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:905
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:906
 msgid "E-book:"
 msgstr "E-book:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:908
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:909
 msgid "Attached, you will find the e-book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:909
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:910
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:181
 msgid "by"
 msgstr "przez"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:910
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:911
 msgid "in the %s format."
 msgstr "w formacie %s."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:923
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:924
 msgid "Sending email to"
 msgstr "Wysyłanie wiadomości do"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:953
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:961
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1053
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1115
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1234
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1242
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:954
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:962
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1054
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1235
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1243
 msgid "No suitable formats"
 msgstr "Brak odpowiednich formatów"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:954
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:955
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 "Dokonać automatycznej konwersji następujących książek przed wysłaniem ich "
 "poprzez email?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:962
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:963
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 "Nie można było przesłać następujących książek poprzez email, ponieważ nie "
 "znaleziono odpowiednich formatów:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:980
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:981
 msgid "Failed to email books"
 msgstr "Przesłanie książek na email nie powiodło się"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:981
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:982
 msgid "Failed to email the following books:"
 msgstr "Przesłanie następujących książek poprzez email nie powiodło się:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:985
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:986
 msgid "Sent by email:"
 msgstr "Preślij poprzez email:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1012
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1013
 msgid "News:"
 msgstr "Aktualności:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1014
 msgid "Attached is the"
 msgstr "Załączony jest"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1024
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1025
 msgid "Sent news to"
 msgstr "Wysyłaj aktualności do"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1054
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1235
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1055
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1117
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1236
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 "Dokonać automatycznej konwersji następujących książek przed przesłaniem ich "
 "na urządzenie?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1084
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1085
 msgid "Sending catalogs to device."
 msgstr "Trwa wysyłanie katalogów do urządzenia"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1148
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1149
 msgid "Sending news to device."
 msgstr "Przesyłanie aktualności na urządzenie."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1201
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1202
 msgid "Sending books to device."
 msgstr "Wysyłanie książek do urządzenia."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1243
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1244
 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:1304
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1305
 msgid "No space on device"
 msgstr "Brak miejsca na urządzeniu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1305
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1306
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
@@ -5170,7 +5179,7 @@ msgid "Access log:"
 msgstr "Dziennik dostępów:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:794
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:332
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:331
 msgid "Failed to start content server"
 msgstr "Włączanie serwera zakończone niepowodzeniem"
 
@@ -5236,22 +5245,22 @@ msgid ""
 "folder directly."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:133
 msgid "TabWidget"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:134
 msgid ""
 "Here you can control how calibre will read metadata from the files you add "
 "to it. calibre can either read metadata from the contents of the file, or "
 "from the filename."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:135
 msgid "Read metadata only from &file name"
 msgstr "Odczytaj metadane jedynie z &nazwy pliku"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:136
 msgid ""
 "Swap the firstname and lastname of the author. This affects only metadata "
 "read from file names."
@@ -5259,11 +5268,11 @@ msgstr ""
 "Zamień pozycjami imię i nazwisko autora. To ma wpływ jedynie na metadane "
 "odczytywane z nazw plików."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:137
 msgid "&Swap author firstname and lastname"
 msgstr "&Zamień pozycjami imię i nazwisko"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:138
 msgid ""
 "If an existing book with a similar title and author is found that does not "
 "have the format being added, the format is added\n"
@@ -5274,94 +5283,105 @@ msgid ""
 "punctuation, case, etc. Author match is exact."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:142
 msgid ""
 "If books with similar titles and authors found, &merge the new files "
 "automatically"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:143
 msgid "&Configure metadata from file name"
 msgstr "&Konfiguruj metadane pobierane z nazwy pliku"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:144
 msgid "&Adding books"
 msgstr "&Dodawanie książek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:145
 msgid ""
 "Here you can control how calibre will save your books when you click the "
 "Save to Disk button:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:146
 msgid "Save &cover separately"
 msgstr "Zapisuj &okładki osobno"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:147
 msgid "Update &metadata in saved copies"
 msgstr "Uaktualnij &metadane w zapisanych kopiach"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:148
 msgid "Save metadata in &OPF file"
 msgstr "Zapisz metadane w pliku &OPF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:149
 msgid "Convert non-English characters to &English equivalents"
 msgstr ""
 "Zamieniaj znaki nie w języku angielskiem na ich &angielskie odpowiedniki"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:150
 msgid "Format &dates as:"
 msgstr "Formatuj &daty według schematu:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:151
 msgid "File &formats to save:"
 msgstr "&Formaty pliku do zapisu:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:152
 msgid "Replace space with &underscores"
 msgstr "Zastąp spacje &podkreślnikami"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:153
 msgid "Change paths to &lowercase"
 msgstr "Zmieniaj ścieżki na &małe litery"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:154
 msgid "&Saving books"
 msgstr "&Zapisywanie książek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:135
-msgid "Preserve device collections."
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:155
+msgid "Metadata &management:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:156
+msgid "Manual management"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:157
+msgid "Only on send"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:158
+msgid "Automatic management"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:159
 msgid ""
-"If checked, collections will not be deleted even if a book with changed "
-"metadata is resent and the collection is not in the book's metadata. In "
-"addition, editing collections in the device view will be enabled. If "
-"unchecked, collections will be always reflect only the metadata in the "
-"calibre library."
+"<li><b>Manual Management</b>: Calibre updates the metadata and adds "
+"collections only when a book is sent. With this option, calibre will never "
+"remove a collection.</li>\n"
+"<li><b>Only on send</b>: Calibre updates metadata and adds/removes "
+"collections for a book only when it is sent to the device. </li>\n"
+"<li><b>Automatic management</b>: Calibre automatically keeps metadata on the "
+"device in sync with the calibre library, on every connect</li></ul>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:137
-msgid "  "
-msgstr "  "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:162
 msgid ""
 "Here you can control how calibre will save your books when you click the "
 "Send to Device button. This setting can be overriden for individual devices "
 "by customizing the device interface plugins in Preferences->Plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:163
 msgid "Sending to &device"
 msgstr "Przesyłanie na &urządzenie"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:168
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:174
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:201
 msgid "Preferences"
 msgstr "Preferencje"
@@ -5791,7 +5811,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:37
 msgid "Ratings, shown with stars"
-msgstr ""
+msgstr "Oceany pokazywane gwiazdkami"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:40
 msgid "Yes/No"
@@ -7081,11 +7101,11 @@ msgstr "Wyrażenie regularne (?P&lt;title&gt;)"
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:84
-#: /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:98
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:100
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:99
 msgid "No match"
 msgstr "Brak wyników"
 
@@ -7182,7 +7202,8 @@ msgid "Add Empty book. (Book entry with no formats)"
 msgstr "Dodaj pustą książkę (Wpis książki bez formatów)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:103
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:276
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:409
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:160
 msgid "Save to disk"
 msgstr "Zapisz na dysku"
 
@@ -7191,17 +7212,18 @@ msgid "Save to disk in a single directory"
 msgstr "Zapisz na dysku w pojedyńczym folderze"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:107
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:394
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:393
 msgid "Save only %s format to disk"
 msgstr "Zapisz na dysku jedynie pliki w formacie %s"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:111
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:397
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:396
 msgid "Save only %s format to disk in a single directory"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:120
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:166
 msgid "View"
 msgstr "Wyświetl"
 
@@ -7245,46 +7267,46 @@ msgstr "Stwórz katalog książek w Twojej bibliotece calibre"
 msgid "Run welcome wizard"
 msgstr "Uruchom kreator wstępnych ustawień"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:205
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:191
 msgid "Similar books..."
 msgstr "Podobne książki..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:223
 msgid "Add books to library"
-msgstr ""
+msgstr "Dodaj książki do biblioteki"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:232
 #: /home/kovid/work/calibre/src/calibre/gui2/init.py:239
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:246
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:253
 msgid "Manage collections"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:333
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:319
 msgid "Cover Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:337
 msgid "Tag Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:372
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:358
 msgid "version"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:359
 msgid "created by Kovid Goyal"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:377
 msgid "Connected "
 msgstr "Połączone "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:400
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:386
 msgid "Update found"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:445
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:454
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:430
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:439
 msgid "Book Details"
 msgstr ""
 
@@ -7347,6 +7369,222 @@ msgstr "Kliknij, aby zobaczyć listę aktywnych zadań."
 msgid " - Jobs"
 msgstr " - Zadania"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:64
+msgid ""
+"Library\n"
+"%d books"
+msgstr ""
+"Biblioteka\n"
+"%d książek"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:65
+msgid ""
+"Reader\n"
+"%s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:66
+msgid ""
+"Card A\n"
+"%s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:67
+msgid ""
+"Card B\n"
+"%s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:71
+msgid "Click to see the books available on your computer"
+msgstr "Kliknij, aby zobaczyć książki dostępne na twoim komputerze"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:74
+msgid "Click to see the books in the main memory of your reader"
+msgstr "Kliknij, aby zobaczyć książki na głównej pamięci twojego czytnika"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:75
+msgid "Click to see the books on storage card A in your reader"
+msgstr "Kliknij, aby zobaczyć książki na karcie pamięci A w twoim czytniku"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:76
+msgid "Click to see the books on storage card B in your reader"
+msgstr "Kliknij, aby zobaczyć książki na karcie pamięci B w twoim czytniku"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:84
+msgid "Books located at"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:100
+msgid "free"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:134
+msgid ""
+"Books display will be restricted to those matching the selected saved search"
+msgstr ""
+"Wyświetlane książki będą zawężone do pozycji z wybranego zapisanego "
+"wyszukiwania"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:136
+msgid "Advanced search"
+msgstr "Zaawansowane wyszukiwanie"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:141
+msgid ""
+"<p>Search the list of books by title, author, publisher, tags, comments, "
+"etc.<br><br>Words separated by spaces are ANDed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:316
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:142
+msgid "Reset Quick Search"
+msgstr "Wyczyść pasek wyszukiwania"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:328
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:144
+msgid "Copy current search text (instead of search name)"
+msgstr "Skopiuj aktualny tekst wyszukiwania (zamiast nazwy wyszukiwania)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:146
+msgid "Save current search under the name shown in the box"
+msgstr "Zapisz aktualne wyszukiwanie pod nazwą pokazaną w polu"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:148
+msgid "Delete current saved search"
+msgstr "Usuń aktualne, zapisane wyszukiwanie."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:150
+msgid "Add books"
+msgstr "Dodaj książki"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:151
+msgid "A"
+msgstr "A"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:153
+msgid "Remove books"
+msgstr "Usuń książki"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:154
+msgid "Del"
+msgstr "Usuń"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:406
+msgid "Edit meta info"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:406
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:156
+msgid "E"
+msgstr "E"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:157
+msgid "Merge book records"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:158
+msgid "M"
+msgstr "S"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:159
+msgid "Send to device"
+msgstr "Prześlij na urządzenie"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:409
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:161
+msgid "S"
+msgstr "S"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:162
+msgid "Fetch news"
+msgstr "Pobierz aktualności"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:163
+msgid "F"
+msgstr "F"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:164
+msgid "Convert books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:165
+msgid "C"
+msgstr "C"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:167
+msgid "V"
+msgstr "V"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:168
+msgid "Open containing folder"
+msgstr "Otwórz folder zawierający"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:169
+msgid "Show book details"
+msgstr "Pokaż szczegóły ksiązki"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:170
+msgid "Books by same author"
+msgstr "Książki tego samego autora"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:171
+msgid "Books in this series"
+msgstr "Książki z tej serii"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:172
+msgid "Books by this publisher"
+msgstr "Książki tego samego wydawcy"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:423
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:173
+msgid "Books with the same tags"
+msgstr "Książki z takimi samymi etykietami"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:176
+msgid "Ctrl+P"
+msgstr "Ctrl+P"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:177
+msgid "Help"
+msgstr "Pomoc"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:178
+msgid "Browse the calibre User Manual"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:179
+msgid "F1"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:284
 msgid "N"
 msgstr ""
@@ -7380,7 +7618,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:886
 msgid "In Library"
-msgstr ""
+msgstr "W bibliotece"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:890
 msgid "Size"
@@ -7396,11 +7634,11 @@ msgstr "Kliknij dwa razy, aby rozpocząć <b>edycję</b><br><br>"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:110
 msgid "Hide column %s"
-msgstr ""
+msgstr "Ukryj kolumnę %s"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:115
 msgid "Sort on %s"
-msgstr ""
+msgstr "Posortuj po kolumnie %s"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:116
 msgid "Ascending"
@@ -7428,11 +7666,11 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:153
 msgid "Show column"
-msgstr ""
+msgstr "Pokaż kolumnę"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:165
 msgid "Restore default layout"
-msgstr ""
+msgstr "Przywróć domyślny układ"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:525
 msgid "Not allowed"
@@ -7443,6 +7681,8 @@ msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
 msgstr ""
+"Przerzucanie bezpośrednio na urządzenie nie jest możliwe. Musisz najpierw "
+"dodać książkę do biblioteki calibre."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/config_ui.py:47
 msgid "Configure Viewer"
@@ -7541,20 +7781,20 @@ msgstr "Biblioteka calibre"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:86
 msgid "Choose a location for your calibre e-book library"
-msgstr ""
+msgstr "Wybierz lokalizację dla twojej biblioteki książek calibre"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:95
 msgid "Failed to create library"
-msgstr ""
+msgstr "Stworzenie biblioteki nie powiodło się"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:96
 msgid "Failed to create calibre library at: %r."
-msgstr ""
+msgstr "Stworzenie biblioteki w %r nie powiodło się"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:99
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:184
 msgid "Choose a location for your new calibre e-book library"
-msgstr ""
+msgstr "Wybierz lokalizację dla twojej nowej biblioteki książek calibre"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:153
 msgid "Initializing user interface..."
@@ -7567,6 +7807,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:179
 msgid "The database repair failed. Starting with a new empty library."
 msgstr ""
+"Naprawa bazy danych nie powiodła się. Uruchamiam z nową, pustą biblioteką."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:193
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:226
@@ -7587,6 +7828,9 @@ msgid ""
 "and repair it automatically? If you say No, a new empty calibre library will "
 "be created."
 msgstr ""
+"Twoja baza danych calibre wygląda na uszkodzoną. Chcesz spróbować naprawić "
+"ją automatycznie? Jeśli wybierzesz Nie zostanie stworzona nowa, pusta "
+"biblioteka."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:214
 msgid ""
@@ -7597,6 +7841,7 @@ msgstr ""
 msgid ""
 "Bad database location %r. Will start with  a new, empty calibre library"
 msgstr ""
+"Błędna lokalizacja bazy danych: %r. Uruchamiam z nową, pustą biblioteką."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:238
 msgid "Starting %s: Loading books..."
@@ -7635,163 +7880,34 @@ msgstr "spróbuj zrestartować komputer."
 msgid "try deleting the file"
 msgstr "spróbuj usunąć plik"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:131
 msgid "calibre"
 msgstr "calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:249
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:133
 msgid "&Restrict to:"
-msgstr ""
+msgstr "&Zawęź do:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:250
-msgid ""
-"Books display will be restricted to those matching the selected saved search"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:135
 msgid "set in ui.py"
 msgstr "usraw w ui.py"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:252
-msgid "Advanced search"
-msgstr "Zaawansowane wyszukiwanie"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:138
 msgid "Alt+S"
 msgstr "Alt+S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:255
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:139
 msgid "&Search:"
 msgstr "&Szukaj:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:256
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:257
-msgid ""
-"<p>Search the list of books by title, author, publisher, tags, comments, "
-"etc.<br><br>Words separated by spaces are ANDed"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:258
-msgid "Reset Quick Search"
-msgstr "Wyczyść pasek wyszukiwania"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:260
-msgid "Copy current search text (instead of search name)"
-msgstr "Skopiuj aktualny tekst wyszukiwania (zamiast nazwy wyszukiwania)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:262
-msgid "Save current search under the name shown in the box"
-msgstr "Zapisz aktualne wyszukiwanie pod nazwą pokazaną w polu"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:264
-msgid "Delete current saved search"
-msgstr "Usuń aktualne, zapisane wyszukiwanie."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:266
-msgid "Add books"
-msgstr "Dodaj książki"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:267
-msgid "A"
-msgstr "A"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:268
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:269
-msgid "Remove books"
-msgstr "Usuń książki"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:270
-msgid "Del"
-msgstr "Usuń"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:271
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:155
 msgid "Edit meta information"
 msgstr "Edytuj metadane"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:272
-msgid "E"
-msgstr "E"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:273
-msgid "Merge book records"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:274
-msgid "M"
-msgstr "S"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:275
-msgid "Send to device"
-msgstr "Prześlij na urządzenie"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
-msgid "S"
-msgstr "S"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
-msgid "Fetch news"
-msgstr "Pobierz aktualności"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
-msgid "F"
-msgstr "F"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
-msgid "Convert E-books"
-msgstr "Konwertuj ksiązki"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
-msgid "C"
-msgstr "C"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
-msgid "V"
-msgstr "V"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
-msgid "Open containing folder"
-msgstr "Otwórz folder zawierający"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
-msgid "Show book details"
-msgstr "Pokaż szczegóły ksiązki"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
-msgid "Books by same author"
-msgstr "Książki tego samego autora"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
-msgid "Books in this series"
-msgstr "Książki z tej serii"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
-msgid "Books by this publisher"
-msgstr "Książki tego samego wydawcy"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
-msgid "Books with the same tags"
-msgstr "Książki z takimi samymi etykietami"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:175
 msgid "Configure calibre"
 msgstr "Konfiguruj calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
-msgid "Ctrl+P"
-msgstr "Ctrl+P"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
-msgid "Help"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
-msgid "Browse the calibre User Manual"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
-msgid "F1"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:20
 msgid ""
 "Redirect console output to a dialog window (both stdout and stderr). Useful "
@@ -7820,6 +7936,7 @@ msgstr "Nie znaleziono wyników dla tej książki"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:553
 msgid "Search"
 msgstr "Szukaj"
 
@@ -7842,15 +7959,19 @@ msgstr ""
 "Wybierz zapisane wyszukiwanie lub wpisz nazwę dla nowego wyszukiwania do "
 "zapisu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:10
+msgid "Restrict to"
+msgstr "Zawęź do:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:48
 msgid "({0} of {1})"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:54
 msgid "(all books)"
 msgstr "(wszystkie książki)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:56
 msgid "({0} of all)"
 msgstr ""
 
@@ -7924,7 +8045,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:200
 msgid "Hide category %s"
-msgstr ""
+msgstr "Ukryj kategorię %s"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:203
 msgid "Show category"
@@ -8061,33 +8182,33 @@ msgstr "&Uruchom ponownie"
 msgid "Calibre Quick Start Guide"
 msgstr "Krótki przewodnik po calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:380
 msgid "Cannot configure"
 msgstr "Nie można konfigurować"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:376
 msgid "Cannot configure while there are running jobs."
 msgstr "Nie można konfigurować programu, gdy są aktywne jakieś zadania."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:382
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:381
 msgid "Cannot configure before calibre is restarted."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:424
 msgid "No detailed info available"
 msgstr "Brak szczegółowych informacji"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:425
 msgid "No detailed information is available for books on the device."
 msgstr "Brak szczegółowych informacji dla książek na urządzeniu."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:478
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:506
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:477
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:505
 msgid "Conversion Error"
 msgstr "Błąd podczas konwersji"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:479
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:478
 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."
@@ -8096,27 +8217,27 @@ msgstr ""
 "href=\"%s\">DRM</a>. Musisz najpierw usunąć to zabezpieczenie przy pomocy "
 "innego programu."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:492
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:491
 msgid "Recipe Disabled"
 msgstr "Źródło wyłączone"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:507
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:506
 msgid "<b>Failed</b>"
 msgstr "<b>Nie powiodło się</b>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:547
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:546
 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. "
 "Your donation helps keep calibre development going."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:573
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:572
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 "Niektóre zadania są aktywne. Jesteś pewnien, że chcesz zamknąć program?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:575
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
@@ -8126,11 +8247,11 @@ msgstr ""
 "                      Wyjście może spowodować uszkodzenie urządzenia.<br>\n"
 "                      Jesteś pewny, że chcesz wyjść?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:579
 msgid "WARNING: Active jobs"
 msgstr "OSTRZEŻENIE: Aktywne zadania"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:633
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:632
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -8616,93 +8737,45 @@ msgstr ""
 msgid "Print eBook"
 msgstr "Wydrukuj e-książkę"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
 msgid "Copy Image"
 msgstr "Kopiuj grafikę"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:240
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:239
 msgid "Paste Image"
 msgstr "Wklej grafikę"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:270
-msgid ""
-"Library\n"
-"%d books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:271
-msgid ""
-"Reader\n"
-"%s"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:272
-msgid ""
-"Card A\n"
-"%s"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:273
-msgid ""
-"Card B\n"
-"%s"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:277
-msgid "Click to see the books available on your computer"
-msgstr "Kliknij, aby zobaczyć książki dostępne na twoim komputerze"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:280
-msgid "Click to see the books in the main memory of your reader"
-msgstr "Kliknij, aby zobaczyć książki na głównej pamięci twojego czytnika"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:281
-msgid "Click to see the books on storage card A in your reader"
-msgstr "Kliknij, aby zobaczyć książki na karcie pamięci A w twoim czytniku"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:282
-msgid "Click to see the books on storage card B in your reader"
-msgstr "Kliknij, aby zobaczyć książki na karcie pamięci B w twoim czytniku"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:290
-msgid "Books located at"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:306
-msgid "free"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:364
 msgid "Change Case"
 msgstr "Zmień wielkość liter"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:558
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:365
 msgid "Upper Case"
 msgstr "Wielkie litery"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:559
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:366
 msgid "Lower Case"
 msgstr "Małe litery"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:367
 msgid "Swap Case"
 msgstr "Zamień wielkość liter"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:561
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:368
 msgid "Title Case"
 msgstr "Wielkość liter w tytule"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:983
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:837
 msgid "Drag to resize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1015
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:869
 msgid "Show"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1022
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:876
 msgid "Hide"
-msgstr ""
+msgstr "Ukryj"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:367
 msgid ""
@@ -8731,7 +8804,7 @@ msgstr "Przenoszenie biblioteki..."
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:466
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:467
 msgid "Failed to move library"
-msgstr "Przeniesienie biblioteki się nie powiodło"
+msgstr "Przeniesienie biblioteki nie powiodło się"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:521
 msgid "Invalid database"
@@ -9124,7 +9197,9 @@ msgstr ""
 msgid ""
 "Path to the calibre library. Default is to use the path stored in the "
 "settings."
-msgstr "Ś"
+msgstr ""
+"Ścieżka do biblioteki calibre. Domyślnie używana jest ścieżka zapisana w "
+"ustawieniach."
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:120
 msgid ""
@@ -9503,6 +9578,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:1770
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
+"<p>Przenoszenie starej bazy danych do biblioteki książek w %s<br><center>"
 
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:1799
 msgid "Copying <b>%s</b>"
@@ -9526,7 +9602,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:118
 msgid "Ratings"
-msgstr ""
+msgstr "Oceny"
 
 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:24
 msgid "The title"
@@ -9681,6 +9757,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:31
 msgid "Set a password to restrict access. By default access is unrestricted."
 msgstr ""
+"Ustaw hasło aby ograniczyć dostęp. Domyślnie dostęp jest nieograniczony."
 
 #: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:33
 msgid "Username for access. By default, it is: %default"
@@ -9748,11 +9825,11 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:192
 msgid "Library"
-msgstr ""
+msgstr "Biblioteka"
 
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:231
 msgid "Books in your library"
-msgstr ""
+msgstr "Książki w twojej bibliotece"
 
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:237
 msgid "By "
@@ -9838,7 +9915,7 @@ msgid "User-created tag browser categories"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/config.py:702
-msgid "Preserve all collections even if not in library metadata."
+msgid "How and when calibre updates metadata on the device."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:43
@@ -11127,6 +11204,9 @@ msgstr "Nie pobieraj arkuszy styli CSS."
 #~ msgstr ""
 #~ "<p>Aby uzyskać pomoc otwórz: <a href=\"%s\">Podręcznik Uzytkownika</a><br>"
 
+#~ msgid "Convert E-books"
+#~ msgstr "Konwertuj ksiązki"
+
 #~ msgid "Communicate with the Sony PRS-600/700/900 eBook reader."
 #~ msgstr "Umożliwia komunikację z czytnikami książek Sony PRS-600/700/900."
 
@@ -11169,3 +11249,6 @@ msgstr "Nie pobieraj arkuszy styli CSS."
 
 #~ msgid "Communicate with iBooks through iTunes."
 #~ msgstr "Umożliwia komunikację z iBooks poprzez iTunes."
+
+#~ msgid "  "
+#~ msgstr "  "