Merge branch 'master' of https://github.com/JimmXinu/FanFicFare into metadata

This commit is contained in:
Jim Miller
2015-05-07 11:21:58 -05:00
10 changed files with 55 additions and 52 deletions
+1 -1
View File
@@ -42,7 +42,7 @@ class FanFicFareBase(InterfaceActionBase):
description = _('UI plugin to download FanFiction stories from various sites.')
supported_platforms = ['windows', 'osx', 'linux']
author = 'Jim Miller'
version = (2, 2, 4)
version = (2, 2, 5)
minimum_calibre_version = (1, 48, 0)
#: This field defines the GUI plugin class that contains all the code
+18 -18
View File
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: calibre-plugins\n"
"POT-Creation-Date: 2015-04-27 11:35+Central Daylight Time\n"
"PO-Revision-Date: 2015-04-28 08:32+0000\n"
"Last-Translator: Kovid Goyal <kovid@kovidgoyal.net>\n"
"PO-Revision-Date: 2015-05-06 09:01+0000\n"
"Last-Translator: ILB\n"
"Language-Team: German (http://www.transifex.com/projects/p/calibre-plugins/language/de/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -96,7 +96,7 @@ msgstr "Basis"
#: config.py:215
msgid "Calibre Cover"
msgstr ""
msgstr "Calibre Cover"
#: config.py:223
msgid "Standard Columns"
@@ -307,7 +307,7 @@ msgstr "Standardmäßig aktualisieren, wenn Bücher ausgewählt sind?"
msgid ""
"The top FanFicFare plugin button will start Update if\n"
"books are selected. If unchecked, it will always bring up 'Add New'."
msgstr ""
msgstr "Die oberste Taste im FFF-Plugin wird, wenn Bücher ausgewählt sind, diese aktualisieren. Wenn nicht markiert, kommt immer zuerst 'Neu hinzufügen'."
#: config.py:492
msgid "Keep 'Add New from URL(s)' dialog on top?"
@@ -536,7 +536,7 @@ msgstr ""
#: config.py:820
msgid "Plugin %(gc)s"
msgstr ""
msgstr "Plugin %(gc)s"
#: config.py:821
msgid "Use plugin to create covers. Additional settings are below."
@@ -555,7 +555,7 @@ msgstr ""
#: config.py:843
msgid "Generate Covers Only for New Books"
msgstr ""
msgstr "Erstellt Cover nur für Neue Bücher"
#: config.py:844
msgid ""
@@ -576,7 +576,7 @@ msgstr ""
#: config.py:857
msgid "%(gc)s(Plugin) Settings"
msgstr ""
msgstr "%(gc)s(Plugin) Einstellungen"
#: config.py:865
msgid ""
@@ -609,7 +609,7 @@ msgid ""
"The %(pini)s parameter %(gcset)s allows you to choose a %(gc)s setting based"
" on metadata rather than site, but it's much more complex.<br \\>%(gcset)s "
"is ignored when this is off."
msgstr ""
msgstr "Die %(gcset)s Einstellungen in %(pini)s erlauben es ihnen eine %(gc)s -Einstellung zu wählen, die auf Metadaten statt der Web-Seite basiert, aber dies ist sehr viel komplexer.<br \\\\>%(gcset)s Einstellungen werden ignoriert, wenn dies deaktiviert ist."
#: config.py:953
msgid ""
@@ -632,7 +632,7 @@ msgstr "Welche Spalte und Algorithmus verwendet werden, ist in %(cp)s festgelegt
msgid ""
"Will overwrite word count from FanFicFare metadata if set to update the same"
" custom column."
msgstr ""
msgstr "Überschreibt die Wortanzahl von den FFF-Metadaten, wenn die Aktualisierung für die gleiche benutzerdefinierte Spalte gesetzt ist."
#: config.py:979
msgid ""
@@ -1226,7 +1226,7 @@ msgstr "Liste der Bücher zur Ablehnung"
msgid ""
"FFF will remember these URLs and display the note and offer to reject them "
"if you try to download them again later."
msgstr ""
msgstr "FFF merkt sich diese URLs, zeigt die Notiz an und bietet an, diese abzulehnen, wenn Sie diese nochmal versuchen, diese herunterzuladen."
#: dialogs.py:1054
msgid "Remove selected URLs from the list"
@@ -1304,11 +1304,11 @@ msgstr ""
#: fff_plugin.py:261
msgid "Download FanFiction Books from URLs"
msgstr ""
msgstr "FanFiction-Bücher von URLs herunterladen"
#: fff_plugin.py:264
msgid "&Update Existing FanFiction Books"
msgstr ""
msgstr "Vorhandene FanFiction-Bücher aktualisieren"
#: fff_plugin.py:269
msgid "Get Story URLs from &Email"
@@ -1320,23 +1320,23 @@ msgstr "Story-UR´s von der Web-Seite holen"
#: fff_plugin.py:279
msgid "&Make Anthology Epub from URLs"
msgstr ""
msgstr "Sammelband-EPUB aus URLs erstellen"
#: fff_plugin.py:281
msgid "Make FanFiction Anthology Epub from URLs"
msgstr ""
msgstr "FanFiction-Sammelband-EPUB aus URLs erstellen"
#: fff_plugin.py:284
msgid "Make Anthology Epub from Web Page"
msgstr ""
msgstr "Sammelband-EPUB von der Webseite erstellen"
#: fff_plugin.py:286
msgid "Make FanFiction Anthology Epub from Web Page"
msgstr ""
msgstr "FanFiction-Sammelband-EPUB von der Webseite erstellen"
#: fff_plugin.py:289
msgid "Update Anthology Epub"
msgstr ""
msgstr "Sammelband-EPUB aktualisieren"
#: fff_plugin.py:291
msgid "Update FanFiction Anthology Epub"
@@ -1475,7 +1475,7 @@ msgstr "Sammelband kann nicht aktualisiert werden"
msgid ""
"Book isn't an FanFicFare Anthology or contains book(s) without valid Story "
"URLs."
msgstr ""
msgstr "Das Buch ist kein FanFicFare-Sammelband oder enthält ein Buch (mehrere Bücher) ohne gültige FFF-URL´s."
#: fff_plugin.py:693
msgid ""
+1 -1
View File
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: calibre-plugins\n"
"POT-Creation-Date: 2015-04-27 11:35+Central Daylight Time\n"
"PO-Revision-Date: 2015-04-29 15:43+0000\n"
"PO-Revision-Date: 2015-05-06 09:14+0000\n"
"Last-Translator: dario hereñu <magallania@gmail.com>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/calibre-plugins/language/es/)\n"
"MIME-Version: 1.0\n"
+1 -1
View File
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: calibre-plugins\n"
"POT-Creation-Date: 2015-04-27 11:35+Central Daylight Time\n"
"PO-Revision-Date: 2015-04-28 08:32+0000\n"
"PO-Revision-Date: 2015-05-06 09:01+0000\n"
"Last-Translator: Kovid Goyal <kovid@kovidgoyal.net>\n"
"Language-Team: French (http://www.transifex.com/projects/p/calibre-plugins/language/fr/)\n"
"MIME-Version: 1.0\n"
+26 -25
View File
@@ -4,12 +4,13 @@
# Translators:
# Nathan Follens, 2015
# Rodolfo_Jadon, 2014-2015
# W.P.M.E. Hofland <wpme.hofland@gmail.com>, 2015
msgid ""
msgstr ""
"Project-Id-Version: calibre-plugins\n"
"POT-Creation-Date: 2015-04-27 11:35+Central Daylight Time\n"
"PO-Revision-Date: 2015-04-28 08:32+0000\n"
"Last-Translator: Kovid Goyal <kovid@kovidgoyal.net>\n"
"PO-Revision-Date: 2015-05-06 09:01+0000\n"
"Last-Translator: W.P.M.E. Hofland <wpme.hofland@gmail.com>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/calibre-plugins/language/nl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -30,11 +31,11 @@ msgstr "Pad naar de calibre-bibliotheek. Standaard wordt het pad gebruikt dat in
#: common_utils.py:398
msgid "Keyboard shortcuts"
msgstr ""
msgstr "Sneltoetsen"
#: common_utils.py:444
msgid "Undefined"
msgstr ""
msgstr "Niet gedefinieerd"
#: common_utils.py:464
msgid "Prefs Viewer dialog"
@@ -42,11 +43,11 @@ msgstr ""
#: common_utils.py:465
msgid "Preferences for: "
msgstr ""
msgstr "Voorkeuren voor:"
#: common_utils.py:497
msgid "Clear"
msgstr ""
msgstr "Wis"
#: common_utils.py:499
msgid "Clear all settings for this plugin"
@@ -66,7 +67,7 @@ msgstr ""
#: common_utils.py:528
msgid "You must restart calibre afterwards."
msgstr ""
msgstr "U dient calibre achteraf te herstarten."
#: common_utils.py:537
msgid "All settings for this plugin in this library have been cleared."
@@ -78,7 +79,7 @@ msgstr ""
#: common_utils.py:540
msgid "Restart calibre now"
msgstr ""
msgstr "Calibre nu herstarten"
#: config.py:187
msgid "List of Supported Sites"
@@ -94,7 +95,7 @@ msgstr "Basis"
#: config.py:215
msgid "Calibre Cover"
msgstr ""
msgstr "Calibre omslag"
#: config.py:223
msgid "Standard Columns"
@@ -167,7 +168,7 @@ msgstr ""
#: config.py:419
msgid "Updating Calibre Options"
msgstr ""
msgstr "Calibre opties bijwerken"
#: config.py:423
msgid "Delete other existing formats?"
@@ -193,7 +194,7 @@ msgstr ""
#: config.py:433
msgid "Force Author into Author Sort?"
msgstr ""
msgstr "Forceer auteur naar auteursortering?"
#: config.py:434
msgid ""
@@ -203,7 +204,7 @@ msgstr ""
#: config.py:438
msgid "Force Title into Title Sort?"
msgstr ""
msgstr "Forceer titel naar titelsortering?"
#: config.py:439
msgid ""
@@ -276,7 +277,7 @@ msgstr ""
#: config.py:473
msgid "Automatically Convert new/update books?"
msgstr ""
msgstr "Nieuw/bijgewerkte boeken automatisch omzetten?"
#: config.py:474
msgid ""
@@ -431,7 +432,7 @@ msgstr "Bewerk personal.ini"
#: config.py:640
msgid "View Defaults"
msgstr ""
msgstr "Toon standaarden"
#: config.py:641
msgid ""
@@ -704,7 +705,7 @@ msgstr "Status:%(inprog)s"
#: config.py:1097 config.py:1231
msgid "Series"
msgstr "Series"
msgstr "Reeks"
#: config.py:1098
msgid "Characters"
@@ -903,7 +904,7 @@ msgstr ""
#: config.py:1277
msgid "IMAP Server Name"
msgstr ""
msgstr "IMAP server naam"
#: config.py:1278
msgid "Name of IMAP server--must allow IMAP4 with SSL. Eg: imap.gmail.com"
@@ -911,7 +912,7 @@ msgstr ""
#: config.py:1287
msgid "IMAP User Name"
msgstr ""
msgstr "IMAP gebruikersnaam"
#: config.py:1288
msgid ""
@@ -921,7 +922,7 @@ msgstr ""
#: config.py:1297
msgid "IMAP User Password"
msgstr ""
msgstr "IMAP gebruikerswachtwoord"
#: config.py:1298
msgid ""
@@ -1071,7 +1072,7 @@ msgstr ""
#: dialogs.py:498
msgid "For Individual Books"
msgstr ""
msgstr "Voor individuele boeken"
#: dialogs.py:499
msgid "Get URLs and go to dialog for individual story downloads."
@@ -1487,7 +1488,7 @@ msgstr ""
#: fff_plugin.py:696
msgid "Update anyway?"
msgstr ""
msgstr "Toch bijwerken?"
#: fff_plugin.py:697
msgid "Stories Removed"
@@ -1539,7 +1540,7 @@ msgstr ""
#: fff_plugin.py:843
msgid "Rejected"
msgstr ""
msgstr "Afgewezen"
#: fff_plugin.py:846
msgid "Remove Reject URL?"
@@ -1563,7 +1564,7 @@ msgstr ""
#: fff_plugin.py:918
msgid "Are You an Adult?"
msgstr ""
msgstr "Bent u een volwassene?"
#: fff_plugin.py:919
msgid ""
@@ -1739,7 +1740,7 @@ msgstr "Verhaaldetails:"
#: fff_plugin.py:1277
msgid "Error Updating Metadata"
msgstr ""
msgstr "Fout tijdens metadata bijwerken"
#: fff_plugin.py:1278
msgid ""
@@ -1803,7 +1804,7 @@ msgstr ""
#: fff_plugin.py:1466
msgid "Merging %s books."
msgstr ""
msgstr "%s boeken samenvoegen."
#: fff_plugin.py:1506
msgid "FanFicFare Adding/Updating books."
@@ -1891,7 +1892,7 @@ msgstr "Antologie"
#: fff_plugin.py:2230
msgid "(was set, removed for security)"
msgstr ""
msgstr "(was ingesteld, voor veiligheid verwijderd)"
#: jobs.py:59
msgid "Downloading FanFiction Stories"
+1 -1
View File
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: calibre-plugins\n"
"POT-Creation-Date: 2015-04-27 11:35+Central Daylight Time\n"
"PO-Revision-Date: 2015-04-28 08:32+0000\n"
"PO-Revision-Date: 2015-05-06 09:01+0000\n"
"Last-Translator: Kovid Goyal <kovid@kovidgoyal.net>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/calibre-plugins/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
+1 -1
View File
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: calibre-plugins\n"
"POT-Creation-Date: 2015-04-27 11:35+Central Daylight Time\n"
"PO-Revision-Date: 2015-04-28 08:32+0000\n"
"PO-Revision-Date: 2015-05-06 09:01+0000\n"
"Last-Translator: Kovid Goyal <kovid@kovidgoyal.net>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/calibre-plugins/language/uk/)\n"
"MIME-Version: 1.0\n"
+1 -1
View File
@@ -25,7 +25,7 @@ setup(
# Versions should comply with PEP440. For a discussion on single-sourcing
# the version across setup.py and the project code, see
# https://packaging.python.org/en/latest/single_source_version.html
version="2.2.4",
version="2.2.5",
description='A tool for downloading fanfiction to eBook formats',
long_description=long_description,
+1 -1
View File
@@ -1,6 +1,6 @@
# ffd-retief-hrd fanfictiondownloader fanficfare
application: fanficfare
version: 2-2-4
version: 2-2-5
runtime: python27
api_version: 1
threadsafe: true
+4 -2
View File
@@ -46,7 +46,9 @@
</p>
<h3>Changes:</h3>
<ul>
<li>More fixes for storiesonline.net site changes.</li>
<li>Fix ficwad.com changing author URLs.</li>
<li>Fix for ponyfictionarchive.net stories with neither In-Progress or Complete flag.</li>
<li>Fix for grangerenchanted.com bad HTML summary causing crash.</li>
</ul>
<p>
Questions? Check out our
@@ -56,7 +58,7 @@
If you have any problems with this application, please
report them in
the <a href="http://groups.google.com/group/fanfic-downloader">FanFicFare Google Group</a>. The
<a href="http://2-2-3.fanficfare.appspot.com">previous version
<a href="http://2-2-4.fanficfare.appspot.com">previous version
</a> is also available for you to use if necessary.
</p>
<div id='error'>