diff --git a/app.yaml b/app.yaml index 0a6f21f0..20ea3e64 100644 --- a/app.yaml +++ b/app.yaml @@ -1,6 +1,6 @@ # ffd-retief-hrd fanfictiondownloader application: fanfictiondownloader -version: 2-0-03 +version: 2-0-04 runtime: python27 api_version: 1 threadsafe: true diff --git a/calibre-plugin/__init__.py b/calibre-plugin/__init__.py index c0fbc467..eb478df7 100644 --- a/calibre-plugin/__init__.py +++ b/calibre-plugin/__init__.py @@ -42,7 +42,7 @@ class FanFictionDownLoaderBase(InterfaceActionBase): description = _('UI plugin to download FanFiction stories from various sites.') supported_platforms = ['windows', 'osx', 'linux'] author = 'Jim Miller' - version = (2, 0, 3) + version = (2, 0, 4) minimum_calibre_version = (1, 13, 0) #: This field defines the GUI plugin class that contains all the code diff --git a/calibre-plugin/translations/es.po b/calibre-plugin/translations/es.po index 8defeb2e..3d0ab47f 100644 --- a/calibre-plugin/translations/es.po +++ b/calibre-plugin/translations/es.po @@ -2,7 +2,7 @@ # Copyright (C) YEAR ORGANIZATION # # Translators: -# Adolfo Jayme Barrientos , 2014 +# Adolfo Jayme Barrientos , 2014 # Jellby , 2014 msgid "" msgstr "" diff --git a/calibre-plugin/translations/messages.pot b/calibre-plugin/translations/messages.pot index 3cafba4e..1b1e93fa 100644 --- a/calibre-plugin/translations/messages.pot +++ b/calibre-plugin/translations/messages.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2014-08-22 12:39+Central Daylight Time\n" +"POT-Creation-Date: 2014-09-09 15:54+Central Daylight Time\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -516,7 +516,7 @@ msgstr "" msgid "Language" msgstr "" -#: config.py:928 ffdl_plugin.py:1142 ffdl_plugin.py:1306 ffdl_plugin.py:1336 +#: config.py:928 ffdl_plugin.py:1152 ffdl_plugin.py:1324 ffdl_plugin.py:1354 msgid "Status" msgstr "" @@ -544,7 +544,7 @@ msgstr "" msgid "Published" msgstr "" -#: config.py:935 ffdl_plugin.py:1419 ffdl_plugin.py:1438 +#: config.py:935 ffdl_plugin.py:1437 ffdl_plugin.py:1456 msgid "Updated" msgstr "" @@ -585,7 +585,7 @@ msgid "Extra Tags" msgstr "" #: config.py:945 config.py:1057 dialogs.py:804 dialogs.py:900 -#: ffdl_plugin.py:1142 ffdl_plugin.py:1306 ffdl_plugin.py:1336 +#: ffdl_plugin.py:1152 ffdl_plugin.py:1324 ffdl_plugin.py:1354 msgid "Title" msgstr "" @@ -597,8 +597,8 @@ msgstr "" msgid "Description" msgstr "" -#: config.py:948 dialogs.py:804 dialogs.py:900 ffdl_plugin.py:1142 -#: ffdl_plugin.py:1306 ffdl_plugin.py:1336 +#: config.py:948 dialogs.py:804 dialogs.py:900 ffdl_plugin.py:1152 +#: ffdl_plugin.py:1324 ffdl_plugin.py:1354 msgid "Author" msgstr "" @@ -885,7 +885,7 @@ msgstr "" msgid "What sort of update to perform. May set default from plugin configuration." msgstr "" -#: dialogs.py:804 ffdl_plugin.py:1142 ffdl_plugin.py:1306 ffdl_plugin.py:1336 +#: dialogs.py:804 ffdl_plugin.py:1152 ffdl_plugin.py:1324 ffdl_plugin.py:1354 msgid "Comment" msgstr "" @@ -1137,359 +1137,359 @@ msgstr "" msgid "Update Existing List" msgstr "" -#: ffdl_plugin.py:744 +#: ffdl_plugin.py:745 msgid "Started fetching metadata for %s stories." msgstr "" -#: ffdl_plugin.py:750 +#: ffdl_plugin.py:751 msgid "No valid story URLs entered." msgstr "" -#: ffdl_plugin.py:775 ffdl_plugin.py:781 +#: ffdl_plugin.py:776 ffdl_plugin.py:782 msgid "Reject URL?" msgstr "" -#: ffdl_plugin.py:782 ffdl_plugin.py:800 +#: ffdl_plugin.py:783 ffdl_plugin.py:801 msgid "%s is on your Reject URL list:" msgstr "" -#: ffdl_plugin.py:784 +#: ffdl_plugin.py:785 msgid "Click 'Yes' to Reject." msgstr "" -#: ffdl_plugin.py:785 ffdl_plugin.py:881 +#: ffdl_plugin.py:786 ffdl_plugin.py:890 msgid "Click 'No' to download anyway." msgstr "" -#: ffdl_plugin.py:787 +#: ffdl_plugin.py:788 msgid "Story on Reject URLs list (%s)." msgstr "" -#: ffdl_plugin.py:790 +#: ffdl_plugin.py:791 msgid "Rejected" msgstr "" -#: ffdl_plugin.py:793 +#: ffdl_plugin.py:794 msgid "Remove Reject URL?" msgstr "" -#: ffdl_plugin.py:799 +#: ffdl_plugin.py:800 msgid "Remove URL from Reject List?" msgstr "" -#: ffdl_plugin.py:802 +#: ffdl_plugin.py:803 msgid "Click 'Yes' to remove it from the list," msgstr "" -#: ffdl_plugin.py:803 +#: ffdl_plugin.py:804 msgid "Click 'No' to leave it on the list." msgstr "" -#: ffdl_plugin.py:820 +#: ffdl_plugin.py:821 msgid "Cannot update non-epub format." msgstr "" -#: ffdl_plugin.py:857 +#: ffdl_plugin.py:866 msgid "Are You an Adult?" msgstr "" -#: ffdl_plugin.py:858 +#: ffdl_plugin.py:867 msgid "%s requires that you be an adult. Please confirm you are an adult in your locale:" msgstr "" -#: ffdl_plugin.py:872 +#: ffdl_plugin.py:881 msgid "Skip Story?" msgstr "" -#: ffdl_plugin.py:878 +#: ffdl_plugin.py:887 msgid "Skip Anthology Story?" msgstr "" -#: ffdl_plugin.py:879 +#: ffdl_plugin.py:888 msgid "\"%s\" is in series \"%s\" that you have an anthology book for." msgstr "" -#: ffdl_plugin.py:880 +#: ffdl_plugin.py:889 msgid "Click 'Yes' to Skip." msgstr "" -#: ffdl_plugin.py:883 +#: ffdl_plugin.py:892 msgid "Story in Series Anthology(%s)." msgstr "" -#: ffdl_plugin.py:888 +#: ffdl_plugin.py:897 msgid "Skipped" msgstr "" -#: ffdl_plugin.py:916 +#: ffdl_plugin.py:925 msgid "Add" msgstr "" -#: ffdl_plugin.py:929 +#: ffdl_plugin.py:938 msgid "Meta" msgstr "" -#: ffdl_plugin.py:962 +#: ffdl_plugin.py:971 msgid "Skipping duplicate story." msgstr "" -#: ffdl_plugin.py:965 +#: ffdl_plugin.py:974 msgid "More than one identical book by Identifer URL or title/author(s)--can't tell which book to update/overwrite." msgstr "" -#: ffdl_plugin.py:976 +#: ffdl_plugin.py:985 msgid "Update" msgstr "" -#: ffdl_plugin.py:984 ffdl_plugin.py:991 +#: ffdl_plugin.py:993 ffdl_plugin.py:1000 msgid "Change Story URL?" msgstr "" -#: ffdl_plugin.py:992 +#: ffdl_plugin.py:1001 msgid "%s by %s is already in your library with a different source URL:" msgstr "" -#: ffdl_plugin.py:993 +#: ffdl_plugin.py:1002 msgid "In library: %(liburl)s" msgstr "" -#: ffdl_plugin.py:994 ffdl_plugin.py:1008 +#: ffdl_plugin.py:1003 ffdl_plugin.py:1017 msgid "New URL: %(newurl)s" msgstr "" -#: ffdl_plugin.py:995 +#: ffdl_plugin.py:1004 msgid "Click 'Yes' to update/overwrite book with new URL." msgstr "" -#: ffdl_plugin.py:996 +#: ffdl_plugin.py:1005 msgid "Click 'No' to skip updating/overwriting this book." msgstr "" -#: ffdl_plugin.py:998 ffdl_plugin.py:1005 +#: ffdl_plugin.py:1007 ffdl_plugin.py:1014 msgid "Download as New Book?" msgstr "" -#: ffdl_plugin.py:1006 +#: ffdl_plugin.py:1015 msgid "%s by %s is already in your library with a different source URL." msgstr "" -#: ffdl_plugin.py:1007 +#: ffdl_plugin.py:1016 msgid "You chose not to update the existing book. Do you want to add a new book for this URL?" msgstr "" -#: ffdl_plugin.py:1009 +#: ffdl_plugin.py:1018 msgid "Click 'Yes' to a new book with new URL." msgstr "" -#: ffdl_plugin.py:1010 +#: ffdl_plugin.py:1019 msgid "Click 'No' to skip URL." msgstr "" -#: ffdl_plugin.py:1016 +#: ffdl_plugin.py:1025 msgid "Update declined by user due to differing story URL(%s)" msgstr "" -#: ffdl_plugin.py:1019 +#: ffdl_plugin.py:1028 msgid "Different URL" msgstr "" -#: ffdl_plugin.py:1024 +#: ffdl_plugin.py:1033 msgid "Metadata collected." msgstr "" -#: ffdl_plugin.py:1040 +#: ffdl_plugin.py:1049 msgid "Already contains %d chapters." msgstr "" -#: ffdl_plugin.py:1045 jobs.py:198 +#: ffdl_plugin.py:1054 jobs.py:199 msgid "Existing epub contains %d chapters, web site only has %d. Use Overwrite to force update." msgstr "" -#: ffdl_plugin.py:1047 +#: ffdl_plugin.py:1056 msgid "FFDL doesn't recognize chapters in existing epub, epub is probably from a different source. Use Overwrite to force update." msgstr "" -#: ffdl_plugin.py:1059 +#: ffdl_plugin.py:1068 msgid "Not Overwriting, web site is not newer." msgstr "" -#: ffdl_plugin.py:1138 +#: ffdl_plugin.py:1148 msgid "None of the %d URLs/stories given can be/need to be downloaded." msgstr "" -#: ffdl_plugin.py:1139 ffdl_plugin.py:1302 ffdl_plugin.py:1332 +#: ffdl_plugin.py:1149 ffdl_plugin.py:1320 ffdl_plugin.py:1350 msgid "See log for details." msgstr "" -#: ffdl_plugin.py:1140 +#: ffdl_plugin.py:1150 msgid "Proceed with updating your library(Error Column, if configured)?" msgstr "" -#: ffdl_plugin.py:1147 ffdl_plugin.py:1314 +#: ffdl_plugin.py:1157 ffdl_plugin.py:1332 msgid "Bad" msgstr "" -#: ffdl_plugin.py:1155 +#: ffdl_plugin.py:1165 msgid "FFDL download ended" msgstr "" -#: ffdl_plugin.py:1155 ffdl_plugin.py:1357 +#: ffdl_plugin.py:1165 ffdl_plugin.py:1375 msgid "FFDL log" msgstr "" -#: ffdl_plugin.py:1163 +#: ffdl_plugin.py:1181 msgid "Download FanFiction Book" msgstr "" -#: ffdl_plugin.py:1170 +#: ffdl_plugin.py:1188 msgid "Starting %d FanFictionDownLoads" msgstr "" -#: ffdl_plugin.py:1200 +#: ffdl_plugin.py:1218 msgid "Story Details:" msgstr "" -#: ffdl_plugin.py:1203 +#: ffdl_plugin.py:1221 msgid "Error Updating Metadata" msgstr "" -#: ffdl_plugin.py:1204 +#: ffdl_plugin.py:1222 msgid "An error has occurred while FFDL was updating calibre's metadata for %s." msgstr "" -#: ffdl_plugin.py:1205 +#: ffdl_plugin.py:1223 msgid "The ebook has been updated, but the metadata has not." msgstr "" -#: ffdl_plugin.py:1257 +#: ffdl_plugin.py:1275 msgid "Finished Adding/Updating %d books." msgstr "" -#: ffdl_plugin.py:1265 +#: ffdl_plugin.py:1283 msgid "Starting auto conversion of %d books." msgstr "" -#: ffdl_plugin.py:1286 +#: ffdl_plugin.py:1304 msgid "No Good Stories for Anthology" msgstr "" -#: ffdl_plugin.py:1287 +#: ffdl_plugin.py:1305 msgid "No good stories/updates where downloaded, Anthology creation/update aborted." msgstr "" -#: ffdl_plugin.py:1292 ffdl_plugin.py:1331 +#: ffdl_plugin.py:1310 ffdl_plugin.py:1349 msgid "FFDL found %s good and %s bad updates." msgstr "" -#: ffdl_plugin.py:1299 +#: ffdl_plugin.py:1317 msgid "Are you sure you want to continue with creating/updating this Anthology?" msgstr "" -#: ffdl_plugin.py:1300 +#: ffdl_plugin.py:1318 msgid "Any updates that failed will not be included in the Anthology." msgstr "" -#: ffdl_plugin.py:1301 +#: ffdl_plugin.py:1319 msgid "However, if there's an older version, it will still be included." msgstr "" -#: ffdl_plugin.py:1304 +#: ffdl_plugin.py:1322 msgid "Proceed with updating this anthology and your library?" msgstr "" -#: ffdl_plugin.py:1312 +#: ffdl_plugin.py:1330 msgid "Good" msgstr "" -#: ffdl_plugin.py:1333 +#: ffdl_plugin.py:1351 msgid "Proceed with updating your library?" msgstr "" -#: ffdl_plugin.py:1357 +#: ffdl_plugin.py:1375 msgid "FFDL download complete" msgstr "" -#: ffdl_plugin.py:1370 +#: ffdl_plugin.py:1388 msgid "Merging %s books." msgstr "" -#: ffdl_plugin.py:1410 +#: ffdl_plugin.py:1428 msgid "FFDL Adding/Updating books." msgstr "" -#: ffdl_plugin.py:1417 +#: ffdl_plugin.py:1435 msgid "Updating calibre for FanFiction stories..." msgstr "" -#: ffdl_plugin.py:1418 +#: ffdl_plugin.py:1436 msgid "Update calibre for FanFiction stories" msgstr "" -#: ffdl_plugin.py:1427 +#: ffdl_plugin.py:1445 msgid "Adding/Updating %s BAD books." msgstr "" -#: ffdl_plugin.py:1436 +#: ffdl_plugin.py:1454 msgid "Updating calibre for BAD FanFiction stories..." msgstr "" -#: ffdl_plugin.py:1437 +#: ffdl_plugin.py:1455 msgid "Update calibre for BAD FanFiction stories" msgstr "" -#: ffdl_plugin.py:1463 +#: ffdl_plugin.py:1481 msgid "Adding format to book failed for some reason..." msgstr "" -#: ffdl_plugin.py:1466 +#: ffdl_plugin.py:1484 msgid "Error" msgstr "" -#: ffdl_plugin.py:1739 +#: ffdl_plugin.py:1757 msgid "You configured FanFictionDownLoader to automatically update Reading Lists, but you don't have the %s plugin installed anymore?" msgstr "" -#: ffdl_plugin.py:1751 +#: ffdl_plugin.py:1769 msgid "You configured FanFictionDownLoader to automatically update \"To Read\" Reading Lists, but you don't have any lists set?" msgstr "" -#: ffdl_plugin.py:1761 ffdl_plugin.py:1779 +#: ffdl_plugin.py:1779 ffdl_plugin.py:1797 msgid "You configured FanFictionDownLoader to automatically update Reading List '%s', but you don't have a list of that name?" msgstr "" -#: ffdl_plugin.py:1767 +#: ffdl_plugin.py:1785 msgid "You configured FanFictionDownLoader to automatically update \"Send to Device\" Reading Lists, but you don't have any lists set?" msgstr "" -#: ffdl_plugin.py:1888 +#: ffdl_plugin.py:1906 msgid "No story URL found." msgstr "" -#: ffdl_plugin.py:1891 +#: ffdl_plugin.py:1909 msgid "Not Found" msgstr "" -#: ffdl_plugin.py:1897 +#: ffdl_plugin.py:1915 msgid "URL is not a valid story URL." msgstr "" -#: ffdl_plugin.py:1900 +#: ffdl_plugin.py:1918 msgid "Bad URL" msgstr "" -#: ffdl_plugin.py:2036 ffdl_plugin.py:2039 +#: ffdl_plugin.py:2054 ffdl_plugin.py:2057 msgid "Anthology containing:" msgstr "" -#: ffdl_plugin.py:2037 +#: ffdl_plugin.py:2055 msgid "%s by %s" msgstr "" -#: ffdl_plugin.py:2059 +#: ffdl_plugin.py:2077 msgid " Anthology" msgstr "" -#: ffdl_plugin.py:2096 +#: ffdl_plugin.py:2114 msgid "(was set, removed for security)" msgstr "" @@ -1509,11 +1509,11 @@ msgstr "" msgid "Download started..." msgstr "" -#: jobs.py:192 +#: jobs.py:193 msgid "Already contains %d chapters. Reuse as is." msgstr "" -#: jobs.py:209 +#: jobs.py:210 msgid "Update %s completed, added %s chapters for %s total." msgstr "" diff --git a/index.html b/index.html index 404c6554..0ddfa436 100644 --- a/index.html +++ b/index.html @@ -60,7 +60,15 @@

    -
  • Fix for AO3 authors all coming out as Anonymous.
    • +
  • New site bdsm-geschichten.net, thanks John Doe.
    • +
  • New site: sheppardweir.com, thanks scout78.
    • +
  • New eFiction base adapter courtesy of John Doe. This should make it easier for new developers to add eFiction type sites. But it doesn't support all type of metadata.
    • +
  • New site using eFiction base adapter: fannation.shades-of-moonlight.com, thanks John Doe.
    • +
  • New site using eFiction base adapter: themaplebookshelf.com, thanks John Doe.
    • +
  • Fix numChapters in adapter_literotica.py.
    • +
  • Fixes for nhamagicalworldsus changes.
    • +
  • Fix for changes to fanfiktion.de.
    • +
  • Fix to clear existing data when re-downloading a story again. Occasionally caused problems.
  • Known issue: Password protected FimFiction.net stories aren't working. FimF changed API access.
  • Known issue: Specific metadata 'eroticatags' for literotica.com doesn't work on all stories.
@@ -73,7 +81,7 @@ If you have any problems with this application, please report them in the FanFictionDownLoader Google Group. The - Previous Version is also available for you to use if necessary. + Previous Version is also available for you to use if necessary.

{{ error_message }}