diff --git a/src/calibre/ebooks/txt/input.py b/src/calibre/ebooks/txt/input.py index c8ce389574..e782cd0cd9 100644 --- a/src/calibre/ebooks/txt/input.py +++ b/src/calibre/ebooks/txt/input.py @@ -35,11 +35,12 @@ class TXTInput(InputFormatPlugin): OptionRecommendation(name='formatting_type', recommended_value='auto', choices=['auto', 'none', 'heuristic', 'markdown'], help=_('Formatting used within the document.' - '* auto: Try to auto detect the document formatting.\n' - '* none: Do not modify the paragraph formatting. Everything is a paragraph.\n' - '* heuristic: Try to detect formatting for elements such as chapter headings ' - 'and style the elements appropriately.\n' - '* markdown: Run the input though the markdown pre-processor. ' + '* auto: Automatically decide which formatting processor to use.\n' + '* none: Do not process the document formatting. Everything is a ' + 'paragraph and no styling is applied.\n' + '* heuristic: Process using heuristics to determine formatting such ' + 'as chapter headings and italic text.\n' + '* markdown: Processing using markdown formatting. ' 'To learn more about markdown see')+' http://daringfireball.net/projects/markdown/'), OptionRecommendation(name='preserve_spaces', recommended_value=False, help=_('Normally extra spaces are condensed into a single space. ' diff --git a/src/calibre/translations/calibre.pot b/src/calibre/translations/calibre.pot index fdf44d7b08..6fd44f7c54 100644 --- a/src/calibre/translations/calibre.pot +++ b/src/calibre/translations/calibre.pot @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: calibre 0.7.38\n" -"POT-Creation-Date: 2011-01-07 13:12+MST\n" -"PO-Revision-Date: 2011-01-07 13:12+MST\n" +"POT-Creation-Date: 2011-01-08 18:40+MST\n" +"PO-Revision-Date: 2011-01-08 18:40+MST\n" "Last-Translator: Automatically generated\n" "Language-Team: LANGUAGE\n" "MIME-Version: 1.0\n" @@ -2905,28 +2905,29 @@ msgstr "" msgid " (Preface)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:26 +#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:27 msgid "" "Paragraph structure.\n" -"choices are ['auto', 'block', 'single', 'print', 'markdown']\n" +"choices are ['auto', 'block', 'single', 'print', 'unformatted']\n" "* auto: Try to auto detect paragraph type.\n" "* block: Treat a blank line as a paragraph break.\n" "* single: Assume every line is a paragraph.\n" -"* print: Assume every line starting with 2+ spaces or a tab starts a paragraph." +"* print: Assume every line starting with 2+ spaces or a tab starts a paragraph.* unformatted: Most lines have hard line breaks, few/no spaces or indents." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:35 +#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:37 msgid "" -"Formatting used within the document.* auto: Try to auto detect the document formatting.\n" -"* none: Do not modify the paragraph formatting. Everything is a paragraph.\n" -"* markdown: Run the input though the markdown pre-processor. To learn more about markdown see" +"Formatting used within the document.* auto: Automatically decide which formatting processor to use.\n" +"* none: Do not process the document formatting. Everything is a paragraph and no styling is applied.\n" +"* heuristic: Process using heuristics to determine formatting such as chapter headings and italic text.\n" +"* markdown: Processing using markdown formatting. To learn more about markdown see" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:41 +#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:46 msgid "Normally extra spaces are condensed into a single space. With this option all spaces will be displayed." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:44 +#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:49 msgid "Do not insert a Table of Contents into the output text." msgstr "" @@ -7225,7 +7226,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:65 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:219 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server_ui.py:130 -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:169 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:172 msgid "&Show password" msgstr "" @@ -10621,48 +10622,56 @@ msgstr "" msgid "Mail successfully sent" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:136 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:95 +msgid "OK to proceed?" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:96 +msgid "This will display your email password on the screen. Is it OK to proceed?" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:139 msgid "If you are setting up a new hotmail account, you must log in to it once before you will be able to send mails." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:147 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:150 msgid "Setup sending email using" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:149 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:152 msgid "If you don't have an account, you can sign up for a free {name} email account at http://{url}. {extra}" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:156 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:159 msgid "Your %s &email address:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:157 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:160 msgid "Your %s &username:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:158 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:161 msgid "Your %s &password:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:176 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:179 msgid "If you plan to use email to send books to your Kindle, remember to add the your %s email address to the allowed email addresses in your Amazon.com Kindle management page." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:183 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:186 msgid "Setup" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:198 -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:205 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:201 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:208 msgid "Bad configuration" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:199 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:202 msgid "You must set the From email address" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:206 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:209 msgid "You must set the username and password for the mail server." msgstr ""