Merge from trunk

Changelog.yaml

@@ -19,6 +19,56 @@
 #   new recipes:
 #     - title: 
 
+- version: 0.9.18
+  date: 2013-02-08
+
+  new features:
+      - title: "New metadata source: Edelweiss, a catalog of books that is updated directly by publishers. To enable it, go to Preferences->Metadata download and enable the Edelweiss plugin."
+        tickets: [1091073]
+
+      - title: "Add an option to add extra spacing between rows in the book list. (Preferences->Look & Feel)"
+        tickets: [1117907]
+
+      - title: "Column coloring/icons: Add a 'days ago' condition, useable with columns that store dates to set colors/icons based on the number of days before today"
+
+      - title: "E-book viewer: Add shortcuts Ctrl+= and Ctrl+- to increase/decrease text size."
+        tickets: [ 1117524 ] 
+
+      - title: "When showing possible duplicates after adding books, also show the file formats."
+
+      - title: "Driver for Trekstor Ventos Tablet" 
+ 
+  bug fixes:
+    - title: "Conversion: When transliterating unicode characters, handle « and » correctly."
+      tickets: [1117270]
+
+    - title: "Fix adding books from multiple directories with multiple books per directory treating opf files as an ebook"
+
+    - title: "Fix download metadata window not resizable on smaller screens"
+      tickets: [1116849]
+
+    - title: "Tweak Book: When rebuilding azw3 files handle <a> tags that have name but not id attribute, these are apparently produced by kindlegen."
+      tickets: [ 1112934 ] 
+
+    - title: "Fix regression in advanced column color rules."
+      tickets: [1118678] 
+
+  improved recipes:
+    - El Mundo today
+    - fluter.de
+    - Birmingham Post
+    - Japan Times
+    - The Toronto Star
+    - Le Monde (subscription version)
+    - Globe and Mail
+
+  new recipes:
+    - title: VICE Magazine Deutschland 
+      author: Alex
+
+    - title: Libertad Digital 
+      author: Darko Miletic
+
 - version: 0.9.17
   date: 2013-02-01
 

src/calibre/constants.py

@@ -4,7 +4,7 @@ __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
 __docformat__ = 'restructuredtext en'
 __appname__   = u'calibre'
-numeric_version = (0, 9, 17)
+numeric_version = (0, 9, 18)
 __version__   = u'.'.join(map(unicode, numeric_version))
 __author__    = u"Kovid Goyal <kovid@kovidgoyal.net>"
 

src/calibre/devices/android/driver.py

@@ -54,6 +54,9 @@ class ANDROID(USBMS):
             # Eken
             0x040d : { 0x8510 : [0x0001], 0x0851 : [0x1] },
 
+            # Trekstor
+            0x1e68 : { 0x006a : [0x0231] },
+
             # Motorola
             0x22b8 : { 0x41d9 : [0x216], 0x2d61 : [0x100], 0x2d67 : [0x100],
                        0x2de8 : [0x229],
@@ -215,7 +218,7 @@ class ANDROID(USBMS):
             'POCKET', 'ONDA_MID', 'ZENITHIN', 'INGENIC', 'PMID701C', 'PD',
             'PMP5097C', 'MASS', 'NOVO7', 'ZEKI', 'COBY', 'SXZ', 'USB_2.0',
             'COBY_MID', 'VS', 'AINOL', 'TOPWISE', 'PAD703', 'NEXT8D12',
-            'MEDIATEK', 'KEENHI', 'TECLAST']
+            'MEDIATEK', 'KEENHI', 'TECLAST', 'SURFTAB']
     WINDOWS_MAIN_MEM = ['ANDROID_PHONE', 'A855', 'A853', 'A953', 'INC.NEXUS_ONE',
             '__UMS_COMPOSITE', '_MB200', 'MASS_STORAGE', '_-_CARD', 'SGH-I897',
             'GT-I9000', 'FILE-STOR_GADGET', 'SGH-T959_CARD', 'SGH-T959', 'SAMSUNG_ANDROID',
@@ -236,7 +239,7 @@ class ANDROID(USBMS):
             'ADVANCED', 'SGH-I727', 'USB_FLASH_DRIVER', 'ANDROID',
             'S5830I_CARD', 'MID7042', 'LINK-CREATE', '7035', 'VIEWPAD_7E',
             'NOVO7', 'MB526', '_USB#WYK7MSF8KE', 'TABLET_PC', 'F', 'MT65XX_MS',
-            'ICS', 'E400', '__FILE-STOR_GADG']
+            'ICS', 'E400', '__FILE-STOR_GADG', 'ST80208-1']
     WINDOWS_CARD_A_MEM = ['ANDROID_PHONE', 'GT-I9000_CARD', 'SGH-I897',
             'FILE-STOR_GADGET', 'SGH-T959_CARD', 'SGH-T959', 'SAMSUNG_ANDROID', 'GT-P1000_CARD',
             'A70S', 'A101IT', '7', 'INCREDIBLE', 'A7EB', 'SGH-T849_CARD',
@@ -247,7 +250,7 @@ class ANDROID(USBMS):
             'FILE-CD_GADGET', 'GT-I9001_CARD', 'USB_2.0', 'XT875',
             'UMS_COMPOSITE', 'PRO', '.KOBO_VOX', 'SGH-T989_CARD', 'SGH-I727',
             'USB_FLASH_DRIVER', 'ANDROID', 'MID7042', '7035', 'VIEWPAD_7E',
-            'NOVO7', 'ADVANCED', 'TABLET_PC', 'F', 'E400_SD_CARD']
+            'NOVO7', 'ADVANCED', 'TABLET_PC', 'F', 'E400_SD_CARD', 'ST80208-1']
 
     OSX_MAIN_MEM = 'Android Device Main Memory'