IGN:Added Qt toolkit translations for OK Cancel buttons and File dialogs

resources.py

@@ -5,7 +5,7 @@ __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
 '''
 Compile resource files.
 '''
-import os, sys
+import os, sys, glob
 sys.path.insert(1, os.path.join(os.getcwd(), 'src'))
 from calibre import __appname__
 
@@ -21,6 +21,19 @@ def main(args=sys.argv):
         path = value.replace('%p', 'src'+os.sep+__appname__)
         bytes = repr(open(path, 'rb').read())
         data += key + ' = ' + bytes + '\n\n'
+    
+    TPATH = '/usr/share/qt4/translations'
+    if os.path.exists(TPATH):
+         files = glob.glob(TPATH + '/qt_??.qm')
+    
+         for f in files:
+             key = os.path.basename(f).partition('.')[0]
+             bytes = repr(open(f, 'rb').read())
+             data += key + ' = ' + bytes + '\n\n'
+         
+    else:
+        print 'WARNING: Could not find Qt transations in', TPATH
+    
     open('src'+os.sep+__appname__+os.sep+'/resources.py', 'wb').write(data) 
     return 0
 

src/calibre/__init__.py

@@ -269,10 +269,7 @@ def fit_image(width, height, pwidth, pheight):
                             
     return scaled, int(width), int(height)
 
-def set_translator():
+def get_lang():
-    # To test different translations invoke as
-    # LC_ALL=de_DE.utf8 program
-    from calibre.translations.data import translations
     lang = locale.getdefaultlocale()[0]
     if lang is None and os.environ.has_key('LANG'): # Needed for OS X
         try:
@@ -283,16 +280,24 @@ def set_translator():
         match = re.match('[a-z]{2,3}', lang)
         if match:
             lang = match.group()
-            buf = None
+    return lang
-            if os.access(lang+'.po', os.R_OK):
+
-                buf = cStringIO.StringIO()
+def set_translator():
-                make(lang+'.po', buf)
+    # To test different translations invoke as
-                buf = cStringIO.StringIO(buf.getvalue())
+    # LC_ALL=de_DE.utf8 program
-            elif translations.has_key(lang):
+    from calibre.translations.data import translations
-                buf = cStringIO.StringIO(translations[lang])
+    lang = get_lang() 
-            if buf is not None:
+    if lang:
-                t = GNUTranslations(buf)
+        buf = None
-                t.install(unicode=True)
+        if os.access(lang+'.po', os.R_OK):
+            buf = cStringIO.StringIO()
+            make(lang+'.po', buf)
+            buf = cStringIO.StringIO(buf.getvalue())
+        elif translations.has_key(lang):
+            buf = cStringIO.StringIO(translations[lang])
+        if buf is not None:
+            t = GNUTranslations(buf)
+            t.install(unicode=True)
         
 set_translator()
 

src/calibre/gui2/__init__.py

@@ -3,13 +3,14 @@ __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
 """ The GUI """
 import sys, os, re, StringIO, traceback
 from PyQt4.QtCore import QVariant, QFileInfo, QObject, SIGNAL, QBuffer, \
-                         QByteArray, QLocale, QTranslator, QUrl
+                         QByteArray, QLocale, QTranslator, QUrl, QTranslator
 from PyQt4.QtGui import QFileDialog, QMessageBox, QPixmap, QFileIconProvider, \
-                        QIcon, QTableView, QDialogButtonBox
+                        QIcon, QTableView, QDialogButtonBox, QApplication
 
 ORG_NAME = 'KovidsBrain'
 APP_UID  = 'libprs500'
-from calibre import __author__, islinux, iswindows, Settings, isosx
+from calibre import __author__, islinux, iswindows, Settings, isosx, get_lang
+import calibre.resources as resources
 
 NONE = QVariant() #: Null value to return from the data function of item models
 
@@ -340,41 +341,23 @@ def pixmap_to_data(pixmap, format='JPEG'):
     pixmap.save(buf, format)
     return str(ba.data())
 
-class TranslatedDialogButtonBox(QDialogButtonBox):
-    
-    STRINGS = {
-               QDialogButtonBox.Ok              : (_('&OK'), QDialogButtonBox.AcceptRole), 
-               QDialogButtonBox.Open            : (_('&Open'), QDialogButtonBox.AcceptRole),
-               QDialogButtonBox.Save            : (_('&Save'), QDialogButtonBox.AcceptRole),
-               QDialogButtonBox.Cancel          : (_('Cancel'), QDialogButtonBox.RejectRole),
-               QDialogButtonBox.Close           : (_('&Close'), QDialogButtonBox.RejectRole),
-               QDialogButtonBox.Discard         : (_("&Don't Save") if isosx else _('&Discard'), QDialogButtonBox.DestructiveRole),
-               QDialogButtonBox.Apply           : (_('&Apply'), QDialogButtonBox.ApplyRole),
-               QDialogButtonBox.Reset           : (_('&Reset'), QDialogButtonBox.ResetRole),
-               QDialogButtonBox.RestoreDefaults : (_('Restore &Defaults'), QDialogButtonBox.ResetRole),
-               QDialogButtonBox.Help            : (_('&Help'), QDialogButtonBox.HelpRole),
-               QDialogButtonBox.SaveAll         : (_('Save &All'), QDialogButtonBox.AcceptRole),
-               QDialogButtonBox.Yes             : (_('&Yes'), QDialogButtonBox.YesRole),
-               QDialogButtonBox.YesToAll        : (_('Yes to &All'), QDialogButtonBox.YesRole),
-               QDialogButtonBox.No              : (_('&No'), QDialogButtonBox.NoRole),
-               QDialogButtonBox.NoToAll         : (_('N&o to All'), QDialogButtonBox.NoRole),
-               QDialogButtonBox.Abort           : (_('A&bort'), QDialogButtonBox.RejectRole),
-               QDialogButtonBox.Retry           : (_('Re&try'), QDialogButtonBox.AcceptRole),
-               QDialogButtonBox.Ignore          : (_('I&gnore'), QDialogButtonBox.AcceptRole),
-               }
-    
-    def setStandardButtons(self, buttons):
-        default = False
-        for i in self.STRINGS.keys():
-            if i & buttons:
-                msg, role = self.STRINGS[i]
-                button = self.addButton(msg, role)
-                if not default:
-                    default = True
-                    button.setDefault(True)
-
 
 try:
     from calibre.utils.single_qt_application import SingleApplication
 except:
     SingleApplication = None
+    
+class Application(QApplication):
+    
+    def __init__(self, args):
+        QApplication.__init__(self, args)
+        self.translator = QTranslator(self)
+        lang = get_lang()
+        if lang:
+            data = getattr(resources, 'qt_'+lang, None)
+            if data:
+                self.translator.loadFromData(data)
+                self.installTranslator(self.translator)
+                
+         
+        

src/calibre/gui2/lrf_renderer/main.py

@@ -2,14 +2,14 @@ __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
 import sys, logging, os, traceback, time, cPickle
 
-from PyQt4.QtGui import QApplication, QKeySequence, QPainter, QDialog
+from PyQt4.QtGui import QKeySequence, QPainter, QDialog
 from PyQt4.QtCore import Qt, QObject, SIGNAL, QCoreApplication, QThread, \
                          QVariant
 
 from calibre import __appname__, __version__, __author__, setup_cli_handlers, islinux, Settings
 from calibre.ebooks.lrf.parser import LRFDocument
 
-from calibre.gui2 import ORG_NAME, APP_UID, error_dialog, choose_files
+from calibre.gui2 import ORG_NAME, APP_UID, error_dialog, choose_files, Application
 from calibre.gui2.dialogs.conversion_error import ConversionErrorDialog
 from calibre.gui2.lrf_renderer.main_ui import Ui_MainWindow
 from calibre.gui2.lrf_renderer.config_ui import Ui_ViewerConfig
@@ -60,7 +60,7 @@ class Main(MainWindow, Ui_MainWindow):
         Ui_MainWindow.__init__(self)        
         self.setupUi(self)
         self.setAttribute(Qt.WA_DeleteOnClose)
-        self.setWindowTitle(__appname__ + ' - LRF Viewer')
+        self.setWindowTitle(__appname__ + _(' - LRF Viewer'))
     
         self.logger = logger
         self.opts = opts
@@ -294,7 +294,7 @@ def main(args=sys.argv, logger=None):
         return 1
     pid = os.fork() if islinux else -1
     if pid <= 0:
-        app = QApplication(args)
+        app = Application(args)
         QCoreApplication.setOrganizationName(ORG_NAME)
         QCoreApplication.setApplicationName(APP_UID)
         opts = normalize_settings(parser, opts)

src/calibre/gui2/main.py

@@ -17,7 +17,7 @@ from calibre.gui2 import APP_UID, warning_dialog, choose_files, error_dialog, \
                            initialize_file_icon_provider, question_dialog,\
                            pixmap_to_data, choose_dir, ORG_NAME, \
                            qstring_to_unicode, set_sidebar_directories, \
-                           SingleApplication
+                           SingleApplication, Application
 from calibre import iswindows, isosx
 from calibre.library.database import LibraryDatabase
 from calibre.gui2.update import CheckForUpdates
@@ -238,7 +238,7 @@ class Main(MainWindow, Ui_MainWindow):
             self.device_manager = DeviceManager(device)
             self.job_manager.run_device_job(self.info_read, self.device_manager.info_func())
             self.set_default_thumbnail(device.THUMBNAIL_HEIGHT)
-            self.status_bar.showMessage('Device: '+device.__class__.__name__+' detected.', 3000)
+            self.status_bar.showMessage(_('Device: ')+device.__class__.__name__+_(' detected.'), 3000)
             self.action_sync.setEnabled(True)
             self.device_connected = True
         else:
@@ -369,7 +369,7 @@ class Main(MainWindow, Ui_MainWindow):
         to_device = self.stack.currentIndex() != 0
         self._add_books(books, to_device)
         if to_device:
-            self.status_bar.showMessage('Uploading books to device.', 2000)
+            self.status_bar.showMessage(_('Uploading books to device.'), 2000)
         
     def _add_books(self, paths, to_device):
         on_card = False if self.stack.currentIndex() != 2 else True
@@ -463,7 +463,7 @@ class Main(MainWindow, Ui_MainWindow):
             id = self.remove_paths(paths)
             self.delete_memory[id] = (paths, view.model())
             view.model().mark_for_deletion(id, rows)
-            self.status_bar.showMessage('Deleting books from device.', 1000)
+            self.status_bar.showMessage(_('Deleting books from device.'), 1000)
             
     def remove_paths(self, paths):
         return self.job_manager.run_device_job(self.books_deleted,
@@ -585,11 +585,11 @@ class Main(MainWindow, Ui_MainWindow):
                     prefix = prefix.decode('ascii', 'ignore').encode('ascii', 'ignore')
                 names.append('%s_%d%s'%(prefix, id, os.path.splitext(f.name)[1]))
         self.upload_books(gf, names, good, on_card)
-        self.status_bar.showMessage('Sending books to device.', 5000)
+        self.status_bar.showMessage(_('Sending books to device.'), 5000)
         if bad:
             bad = '\n'.join('<li>%s</li>'%(i,) for i in bad)
-            d = warning_dialog(self, 'No suitable formats', 
+            d = warning_dialog(self, _('No suitable formats'), 
-                    'Could not upload the following books to the device, as no suitable formats were found:<br><ul>%s</ul>'%(bad,))
+                    _('Could not upload the following books to the device, as no suitable formats were found:<br><ul>%s</ul>')%(bad,))
             d.exec_()
                 
             
@@ -605,7 +605,7 @@ class Main(MainWindow, Ui_MainWindow):
             d = error_dialog(self, _('Cannot save to disk'), _('No books selected'))
             d.exec_()
             return
-        dir = choose_dir(self, 'save to disk dialog', 'Choose destination directory')
+        dir = choose_dir(self, 'save to disk dialog', ('Choose destination directory'))
         if not dir:
             return
         if self.current_view() == self.library_view:
@@ -672,7 +672,7 @@ class Main(MainWindow, Ui_MainWindow):
             return
         bad_rows = []
         
-        self.status_bar.showMessage('Starting Bulk conversion of %d books'%len(rows), 2000)
+        self.status_bar.showMessage(_('Starting Bulk conversion of %d books')%len(rows), 2000)
         
         for i, row in enumerate([r.row() for r in rows]):
             cmdline = list(d.cmdline)
@@ -762,7 +762,7 @@ class Main(MainWindow, Ui_MainWindow):
         data = open(of.name, 'rb')
         self.library_view.model().db.add_format(book_id, fmt, data, index_is_id=True)
         data.close()
-        self.status_bar.showMessage(description + ' completed', 2000)
+        self.status_bar.showMessage(description + (' completed'), 2000)
     
     #############################View book######################################
     
@@ -885,7 +885,7 @@ class Main(MainWindow, Ui_MainWindow):
                             os.makedirs(dirname)
                         dest = open(newloc, 'wb')
                         if os.access(self.database_path, os.R_OK):
-                            self.status_bar.showMessage('Copying database to '+newloc)
+                            self.status_bar.showMessage(_('Copying database to ')+newloc)
                             self.setCursor(Qt.BusyCursor)
                             self.library_view.setEnabled(False)
                             self.library_view.close()
@@ -1061,12 +1061,11 @@ class Main(MainWindow, Ui_MainWindow):
         
 
 def main(args=sys.argv):
-    from PyQt4.Qt import QApplication
     from calibre import singleinstance
     
     pid = os.fork() if islinux else -1
     if pid <= 0:
-        app = QApplication(args)    
+        app = Application(args)    
         QCoreApplication.setOrganizationName(ORG_NAME)
         QCoreApplication.setApplicationName(APP_UID)
         single_instance = None if SingleApplication is None else SingleApplication('calibre GUI')

src/calibre/gui2/make.py

@@ -39,9 +39,9 @@ def build_forms(forms):
             dat = dat.replace('import images_rc', 'from calibre.gui2 import images_rc')
             dat = dat.replace('from library import', 'from calibre.gui2.library import')
             dat = dat.replace('from widgets import', 'from calibre.gui2.widgets import')
-            dat += '\nfrom calibre.gui2 import TranslatedDialogButtonBox'
+            #dat += '\nfrom calibre.gui2 import TranslatedDialogButtonBox'
             dat = re.compile(r'QtGui.QApplication.translate\(.+?,\s+"(.+?)(?<!\\)",.+?\)', re.DOTALL).sub(r'_("\1")', dat)
-            dat = re.compile(r'QtGui.QDialogButtonBox').sub('TranslatedDialogButtonBox', dat)
+            #dat = re.compile(r'QtGui.QDialogButtonBox').sub('TranslatedDialogButtonBox', dat)
             open(compiled_form, 'wb').write(dat)
             
                 

src/calibre/translations/__init__.py

@@ -4,7 +4,7 @@ __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
 Manage translation of user visible strings.
 '''
 
-import sys, os, cStringIO, tempfile, subprocess, functools, tarfile, re
+import sys, os, cStringIO, tempfile, subprocess, functools, tarfile, re, time
 check_call = functools.partial(subprocess.check_call, shell=True)
 
 try:
@@ -74,6 +74,9 @@ def main(args=sys.argv):
         else:
             print 'Merging', os.path.basename(po)
             check_call('msgmerge -v -U -N --backup=none '+po + ' ' + fname)
+            raw = re.sub('"PO-Revision-Date.*?"', '"PO-Revision-Date: %s\\\\n"'%time.strftime('%Y-%m-%d %H:%M+%Z'), open(po).read())
+            open(po, 'wb').write(raw)
+            
         tf.add(po, os.path.basename(po))
         buf = cStringIO.StringIO()
         print 'Compiling translations'

src/calibre/translations/bg.po

@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: calibre 0.4.51\n"
-"POT-Creation-Date: 2008-05-20 11:42+PDT\n"
+"POT-Creation-Date: 2008-05-20 12:53+PDT\n"
-"PO-Revision-Date: 2008-05-05 05:15+PDT\n"
+"PO-Revision-Date: 2008-05-20 12:53+PDT\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: bg\n"
 "MIME-Version: 1.0\n"
@@ -2065,6 +2065,14 @@ msgstr ""
 msgid "Bulk convert"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:241
+msgid " detected."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:241
+msgid "Device: "
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:278
 msgid "Device database corrupted"
 msgstr ""
@@ -2097,6 +2105,10 @@ msgstr ""
 msgid "Duplicates found!"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:372
+msgid "Uploading books to device."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:430
 msgid "No space on device"
 msgstr ""
@@ -2105,6 +2117,10 @@ msgstr ""
 msgid "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:466
+msgid "Deleting books from device."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:500
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:519
 msgid "Cannot edit metadata"
@@ -2118,6 +2134,20 @@ msgstr ""
 msgid "No books selected"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:588
+msgid "Sending books to device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:591
+msgid "No suitable formats"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:592
+msgid ""
+"Could not upload the following books to the device, as no suitable formats "
+"were found:<br><ul>%s</ul>"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:605
 msgid "Cannot save to disk"
 msgstr ""
@@ -2139,6 +2169,10 @@ msgstr ""
 msgid "Cannot convert"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:675
+msgid "Starting Bulk conversion of %d books"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:797
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:815
 msgid "No book selected"
@@ -2167,6 +2201,10 @@ msgstr ""
 msgid "Cannot configure while there are running jobs."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:888
+msgid "Copying database to "
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:903
 msgid "Invalid database"
 msgstr ""

src/calibre/translations/ca.po

@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ca\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-20 11:42+PDT\n"
+"POT-Creation-Date: 2008-05-20 12:53+PDT\n"
-"PO-Revision-Date: 2007-11-16 09:07+0100\n"
+"PO-Revision-Date: 2008-05-20 12:53+PDT\n"
 "Last-Translator: calibre\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -2143,6 +2143,14 @@ msgstr "Converteix individualment"
 msgid "Bulk convert"
 msgstr "Converteix tots"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:241
+msgid " detected."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:241
+msgid "Device: "
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:278
 msgid "Device database corrupted"
 msgstr ""
@@ -2175,6 +2183,10 @@ msgstr ""
 msgid "Duplicates found!"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:372
+msgid "Uploading books to device."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:430
 msgid "No space on device"
 msgstr "Sense espai al dispositiu"
@@ -2183,6 +2195,10 @@ msgstr "Sense espai al dispositiu"
 msgid "<p>Cannot upload books to device there is no more free space available "
 msgstr "<p>No puc desar llibres al dispositiu perquè no hi ha espai restant"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:466
+msgid "Deleting books from device."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:500
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:519
 msgid "Cannot edit metadata"
@@ -2196,6 +2212,20 @@ msgstr "No puc editar les meta-dades"
 msgid "No books selected"
 msgstr "Cap llibre seleccionat"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:588
+msgid "Sending books to device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:591
+msgid "No suitable formats"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:592
+msgid ""
+"Could not upload the following books to the device, as no suitable formats "
+"were found:<br><ul>%s</ul>"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:605
 msgid "Cannot save to disk"
 msgstr "No puc desar al disc"
@@ -2217,6 +2247,10 @@ msgstr ""
 msgid "Cannot convert"
 msgstr "No puc convertir-lo"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:675
+msgid "Starting Bulk conversion of %d books"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:797
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:815
 msgid "No book selected"
@@ -2245,6 +2279,10 @@ msgstr "No puc configurar-lo"
 msgid "Cannot configure while there are running jobs."
 msgstr "No puc configurar-lo amb treballs processant-se"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:888
+msgid "Copying database to "
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:903
 msgid "Invalid database"
 msgstr ""

src/calibre/translations/de.po

@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libprs500 0.4.17\n"
-"POT-Creation-Date: 2008-05-20 11:42+PDT\n"
+"POT-Creation-Date: 2008-05-20 12:53+PDT\n"
-"PO-Revision-Date: 2008-04-05 00:04+0100\n"
+"PO-Revision-Date: 2008-05-20 12:53+PDT\n"
 "Last-Translator: S. Dorscht <stdoonline@googlemail.com>\n"
 "Language-Team: de\n"
 "MIME-Version: 1.0\n"
@@ -2296,6 +2296,14 @@ msgstr "Einzeln konvertieren"
 msgid "Bulk convert"
 msgstr "Auf einmal konvertieren"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:241
+msgid " detected."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:241
+msgid "Device: "
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:278
 msgid "Device database corrupted"
 msgstr "Gerätedatenbank ist beschädigt"
@@ -2344,6 +2352,10 @@ msgstr ""
 msgid "Duplicates found!"
 msgstr "Duplikate gefunden"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:372
+msgid "Uploading books to device."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:430
 msgid "No space on device"
 msgstr "Gerätespeicher voll"
@@ -2354,6 +2366,10 @@ msgstr ""
 "<p>Es können keine Bücher mehr auf das Gerät geladen werden, da der "
 "Gerätespeicher voll ist "
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:466
+msgid "Deleting books from device."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:500
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:519
 msgid "Cannot edit metadata"
@@ -2367,6 +2383,20 @@ msgstr "Kann Metadaten nicht bearbeiten"
 msgid "No books selected"
 msgstr "Keine Bücher ausgewählt"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:588
+msgid "Sending books to device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:591
+msgid "No suitable formats"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:592
+msgid ""
+"Could not upload the following books to the device, as no suitable formats "
+"were found:<br><ul>%s</ul>"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:605
 msgid "Cannot save to disk"
 msgstr "Speichern auf Festplatte nicht möglich"
@@ -2388,6 +2418,10 @@ msgstr "Nachrichten abgerufen. Übertragung ans Gerät läuft."
 msgid "Cannot convert"
 msgstr "Konvertierung nicht möglich"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:675
+msgid "Starting Bulk conversion of %d books"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:797
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:815
 msgid "No book selected"
@@ -2416,6 +2450,10 @@ msgstr "Konfiguration nicht möglich"
 msgid "Cannot configure while there are running jobs."
 msgstr "Konfiguration nicht möglich während Aufträge abgearbeitet werden."
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:888
+msgid "Copying database to "
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:903
 msgid "Invalid database"
 msgstr "Ungültige Datenbank"

src/calibre/translations/es.po

@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-20 11:42+PDT\n"
+"POT-Creation-Date: 2008-05-20 12:53+PDT\n"
-"PO-Revision-Date: 2007-11-16 09:21+0100\n"
+"PO-Revision-Date: 2008-05-20 12:53+PDT\n"
 "Last-Translator: calibre\n"
 "Language-Team: Spanish\n"
 "MIME-Version: 1.0\n"
@@ -2146,6 +2146,14 @@ msgstr "Convertir individualmente"
 msgid "Bulk convert"
 msgstr "Convertir en bloque"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:241
+msgid " detected."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:241
+msgid "Device: "
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:278
 msgid "Device database corrupted"
 msgstr ""
@@ -2178,6 +2186,10 @@ msgstr ""
 msgid "Duplicates found!"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:372
+msgid "Uploading books to device."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:430
 msgid "No space on device"
 msgstr "No hay espacio en el dispositivo"
@@ -2187,6 +2199,10 @@ msgid "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
 "<p>No se pueden guardar los libros porque no hay espacio en el dispositivo "
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:466
+msgid "Deleting books from device."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:500
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:519
 msgid "Cannot edit metadata"
@@ -2200,6 +2216,20 @@ msgstr "No se pueden editar los metadatos"
 msgid "No books selected"
 msgstr "No hay libros seleccionados"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:588
+msgid "Sending books to device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:591
+msgid "No suitable formats"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:592
+msgid ""
+"Could not upload the following books to the device, as no suitable formats "
+"were found:<br><ul>%s</ul>"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:605
 msgid "Cannot save to disk"
 msgstr "No se puede guardar en disco"
@@ -2221,6 +2251,10 @@ msgstr ""
 msgid "Cannot convert"
 msgstr "No se puede convertir"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:675
+msgid "Starting Bulk conversion of %d books"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:797
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:815
 msgid "No book selected"
@@ -2249,6 +2283,10 @@ msgstr "No se puede configurar"
 msgid "Cannot configure while there are running jobs."
 msgstr "No se puede configurar con trabajos en proceso."
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:888
+msgid "Copying database to "
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:903
 msgid "Invalid database"
 msgstr ""

src/calibre/translations/fr.po

@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: calibre 0.4.22\n"
-"POT-Creation-Date: 2008-05-20 11:42+PDT\n"
+"POT-Creation-Date: 2008-05-20 12:53+PDT\n"
-"PO-Revision-Date: 2008-01-20 09:59+0100\n"
+"PO-Revision-Date: 2008-05-20 12:53+PDT\n"
 "Last-Translator: FixB <fix.bornes@free.fr>\n"
 "Language-Team: fr\n"
 "MIME-Version: 1.0\n"
@@ -2162,6 +2162,14 @@ msgstr "Convertion individuelle"
 msgid "Bulk convert"
 msgstr "Convertion par lot"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:241
+msgid " detected."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:241
+msgid "Device: "
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:278
 msgid "Device database corrupted"
 msgstr ""
@@ -2196,6 +2204,10 @@ msgstr ""
 msgid "Duplicates found!"
 msgstr "Des doublons ont été détectés !"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:372
+msgid "Uploading books to device."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:430
 msgid "No space on device"
 msgstr "Le lecteur électronique n'a plus d'espace mémoire disponible"
@@ -2206,6 +2218,10 @@ msgstr ""
 "<p>Impossible d'envoyer les livres sur le lecteur : il n'y a plus assez "
 "d'espace mémoire disponible"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:466
+msgid "Deleting books from device."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:500
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:519
 msgid "Cannot edit metadata"
@@ -2219,6 +2235,20 @@ msgstr "Erreur à l'édition des metadat"
 msgid "No books selected"
 msgstr "Aucun livre sélectionné"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:588
+msgid "Sending books to device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:591
+msgid "No suitable formats"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:592
+msgid ""
+"Could not upload the following books to the device, as no suitable formats "
+"were found:<br><ul>%s</ul>"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:605
 msgid "Cannot save to disk"
 msgstr "Ne peut pas enregistrer sur le disque"
@@ -2240,6 +2270,10 @@ msgstr ""
 msgid "Cannot convert"
 msgstr "Conversion impossible"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:675
+msgid "Starting Bulk conversion of %d books"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:797
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:815
 msgid "No book selected"
@@ -2268,6 +2302,10 @@ msgstr "Configuration impossible"
 msgid "Cannot configure while there are running jobs."
 msgstr "Impossible de configurer pendant que des travaux sont en cours."
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:888
+msgid "Copying database to "
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:903
 msgid "Invalid database"
 msgstr "Base de données invalide"

src/calibre/translations/it.po

@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: it\n"
-"POT-Creation-Date: 2008-05-20 11:42+PDT\n"
+"POT-Creation-Date: 2008-05-20 12:53+PDT\n"
-"PO-Revision-Date: 2008-05-19 22:51+0200\n"
+"PO-Revision-Date: 2008-05-20 12:53+PDT\n"
 "Last-Translator: Iacopo Benesperi <iacchi@iacchi.org>\n"
 "Language-Team: italiano\n"
 "MIME-Version: 1.0\n"
@@ -2288,6 +2288,14 @@ msgstr "Converti individualmente"
 msgid "Bulk convert"
 msgstr "Converti in gruppo"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:241
+msgid " detected."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:241
+msgid "Device: "
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:278
 msgid "Device database corrupted"
 msgstr "Database del dispositivo corrotto"
@@ -2335,6 +2343,10 @@ msgstr ""
 msgid "Duplicates found!"
 msgstr "Scoperti duplicati!"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:372
+msgid "Uploading books to device."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:430
 msgid "No space on device"
 msgstr "Spazio insufficiente sul dispositivo"
@@ -2345,6 +2357,10 @@ msgstr ""
 "<p>Impossibile salvare libri sul dispositivo perché non c'è più spazio "
 "disponibile "
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:466
+msgid "Deleting books from device."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:500
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:519
 msgid "Cannot edit metadata"
@@ -2358,6 +2374,20 @@ msgstr "Impossibile modificare i metadati"
 msgid "No books selected"
 msgstr "Nessun libro selezionato"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:588
+msgid "Sending books to device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:591
+msgid "No suitable formats"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:592
+msgid ""
+"Could not upload the following books to the device, as no suitable formats "
+"were found:<br><ul>%s</ul>"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:605
 msgid "Cannot save to disk"
 msgstr "Impossibile salvare sul disco"
@@ -2379,6 +2409,10 @@ msgstr "Notizie scaricate. Salvataggio sul dispositivo"
 msgid "Cannot convert"
 msgstr "Impossibile convertire"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:675
+msgid "Starting Bulk conversion of %d books"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:797
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:815
 msgid "No book selected"
@@ -2407,6 +2441,10 @@ msgstr "Impossibile configurare"
 msgid "Cannot configure while there are running jobs."
 msgstr "Impossibile configurare mentre ci sono lavori in esecuzione"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:888
+msgid "Copying database to "
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:903
 msgid "Invalid database"
 msgstr "Database non valido"

src/calibre/translations/nds.po

@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: calibre 0.4.53\n"
-"POT-Creation-Date: 2008-05-20 11:42+PDT\n"
+"POT-Creation-Date: 2008-05-20 12:53+PDT\n"
-"PO-Revision-Date: 2008-05-12 06:21+PDT\n"
+"PO-Revision-Date: 2008-05-20 12:53+PDT\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: nds\n"
 "MIME-Version: 1.0\n"
@@ -2065,6 +2065,14 @@ msgstr ""
 msgid "Bulk convert"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:241
+msgid " detected."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:241
+msgid "Device: "
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:278
 msgid "Device database corrupted"
 msgstr ""
@@ -2097,6 +2105,10 @@ msgstr ""
 msgid "Duplicates found!"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:372
+msgid "Uploading books to device."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:430
 msgid "No space on device"
 msgstr ""
@@ -2105,6 +2117,10 @@ msgstr ""
 msgid "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:466
+msgid "Deleting books from device."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:500
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:519
 msgid "Cannot edit metadata"
@@ -2118,6 +2134,20 @@ msgstr ""
 msgid "No books selected"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:588
+msgid "Sending books to device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:591
+msgid "No suitable formats"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:592
+msgid ""
+"Could not upload the following books to the device, as no suitable formats "
+"were found:<br><ul>%s</ul>"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:605
 msgid "Cannot save to disk"
 msgstr ""
@@ -2139,6 +2169,10 @@ msgstr ""
 msgid "Cannot convert"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:675
+msgid "Starting Bulk conversion of %d books"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:797
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:815
 msgid "No book selected"
@@ -2167,6 +2201,10 @@ msgstr ""
 msgid "Cannot configure while there are running jobs."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:888
+msgid "Copying database to "
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:903
 msgid "Invalid database"
 msgstr ""

src/calibre/translations/ru.po

@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: calibre 0.4.55\n"
-"POT-Creation-Date: 2008-05-20 11:42+PDT\n"
+"POT-Creation-Date: 2008-05-20 12:53+PDT\n"
-"PO-Revision-Date: 2008-05-18 08:47+PDT\n"
+"PO-Revision-Date: 2008-05-20 12:53+PDT\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: ru\n"
 "MIME-Version: 1.0\n"
@@ -2065,6 +2065,14 @@ msgstr ""
 msgid "Bulk convert"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:241
+msgid " detected."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:241
+msgid "Device: "
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:278
 msgid "Device database corrupted"
 msgstr ""
@@ -2097,6 +2105,10 @@ msgstr ""
 msgid "Duplicates found!"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:372
+msgid "Uploading books to device."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:430
 msgid "No space on device"
 msgstr ""
@@ -2105,6 +2117,10 @@ msgstr ""
 msgid "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:466
+msgid "Deleting books from device."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:500
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:519
 msgid "Cannot edit metadata"
@@ -2118,6 +2134,20 @@ msgstr ""
 msgid "No books selected"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:588
+msgid "Sending books to device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:591
+msgid "No suitable formats"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:592
+msgid ""
+"Could not upload the following books to the device, as no suitable formats "
+"were found:<br><ul>%s</ul>"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:605
 msgid "Cannot save to disk"
 msgstr ""
@@ -2139,6 +2169,10 @@ msgstr ""
 msgid "Cannot convert"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:675
+msgid "Starting Bulk conversion of %d books"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:797
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:815
 msgid "No book selected"
@@ -2167,6 +2201,10 @@ msgstr ""
 msgid "Cannot configure while there are running jobs."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:888
+msgid "Copying database to "
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:903
 msgid "Invalid database"
 msgstr ""

src/calibre/translations/sl.po

@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: calibre 0.4.17\n"
-"POT-Creation-Date: 2008-05-20 11:42+PDT\n"
+"POT-Creation-Date: 2008-05-20 12:53+PDT\n"
-"PO-Revision-Date: 2007-11-08 14:39+PST\n"
+"PO-Revision-Date: 2008-05-20 12:53+PDT\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: sl\n"
 "MIME-Version: 1.0\n"
@@ -2065,6 +2065,14 @@ msgstr ""
 msgid "Bulk convert"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:241
+msgid " detected."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:241
+msgid "Device: "
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:278
 msgid "Device database corrupted"
 msgstr ""
@@ -2097,6 +2105,10 @@ msgstr ""
 msgid "Duplicates found!"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:372
+msgid "Uploading books to device."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:430
 msgid "No space on device"
 msgstr ""
@@ -2105,6 +2117,10 @@ msgstr ""
 msgid "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:466
+msgid "Deleting books from device."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:500
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:519
 msgid "Cannot edit metadata"
@@ -2118,6 +2134,20 @@ msgstr ""
 msgid "No books selected"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:588
+msgid "Sending books to device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:591
+msgid "No suitable formats"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:592
+msgid ""
+"Could not upload the following books to the device, as no suitable formats "
+"were found:<br><ul>%s</ul>"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:605
 msgid "Cannot save to disk"
 msgstr ""
@@ -2139,6 +2169,10 @@ msgstr ""
 msgid "Cannot convert"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:675
+msgid "Starting Bulk conversion of %d books"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:797
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:815
 msgid "No book selected"
@@ -2167,6 +2201,10 @@ msgstr ""
 msgid "Cannot configure while there are running jobs."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:888
+msgid "Copying database to "
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:903
 msgid "Invalid database"
 msgstr ""