diff --git a/resources/recipes/kleinezeitung.recipe b/resources/recipes/kleinezeitung.recipe index 1ac035e0d9..0c8520b862 100644 --- a/resources/recipes/kleinezeitung.recipe +++ b/resources/recipes/kleinezeitung.recipe @@ -1,5 +1,4 @@ from calibre.web.feeds.news import BasicNewsRecipe -from calibre.ebooks.BeautifulSoup import BeautifulSoup import re class KleineZeitungRecipe(BasicNewsRecipe): @@ -51,4 +50,4 @@ class KleineZeitungRecipe(BasicNewsRecipe): p.intro {font-size: large;} div.art_foto_big, div.art_foto {font-size: xx-small; color: #696969; margin-bottom: 0.5em;} div.art_foto_big span.src {float: right;} - ''' \ No newline at end of file + ''' diff --git a/setup/installer/windows/freeze.py b/setup/installer/windows/freeze.py index 006345e229..0b04cc11cc 100644 --- a/setup/installer/windows/freeze.py +++ b/setup/installer/windows/freeze.py @@ -14,7 +14,7 @@ from setup.build_environment import msvc, MT, RC from setup.installer.windows.wix import WixMixIn QT_DIR = 'C:\\Qt\\4.6.0' -QT_DLLS = ['Core', 'Gui', 'Network', 'Svg', 'WebKit', 'Xml', 'XmlPatterns', 'phonon'] +QT_DLLS = ['Core', 'Gui', 'Network', 'Svg', 'WebKit', 'Xml', 'XmlPatterns'] LIBUSB_DIR = 'C:\\libusb' LIBUNRAR = 'C:\\Program Files\\UnrarDLL\\unrar.dll' SW = r'C:\cygwin\home\kovid\sw' diff --git a/src/calibre/translations/calibre.pot b/src/calibre/translations/calibre.pot index 4c7c2b8044..7173d3b460 100644 --- a/src/calibre/translations/calibre.pot +++ b/src/calibre/translations/calibre.pot @@ -4,9 +4,9 @@ # msgid "" msgstr "" -"Project-Id-Version: calibre 0.6.29\n" -"POT-Creation-Date: 2009-12-24 21:39+MST\n" -"PO-Revision-Date: 2009-12-24 21:39+MST\n" +"Project-Id-Version: calibre 0.6.30\n" +"POT-Creation-Date: 2009-12-26 08:36+MST\n" +"PO-Revision-Date: 2009-12-26 08:36+MST\n" "Last-Translator: Automatically generated\n" "Language-Team: LANGUAGE\n" "MIME-Version: 1.0\n" @@ -62,8 +62,8 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:79 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:121 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:155 -#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:593 -#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:783 +#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:594 +#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:784 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/input.py:49 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/input.py:51 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:896 @@ -130,7 +130,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/library/server.py:645 #: /home/kovid/work/calibre/src/calibre/library/server.py:717 #: /home/kovid/work/calibre/src/calibre/library/server.py:764 -#: /home/kovid/work/calibre/src/calibre/utils/localization.py:105 +#: /home/kovid/work/calibre/src/calibre/utils/localization.py:107 #: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:45 #: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:63 #: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:77 @@ -6814,10 +6814,18 @@ msgid "English (TH)" msgstr "" #: /home/kovid/work/calibre/src/calibre/utils/localization.py:103 -msgid "Dutch (NL)" +msgid "English (CY)" msgstr "" #: /home/kovid/work/calibre/src/calibre/utils/localization.py:104 +msgid "German (AT)" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/utils/localization.py:105 +msgid "Dutch (NL)" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/utils/localization.py:106 msgid "Dutch (BE)" msgstr "" diff --git a/src/calibre/utils/localization.py b/src/calibre/utils/localization.py index 57458e344b..64dadb89e4 100644 --- a/src/calibre/utils/localization.py +++ b/src/calibre/utils/localization.py @@ -100,6 +100,8 @@ _extra_lang_codes = { 'en_CA' : _('English (CA)'), 'en_IN' : _('English (IND)'), 'en_TH' : _('English (TH)'), + 'en_CY' : _('English (CY)'), + 'de_AT' : _('German (AT)'), 'nl' : _('Dutch (NL)'), 'nl_BE' : _('Dutch (BE)'), 'und' : _('Unknown')