Changeset 465:e90af9681b03

Timestamp:

08/28/08 22:47:40 (4 years ago)

Author:

mitsuhiko

Branch:

default

Children:

466:9f0c0ed645b0, 467:2a64ffa4acf0

Message:

Renamed TextPress? to Zine.

Files:

: 1 deleted
: 22 edited
: 230 moved

.hgignore (modified) (1 diff)
AUTHORS (modified) (1 diff)
INSTALL (modified) (2 diffs)
artwork/README (modified) (1 diff)
artwork/logo.png (deleted)
artwork/logo.svg (modified) (4 diffs)
scripts/_init_zine.py (moved) (moved from scripts/_init_textpress.py) (3 diffs)
scripts/add-translation (modified) (4 diffs)
scripts/build-documentation (modified) (3 diffs)
scripts/build-event-map (modified) (4 diffs)
scripts/bundle-plugin (modified) (4 diffs)
scripts/compile-translations (modified) (1 diff)
scripts/extract-messages (modified) (2 diffs)
scripts/install-posix (modified) (2 diffs)
scripts/new-plugin (modified) (2 diffs)
scripts/reset-instance (modified) (4 diffs)
scripts/run-tests (modified) (1 diff)
scripts/server (modified) (3 diffs)
scripts/shell (modified) (4 diffs)
scripts/uninstall-posix (modified) (2 diffs)
scripts/update-translations (modified) (1 diff)
servers/README (modified) (1 diff)
servers/zine.cgi (moved) (moved from servers/textpress.cgi) (3 diffs)
servers/zine.fcgi (moved) (moved from servers/textpress.fcgi) (3 diffs)
servers/zine.wsgi (moved) (moved from servers/textpress.wsgi) (2 diffs)
tests/__init__.py (modified) (8 diffs)
tests/config.txt (modified) (7 diffs)
tests/instance/zine.ini (moved) (moved from tests/instance/textpress.ini) (1 diff)
zine/__init__.py (moved) (moved from textpress/__init__.py) (6 diffs)
zine/_dynamic/__init__.py (moved) (moved from textpress/_dynamic/__init__.py) (2 diffs)
zine/_dynamic/_helper.py (moved) (moved from textpress/_dynamic/_helper.py) (1 diff)
zine/_ext/__init__.py (moved) (moved from textpress/_ext/__init__.py) (1 diff)
zine/_ext/beautifulsoup.py (moved) (moved from textpress/_ext/beautifulsoup.py)
zine/api.py (moved) (moved from textpress/api.py) (3 diffs)
zine/application.py (moved) (moved from textpress/application.py) (31 diffs)
zine/cache.py (moved) (moved from textpress/cache.py) (4 diffs)
zine/config.py (moved) (moved from textpress/config.py) (16 diffs)
zine/database.py (moved) (moved from textpress/database.py) (5 diffs)
zine/docs/__init__.py (moved) (moved from textpress/docs/__init__.py) (2 diffs)
zine/docs/builder.py (moved) (moved from textpress/docs/builder.py) (1 diff)
zine/docs/de/index.rst (moved) (moved from textpress/docs/de/index.rst)
zine/docs/de/plugins/index.rst (moved) (moved from textpress/docs/de/plugins/index.rst)
zine/docs/en/basic-options.png (moved) (moved from textpress/docs/en/basic-options.png)
zine/docs/en/index.rst (moved) (moved from textpress/docs/en/index.rst)
zine/docs/en/introduction.rst (moved) (moved from textpress/docs/en/introduction.rst)
zine/docs/en/plugins/index.rst (moved) (moved from textpress/docs/en/plugins/index.rst)
zine/docs/en/select-theme.png (moved) (moved from textpress/docs/en/select-theme.png)
zine/docs/en/welcome.png (moved) (moved from textpress/docs/en/welcome.png)
zine/environment.py (moved) (moved from textpress/environment.py) (6 diffs)
zine/experimental_plugins/hyphenation_en/__init__.py (moved) (moved from textpress/experimental_plugins/hyphenation_en/__init__.py)
zine/experimental_plugins/hyphenation_en/hyphenate.py (moved) (moved from textpress/experimental_plugins/hyphenation_en/hyphenate.py)
zine/experimental_plugins/hyphenation_en/metadata.txt (moved) (moved from textpress/experimental_plugins/hyphenation_en/metadata.txt)
zine/experimental_plugins/notification/__init__.py (moved) (moved from textpress/experimental_plugins/notification/__init__.py)
zine/experimental_plugins/notification/metadata.txt (moved) (moved from textpress/experimental_plugins/notification/metadata.txt)
zine/fragment.py (moved) (moved from textpress/fragment.py) (2 diffs)
zine/htmlhelpers.py (moved) (moved from textpress/htmlhelpers.py) (1 diff)
zine/i18n/__init__.py (moved) (moved from textpress/i18n/__init__.py) (15 diffs)
zine/i18n/de/messages.po (moved) (moved from textpress/i18n/de/messages.po) (115 diffs)
zine/importers/__init__.py (moved) (moved from textpress/importers/__init__.py) (7 diffs)
zine/importers/blogger.py (moved) (moved from textpress/importers/blogger.py) (7 diffs)
zine/importers/wordpress.py (moved) (moved from textpress/importers/wordpress.py) (2 diffs)
zine/models.py (moved) (moved from textpress/models.py) (13 diffs)
zine/parsers/__init__.py (moved) (moved from textpress/parsers/__init__.py) (3 diffs)
zine/parsers/comments.py (moved) (moved from textpress/parsers/comments.py) (3 diffs)
zine/parsers/simplehtml.py (moved) (moved from textpress/parsers/simplehtml.py) (5 diffs)
zine/pingback.py (moved) (moved from textpress/pingback.py) (5 diffs)
zine/plugins/akismet_spam_filter/__init__.py (moved) (moved from textpress/plugins/akismet_spam_filter/__init__.py) (2 diffs)
zine/plugins/akismet_spam_filter/metadata.txt (moved) (moved from textpress/plugins/akismet_spam_filter/metadata.txt)
zine/plugins/akismet_spam_filter/templates/admin/akismet_spam_filter.html (moved) (moved from textpress/plugins/akismet_spam_filter/templates/admin/akismet_spam_filter.html)
zine/plugins/akismet_spam_filter/templates/admin/akismet_widget.html (moved) (moved from textpress/plugins/akismet_spam_filter/templates/admin/akismet_widget.html) (1 diff)
zine/plugins/akismet_spam_filter/templates/akismet_widget.html (moved) (moved from textpress/plugins/akismet_spam_filter/templates/akismet_widget.html)
zine/plugins/creole_parser/__init__.py (moved) (moved from textpress/plugins/creole_parser/__init__.py) (2 diffs)
zine/plugins/creole_parser/metadata.txt (moved) (moved from textpress/plugins/creole_parser/metadata.txt)
zine/plugins/eric_the_fish/__init__.py (moved) (moved from textpress/plugins/eric_the_fish/__init__.py) (6 diffs)
zine/plugins/eric_the_fish/fortunes.py (moved) (moved from textpress/plugins/eric_the_fish/fortunes.py) (1 diff)
zine/plugins/eric_the_fish/metadata.txt (moved) (moved from textpress/plugins/eric_the_fish/metadata.txt)
zine/plugins/eric_the_fish/shared/bubble.png (moved) (moved from textpress/plugins/eric_the_fish/shared/bubble.png)
zine/plugins/eric_the_fish/shared/eric-blue.png (moved) (moved from textpress/plugins/eric_the_fish/shared/eric-blue.png)
zine/plugins/eric_the_fish/shared/eric-green.png (moved) (moved from textpress/plugins/eric_the_fish/shared/eric-green.png)
zine/plugins/eric_the_fish/shared/eric-pink.png (moved) (moved from textpress/plugins/eric_the_fish/shared/eric-pink.png)
zine/plugins/eric_the_fish/shared/eric-red.png (moved) (moved from textpress/plugins/eric_the_fish/shared/eric-red.png)
zine/plugins/eric_the_fish/shared/eric-yellow.png (moved) (moved from textpress/plugins/eric_the_fish/shared/eric-yellow.png)
zine/plugins/eric_the_fish/shared/fish.css (moved) (moved from textpress/plugins/eric_the_fish/shared/fish.css)
zine/plugins/eric_the_fish/shared/fish.js (moved) (moved from textpress/plugins/eric_the_fish/shared/fish.js) (1 diff)
zine/plugins/eric_the_fish/templates/admin/eric_the_fish.html (moved) (moved from textpress/plugins/eric_the_fish/templates/admin/eric_the_fish.html)
zine/plugins/markdown_parser/__init__.py (moved) (moved from textpress/plugins/markdown_parser/__init__.py) (2 diffs)
zine/plugins/markdown_parser/markdown.py (moved) (moved from textpress/plugins/markdown_parser/markdown.py)
zine/plugins/markdown_parser/metadata.txt (moved) (moved from textpress/plugins/markdown_parser/metadata.txt)
zine/plugins/miniblog_theme/__init__.py (moved) (moved from textpress/plugins/miniblog_theme/__init__.py) (1 diff)
zine/plugins/miniblog_theme/metadata.txt (moved) (moved from textpress/plugins/miniblog_theme/metadata.txt)
zine/plugins/miniblog_theme/shared/preview.png (moved) (moved from textpress/plugins/miniblog_theme/shared/preview.png)
zine/plugins/miniblog_theme/shared/style.css (moved) (moved from textpress/plugins/miniblog_theme/shared/style.css)
zine/plugins/miniblog_theme/templates/_post.html (moved) (moved from textpress/plugins/miniblog_theme/templates/_post.html)
zine/plugins/miniblog_theme/templates/_widgets.html (moved) (moved from textpress/plugins/miniblog_theme/templates/_widgets.html)
zine/plugins/miniblog_theme/templates/layout.html (moved) (moved from textpress/plugins/miniblog_theme/templates/layout.html) (1 diff)
zine/plugins/myrtle_theme/__init__.py (moved) (moved from textpress/plugins/myrtle_theme/__init__.py) (1 diff)
zine/plugins/myrtle_theme/metadata.txt (moved) (moved from textpress/plugins/myrtle_theme/metadata.txt)
zine/plugins/myrtle_theme/shared/img/code.png (moved) (moved from textpress/plugins/myrtle_theme/shared/img/code.png)
zine/plugins/myrtle_theme/shared/img/header.png (moved) (moved from textpress/plugins/myrtle_theme/shared/img/header.png)
zine/plugins/myrtle_theme/shared/img/metabg.png (moved) (moved from textpress/plugins/myrtle_theme/shared/img/metabg.png)
zine/plugins/myrtle_theme/shared/img/pagebg.png (moved) (moved from textpress/plugins/myrtle_theme/shared/img/pagebg.png)
zine/plugins/myrtle_theme/shared/img/quote.png (moved) (moved from textpress/plugins/myrtle_theme/shared/img/quote.png)
zine/plugins/myrtle_theme/shared/img/relatedbg.png (moved) (moved from textpress/plugins/myrtle_theme/shared/img/relatedbg.png)
zine/plugins/myrtle_theme/shared/img/sidebarbg.png (moved) (moved from textpress/plugins/myrtle_theme/shared/img/sidebarbg.png)
zine/plugins/myrtle_theme/shared/preview.png (moved) (moved from textpress/plugins/myrtle_theme/shared/preview.png)
zine/plugins/myrtle_theme/shared/style.css (moved) (moved from textpress/plugins/myrtle_theme/shared/style.css)
zine/plugins/myrtle_theme/templates/_widgets.html (moved) (moved from textpress/plugins/myrtle_theme/templates/_widgets.html)
zine/plugins/myrtle_theme/templates/layout.html (moved) (moved from textpress/plugins/myrtle_theme/templates/layout.html) (1 diff)
zine/plugins/pygments_support/__init__.py (moved) (moved from textpress/plugins/pygments_support/__init__.py) (2 diffs)
zine/plugins/pygments_support/metadata.txt (moved) (moved from textpress/plugins/pygments_support/metadata.txt)
zine/plugins/pygments_support/templates/admin/pygments_support.html (moved) (moved from textpress/plugins/pygments_support/templates/admin/pygments_support.html)
zine/plugins/typography/__init__.py (moved) (moved from textpress/plugins/typography/__init__.py) (2 diffs)
zine/plugins/typography/metadata.txt (moved) (moved from textpress/plugins/typography/metadata.txt)
zine/plugins/typography/shared/script.js (moved) (moved from textpress/plugins/typography/shared/script.js)
zine/plugins/typography/shared/style.css (moved) (moved from textpress/plugins/typography/shared/style.css)
zine/plugins/typography/templates/admin/typography.html (moved) (moved from textpress/plugins/typography/templates/admin/typography.html)
zine/plugins/vessel_theme/__init__.py (moved) (moved from textpress/plugins/vessel_theme/__init__.py) (2 diffs)
zine/plugins/vessel_theme/metadata.txt (moved) (moved from textpress/plugins/vessel_theme/metadata.txt)
zine/plugins/vessel_theme/shared/gray.css (moved) (moved from textpress/plugins/vessel_theme/shared/gray.css)
zine/plugins/vessel_theme/shared/green.css (moved) (moved from textpress/plugins/vessel_theme/shared/green.css)
zine/plugins/vessel_theme/shared/preview.png (moved) (moved from textpress/plugins/vessel_theme/shared/preview.png)
zine/plugins/vessel_theme/shared/style.css (moved) (moved from textpress/plugins/vessel_theme/shared/style.css)
zine/plugins/vessel_theme/templates/_widgets.html (moved) (moved from textpress/plugins/vessel_theme/templates/_widgets.html)
zine/plugins/vessel_theme/templates/admin/configure_vessel_theme.html (moved) (moved from textpress/plugins/vessel_theme/templates/admin/configure_vessel_theme.html)
zine/plugins/vessel_theme/templates/layout.html (moved) (moved from textpress/plugins/vessel_theme/templates/layout.html) (1 diff)
zine/plugins/xapian_search/__init__.py (moved) (moved from textpress/plugins/xapian_search/__init__.py) (3 diffs)
zine/plugins/xapian_search/metadata.txt (moved) (moved from textpress/plugins/xapian_search/metadata.txt) (1 diff)
zine/plugins/xapian_search/templates/admin/configure_xapian_search.html (moved) (moved from textpress/plugins/xapian_search/templates/admin/configure_xapian_search.html)
zine/plugins/xapian_search/templates/search_results.html (moved) (moved from textpress/plugins/xapian_search/templates/search_results.html)
zine/plugins/xapian_search/templates/widgets/quicksearch.html (moved) (moved from textpress/plugins/xapian_search/templates/widgets/quicksearch.html)
zine/pluginsystem.py (moved) (moved from textpress/pluginsystem.py) (12 diffs)
zine/services.py (moved) (moved from textpress/services.py) (1 diff)
zine/shared/admin/img/add.png (moved) (moved from textpress/shared/admin/img/add.png)
zine/shared/admin/img/banner.png (moved) (moved from textpress/shared/admin/img/banner.png)
zine/shared/admin/img/bodybg.png (moved) (moved from textpress/shared/admin/img/bodybg.png)
zine/shared/admin/img/border-bl.png (moved) (moved from textpress/shared/admin/img/border-bl.png)
zine/shared/admin/img/border-br.png (moved) (moved from textpress/shared/admin/img/border-br.png)
zine/shared/admin/img/border-tl.png (moved) (moved from textpress/shared/admin/img/border-tl.png)
zine/shared/admin/img/border-tr.png (moved) (moved from textpress/shared/admin/img/border-tr.png)
zine/shared/admin/img/configure.png (moved) (moved from textpress/shared/admin/img/configure.png)
zine/shared/admin/img/dialogbg.png (moved) (moved from textpress/shared/admin/img/dialogbg.png)
zine/shared/admin/img/error.png (moved) (moved from textpress/shared/admin/img/error.png)
zine/shared/admin/img/footerbg.png (moved) (moved from textpress/shared/admin/img/footerbg.png)
zine/shared/admin/img/info.png (moved) (moved from textpress/shared/admin/img/info.png)
zine/shared/admin/img/ok.png (moved) (moved from textpress/shared/admin/img/ok.png)
zine/shared/admin/img/remove.png (moved) (moved from textpress/shared/admin/img/remove.png)
zine/shared/admin/style.css (moved) (moved from textpress/shared/admin/style.css)
zine/shared/default_preview.png (moved) (moved from textpress/shared/default_preview.png)
zine/shared/js/Admin.js (moved) (moved from textpress/shared/js/Admin.js) (3 diffs)
zine/shared/js/Form.js (moved) (moved from textpress/shared/js/Form.js)
zine/shared/js/JSON.js (moved) (moved from textpress/shared/js/JSON.js)
zine/shared/js/TextPress.js (moved) (moved from textpress/shared/js/TextPress.js) (6 diffs)
zine/shared/js/WidgetManager.js (moved) (moved from textpress/shared/js/WidgetManager.js) (2 diffs)
zine/shared/js/jQuery.js (moved) (moved from textpress/shared/js/jQuery.js)
zine/templates/403.html (moved) (moved from textpress/templates/403.html)
zine/templates/404.html (moved) (moved from textpress/templates/404.html)
zine/templates/_comment.html (moved) (moved from textpress/templates/_comment.html) (1 diff)
zine/templates/_post.html (moved) (moved from textpress/templates/_post.html)
zine/templates/_widgets.html (moved) (moved from textpress/templates/_widgets.html)
zine/templates/admin/_comment.html (moved) (moved from textpress/templates/admin/_comment.html)
zine/templates/admin/about_zine.html (moved) (moved from textpress/templates/admin/about_textpress.html) (1 diff)
zine/templates/admin/approve_comment.html (moved) (moved from textpress/templates/admin/approve_comment.html)
zine/templates/admin/basic_options.html (moved) (moved from textpress/templates/admin/basic_options.html)
zine/templates/admin/block_comment.html (moved) (moved from textpress/templates/admin/block_comment.html)
zine/templates/admin/blogger_perform_import.html (moved) (moved from textpress/templates/admin/blogger_perform_import.html)
zine/templates/admin/cache.html (moved) (moved from textpress/templates/admin/cache.html) (3 diffs)
zine/templates/admin/change_password.html (moved) (moved from textpress/templates/admin/change_password.html)
zine/templates/admin/configuration.html (moved) (moved from textpress/templates/admin/configuration.html)
zine/templates/admin/delete_comment.html (moved) (moved from textpress/templates/admin/delete_comment.html)
zine/templates/admin/delete_comments.html (moved) (moved from textpress/templates/admin/delete_comments.html)
zine/templates/admin/delete_import.html (moved) (moved from textpress/templates/admin/delete_import.html)
zine/templates/admin/delete_page.html (moved) (moved from textpress/templates/admin/delete_page.html)
zine/templates/admin/delete_post.html (moved) (moved from textpress/templates/admin/delete_post.html)
zine/templates/admin/delete_tag.html (moved) (moved from textpress/templates/admin/delete_tag.html)
zine/templates/admin/delete_user.html (moved) (moved from textpress/templates/admin/delete_user.html)
zine/templates/admin/edit_comment.html (moved) (moved from textpress/templates/admin/edit_comment.html)
zine/templates/admin/edit_post.html (moved) (moved from textpress/templates/admin/edit_post.html)
zine/templates/admin/edit_tag.html (moved) (moved from textpress/templates/admin/edit_tag.html)
zine/templates/admin/edit_user.html (moved) (moved from textpress/templates/admin/edit_user.html)
zine/templates/admin/export.html (moved) (moved from textpress/templates/admin/export.html) (2 diffs)
zine/templates/admin/file_uploads/browse.html (moved) (moved from textpress/templates/admin/file_uploads/browse.html)
zine/templates/admin/file_uploads/config.html (moved) (moved from textpress/templates/admin/file_uploads/config.html) (1 diff)
zine/templates/admin/file_uploads/delete.html (moved) (moved from textpress/templates/admin/file_uploads/delete.html)
zine/templates/admin/file_uploads/thumbnailer.html (moved) (moved from textpress/templates/admin/file_uploads/thumbnailer.html)
zine/templates/admin/file_uploads/upload.html (moved) (moved from textpress/templates/admin/file_uploads/upload.html)
zine/templates/admin/help.html (moved) (moved from textpress/templates/admin/help.html)
zine/templates/admin/import.html (moved) (moved from textpress/templates/admin/import.html) (1 diff)
zine/templates/admin/import_blogger.html (moved) (moved from textpress/templates/admin/import_blogger.html)
zine/templates/admin/import_wordpress.html (moved) (moved from textpress/templates/admin/import_wordpress.html) (1 diff)
zine/templates/admin/index.html (moved) (moved from textpress/templates/admin/index.html) (3 diffs)
zine/templates/admin/information.html (moved) (moved from textpress/templates/admin/information.html) (1 diff)
zine/templates/admin/inspect_import.html (moved) (moved from textpress/templates/admin/inspect_import.html)
zine/templates/admin/layout.html (moved) (moved from textpress/templates/admin/layout.html) (1 diff)
zine/templates/admin/login.html (moved) (moved from textpress/templates/admin/login.html)
zine/templates/admin/maintenance.html (moved) (moved from textpress/templates/admin/maintenance.html)
zine/templates/admin/pages_config.html (moved) (moved from textpress/templates/admin/pages_config.html)
zine/templates/admin/perform_import.html (moved) (moved from textpress/templates/admin/perform_import.html) (1 diff)
zine/templates/admin/plugins.html (moved) (moved from textpress/templates/admin/plugins.html) (2 diffs)
zine/templates/admin/remove_plugin.html (moved) (moved from textpress/templates/admin/remove_plugin.html)
zine/templates/admin/show_comments.html (moved) (moved from textpress/templates/admin/show_comments.html)
zine/templates/admin/show_pages.html (moved) (moved from textpress/templates/admin/show_pages.html)
zine/templates/admin/show_posts.html (moved) (moved from textpress/templates/admin/show_posts.html)
zine/templates/admin/show_tags.html (moved) (moved from textpress/templates/admin/show_tags.html)
zine/templates/admin/show_users.html (moved) (moved from textpress/templates/admin/show_users.html)
zine/templates/admin/theme.html (moved) (moved from textpress/templates/admin/theme.html)
zine/templates/admin/unblock_comment.html (moved) (moved from textpress/templates/admin/unblock_comment.html)
zine/templates/admin/url_options.html (moved) (moved from textpress/templates/admin/url_options.html)
zine/templates/admin/urls.html (moved) (moved from textpress/templates/admin/urls.html)
zine/templates/admin/widgets/html.html (moved) (moved from textpress/templates/admin/widgets/html.html)
zine/templates/admin/widgets/latest_comments.html (moved) (moved from textpress/templates/admin/widgets/latest_comments.html)
zine/templates/admin/widgets/latest_posts.html (moved) (moved from textpress/templates/admin/widgets/latest_posts.html)
zine/templates/admin/widgets/post_archive_summary.html (moved) (moved from textpress/templates/admin/widgets/post_archive_summary.html)
zine/templates/admin/widgets/tagcloud.html (moved) (moved from textpress/templates/admin/widgets/tagcloud.html)
zine/templates/admin/write_page.html (moved) (moved from textpress/templates/admin/write_page.html)
zine/templates/archive.html (moved) (moved from textpress/templates/archive.html)
zine/templates/authors.html (moved) (moved from textpress/templates/authors.html)
zine/templates/index.html (moved) (moved from textpress/templates/index.html)
zine/templates/layout.html (moved) (moved from textpress/templates/layout.html) (1 diff)
zine/templates/maintenance.html (moved) (moved from textpress/templates/maintenance.html) (2 diffs)
zine/templates/page_base.html (moved) (moved from textpress/templates/page_base.html)
zine/templates/show_author.html (moved) (moved from textpress/templates/show_author.html)
zine/templates/show_post.html (moved) (moved from textpress/templates/show_post.html)
zine/templates/show_tag.html (moved) (moved from textpress/templates/show_tag.html)
zine/templates/tag_cloud.html (moved) (moved from textpress/templates/tag_cloud.html)
zine/templates/widgets/base.html (moved) (moved from textpress/templates/widgets/base.html)
zine/templates/widgets/latest_comments.html (moved) (moved from textpress/templates/widgets/latest_comments.html)
zine/templates/widgets/latest_posts.html (moved) (moved from textpress/templates/widgets/latest_posts.html)
zine/templates/widgets/pages_navigation.html (moved) (moved from textpress/templates/widgets/pages_navigation.html)
zine/templates/widgets/post_archive_summary.html (moved) (moved from textpress/templates/widgets/post_archive_summary.html)
zine/templates/widgets/tagcloud.html (moved) (moved from textpress/templates/widgets/tagcloud.html)
zine/urls.py (moved) (moved from textpress/urls.py) (3 diffs)
zine/utils/__init__.py (moved) (moved from textpress/utils/__init__.py) (2 diffs)
zine/utils/admin.py (moved) (moved from textpress/utils/admin.py) (3 diffs)
zine/utils/crypto.py (moved) (moved from textpress/utils/crypto.py) (1 diff)
zine/utils/dates.py (moved) (moved from textpress/utils/dates.py) (1 diff)
zine/utils/mail.py (moved) (moved from textpress/utils/mail.py) (2 diffs)
zine/utils/uploads.py (moved) (moved from textpress/utils/uploads.py) (2 diffs)
zine/utils/validators.py (moved) (moved from textpress/utils/validators.py) (2 diffs)
zine/utils/xml.py (moved) (moved from textpress/utils/xml.py) (5 diffs)
zine/utils/xxx.py (moved) (moved from textpress/utils/xxx.py) (7 diffs)
zine/views/__init__.py (moved) (moved from textpress/views/__init__.py) (3 diffs)
zine/views/admin.py (moved) (moved from textpress/views/admin.py) (16 diffs)
zine/views/blog.py (moved) (moved from textpress/views/blog.py) (3 diffs)
zine/websetup/__init__.py (moved) (moved from textpress/websetup/__init__.py) (8 diffs)
zine/websetup/templates/admin_account.html (moved) (moved from textpress/websetup/templates/admin_account.html) (1 diff)
zine/websetup/templates/database.html (moved) (moved from textpress/websetup/templates/database.html) (1 diff)
zine/websetup/templates/error.html (moved) (moved from textpress/websetup/templates/error.html) (1 diff)
zine/websetup/templates/finished.html (moved) (moved from textpress/websetup/templates/finished.html)
zine/websetup/templates/layout.html (moved) (moved from textpress/websetup/templates/layout.html) (2 diffs)
zine/websetup/templates/start.html (moved) (moved from textpress/websetup/templates/start.html) (1 diff)
zine/websetup/templates/summary.html (moved) (moved from textpress/websetup/templates/summary.html) (1 diff)
zine/widgets.py (moved) (moved from textpress/widgets.py) (2 diffs)
zine/zxa.py (moved) (moved from textpress/tpxa.py) (14 diffs)

Legend:

: Unmodified
: Added
: Removed

.hgignore

-                      r452
+                      r465
 ^dumps/
 ^.*\.egg-info/
 ^textpress/i18n/messages\.pot$
 ^textpress/i18n/.*?/messages.catalog$
 ^textpress/docs/.*?\.page$
+^zine/i18n/messages\.pot$
+^zine/i18n/.*?/messages.catalog$
+^zine/docs/.*?\.page$
 .coverage
 ^docs/_build/

AUTHORS

r339	r465
1		~~TextPress~~ is written and maintained by Armin Ronacher <armin.ronacher@active-4.com>.
	1	Zine is written and maintained by Armin Ronacher <armin.ronacher@active-4.com>.
2	2
3	3	Other contributors (as mentionend in :copyright:s) are:

INSTALL

-                      r450
+                      r465
 TextPress 0.1 Alpha Installation Instructions
 =============================================
+Zine 0.1 Alpha Installation Instructions
+========================================
 For a working TextPress instance you need to have the following libraries
+For a working Zine instance you need to have the following libraries
 installed:
 …
 helps you to create the database tables and an administrator account.
 To get access to a python console with the textpress instance context do this:
+To get access to a python console with the zine instance context do this:
     $ ./scripts/shell

artwork/README

r150	r465
1	1	The files in this directory represent the current and not final
2		artwork for ~~TextPress~~!
	2	artwork for Zine!

artwork/logo.svg

-                      r11
+                      r465
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://web.resource.org/cc/"
+   xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
 …
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="630"
    height="210"
+   width="700"
+   height="260"
    id="svg2"
    sodipodi:version="0.32"
+   inkscape:version="0.44"
+   inkscape:version="0.46"
+   sodipodi:docname="zine.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.0"
+   sodipodi:docbase="/home/blackbird/Development/textpress"
+   sodipodi:docname="logo.svg">
+   inkscape:export-filename="/Users/mitsuhiko/Desktop/zine.png"
+   inkscape:export-xdpi="105.43"
+   inkscape:export-ydpi="105.43">
   <defs
+     id="defs4" />
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+    <inkscape:perspective
+       id="perspective3311"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
   <sodipodi:namedview
      id="base"
 …
      inkscape:pageshadow="2"
      inkscape:zoom="1.4"
      inkscape:cx="351.98687"
      inkscape:cy="30.494969"
+     inkscape:cx="352.05213"
+     inkscape:cy="102.17884"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1440"
+     inkscape:window-height="852"
+     inkscape:window-x="0"
+     inkscape:window-y="22"
      showguides="true"
+     inkscape:guide-bbox="true"
+     width="630px"
+     height="210px"
+     units="px"
+     inkscape:window-width="1400"
+     inkscape:window-height="968"
+     inkscape:window-x="0"
+     inkscape:window-y="33" />
+     inkscape:guide-bbox="true" />
   <metadata
      id="metadata7">
 …
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-22.69223,-16.51978)">
+     id="layer1">
     <path
+       transform="scale(0.950754,1.051797)"
+       style="font-size:209.93206787px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#e3e3e3;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Exmouth"
+       d="M 31.380449,167.81234 C 31.380433,165.21555 32.200479,163.06293 33.84059,161.35447 C 35.480664,159.57773 37.564949,158.68935 40.09345,158.68932 C 41.870192,158.68935 43.37361,159.40689 44.603709,160.84194 C 45.902086,162.27705 46.551289,163.88298 46.551321,165.65972 C 46.551289,167.16316 46.004592,168.70075 44.911226,170.27249 C 43.886139,171.84426 42.621901,172.63014 41.118508,172.63012 C 38.863355,172.63014 36.779071,171.94677 34.865649,170.58 C 36.984082,180.48891 47.849696,185.44336 67.462523,185.44336 C 82.633328,185.44336 95.48072,181.61648 106.00474,173.9627 C 113.52174,168.56407 122.71309,158.48434 133.57882,143.72346 L 157.15518,111.63912 C 162.9637,103.78042 173.04343,92.880633 187.39442,78.939736 C 202.22342,64.384023 213.29404,54.850985 220.60633,50.340592 L 221.9389,50.033074 L 222.75895,50.955627 L 222.45143,52.083192 C 220.12776,54.748479 216.54006,58.165339 211.68831,62.333781 C 206.42615,66.844162 202.77011,70.158516 200.72018,72.276853 C 192.92956,80.614107 181.14139,97.185876 165.35565,121.99221 C 151.61972,143.58683 139.21652,158.86019 128.14601,167.81234 C 111.47162,181.20646 91.141308,187.9035 67.155005,187.9035 C 58.134444,187.9035 50.583184,186.7076 44.501203,184.31579 C 35.754013,180.89894 31.380433,175.39779 31.380449,167.81234 M 161.46043,42.960167 C 144.85434,42.960313 129.23929,46.137993 114.61523,52.493215 C 95.754069,60.625478 86.323536,71.901115 86.323607,86.32016 C 86.323536,91.99225 89.193698,96.229156 94.934102,99.030891 C 99.37594,101.28611 104.70624,102.41367 110.92502,102.41359 C 120.28712,102.41367 130.87939,99.611847 142.70185,94.008102 C 156.57417,87.447826 163.5104,80.067409 163.51054,71.866829 C 163.5104,68.176738 162.04115,65.306576 159.10279,63.256334 C 156.50583,61.411356 153.29399,60.488803 149.46724,60.488675 C 133.54454,60.488803 117.96366,67.322523 102.72455,80.989854 C 100.60601,83.381763 97.223318,86.730286 92.576467,91.035431 L 91.653913,91.240443 L 90.936372,90.420396 L 91.24389,89.292831 C 94.729011,82.185862 103.23699,75.112963 116.76786,68.074111 C 129.75182,61.377187 140.44659,58.028665 148.8522,58.028534 C 153.22565,58.028665 157.01836,59.019554 160.23036,61.001204 C 164.05709,63.393134 165.97053,66.673319 165.97069,70.84177 C 165.97053,80.409095 158.9318,88.746233 144.85447,95.853208 C 132.89533,102.00365 121.58553,105.07882 110.92502,105.07874 C 103.88619,105.07882 97.872522,103.64374 92.883984,100.77349 C 86.870234,97.288382 83.863397,92.23143 83.863466,85.602619 C 83.863397,79.794061 85.366815,74.737108 88.373725,70.431747 C 99.102591,55.192671 116.87026,45.454621 141.67679,41.217567 C 152.81563,39.304274 173.96599,38.347553 205.12794,38.347402 C 212.91819,38.347553 224.56968,38.41589 240.08245,38.552414 C 255.6631,38.620902 267.34876,38.65507 275.13946,38.65492 C 281.35789,38.65507 286.07315,38.005867 289.28527,36.707308 C 291.54013,35.750739 295.46952,33.188095 301.07345,29.019366 L 301.996,28.609342 L 303.22608,30.044425 L 302.81605,31.069484 C 291.54013,43.165325 272.88407,49.213167 246.84783,49.213027 C 237.21206,49.213167 222.92959,48.188109 204.00037,46.13785 C 185.07078,44.01954 170.89081,42.960313 161.46043,42.960167 M 198.97758,166.37726 L 200.00264,168.01736 L 199.59261,169.04242 C 180.93654,182.50486 168.05498,189.23608 160.94789,189.23608 C 151.99573,189.23608 147.51965,185.78505 147.51962,178.88298 C 147.51965,171.50257 152.20075,164.05382 161.56293,156.5367 C 170.51511,149.36132 178.74975,145.77362 186.26685,145.77358 C 190.57208,145.77362 192.7247,147.55039 192.72472,151.10388 C 192.7247,155.20415 189.44452,158.82602 182.88415,161.96951 C 176.80214,164.56635 170.72013,167.19733 164.63811,169.86246 C 158.07774,173.27934 154.79756,177.44791 154.79754,182.36818 C 154.79756,184.82833 156.33515,186.0584 159.41031,186.05839 C 165.90235,186.0584 174.06865,182.77821 183.90921,176.21783 C 193.8181,169.65747 198.84088,166.37728 198.97758,166.37726 M 166.58572,164.94218 C 181.96159,159.88525 189.64953,155.30666 189.64954,151.20639 C 189.64953,149.63467 188.89782,148.84879 187.39441,148.84875 C 182.13244,148.84879 175.19621,154.21326 166.58572,164.94218 M 264.06883,153.0515 C 264.06878,157.97181 261.84782,160.43195 257.40594,160.43192 C 254.67242,160.43195 253.30567,159.0652 253.30571,156.33168 C 253.30567,152.70985 255.15078,150.89891 258.84102,150.89887 C 259.31935,150.89891 259.79771,150.96725 260.27611,151.10388 C 259.31935,150.1472 258.26012,149.66884 257.09842,149.6688 C 253.20317,149.66884 246.43779,154.45244 236.80226,164.01963 C 227.1667,173.51852 222.34893,180.1814 222.34893,184.00828 C 222.34893,185.78505 224.70656,186.67343 229.42183,186.67343 C 234.06875,186.67343 240.32161,184.21329 248.18041,179.293 C 254.19406,175.46613 259.76354,171.22923 264.88887,166.58227 L 266.11894,168.11986 C 265.77721,171.60508 260.48108,176.11533 250.23053,181.65064 C 240.45828,186.98095 233.45372,189.6461 229.21682,189.6461 C 221.2897,189.6461 217.32614,186.33175 217.32614,179.70303 C 207.55392,185.85338 200.75437,188.92856 196.92747,188.92856 C 191.52885,188.92856 188.82953,186.84427 188.8295,182.6757 C 188.82953,177.00372 191.28967,174.16772 196.20992,174.16771 C 199.01177,174.16772 200.41269,175.73948 200.41267,178.88298 C 200.41269,183.25657 197.57669,184.965 191.90468,184.00828 C 192.9981,185.23835 194.36485,185.85338 196.00491,185.85338 C 200.85688,185.85338 208.51064,181.20646 218.96623,171.91258 C 229.35349,162.61874 234.54711,155.64835 234.54713,151.00138 C 234.54711,149.83968 233.6929,149.25882 231.98448,149.25878 C 225.01408,149.25882 214.14846,155.92169 199.38761,169.24743 L 197.95252,167.81234 C 197.95255,165.01054 202.97533,160.67113 213.02089,154.7941 C 222.72478,149.12214 229.28515,146.28615 232.70202,146.28611 C 234.75213,146.28615 236.52889,147.1062 238.03233,148.74625 C 239.53573,150.38638 240.28744,152.19732 240.28746,154.17906 C 246.91615,149.46383 252.17811,147.1062 256.07337,147.10615 C 261.40363,147.1062 264.06878,149.08797 264.06883,153.0515 M 264.17132,169.24743 L 263.24877,167.81234 L 263.86381,166.58227 C 283.27159,153.46156 297.34905,142.01508 306.09623,132.2428 L 300.76593,132.2428 L 299.02333,130.91022 C 299.57001,129.68021 302.74769,129.16768 308.55638,129.37263 L 326.3924,109.38399 L 338.38559,109.38399 L 320.34455,129.37263 L 333.2603,129.37263 L 334.59287,130.80772 C 334.38781,132.03784 328.98917,132.51621 318.39694,132.2428 C 310.19645,141.3317 301.99598,150.42055 293.79553,159.50937 C 280.26476,174.74859 273.39687,183.08573 273.19184,184.5208 L 274.72943,185.44336 C 282.65656,185.85338 294.61557,179.56636 310.60649,166.58227 L 311.52905,168.01736 C 311.46068,170.88754 305.8912,175.19278 294.82059,180.9331 C 284.22831,186.40008 277.05291,189.13357 273.29435,189.13357 C 269.05746,189.13357 266.939,186.98095 266.93898,182.6757 C 266.939,177.82376 269.29664,172.66431 274.01189,167.19731 C 278.18047,163.02876 282.34904,158.86019 286.51761,154.69159 C 279.82056,159.33855 272.37181,164.19049 264.17132,169.24743 M 353.35144,169.65745 C 353.35142,167.19733 354.10313,164.90803 355.60657,162.78956 C 357.1783,160.67113 359.16008,159.6119 361.55191,159.61187 C 363.39699,159.6119 365.00291,160.32944 366.36969,161.7645 C 367.7364,163.19961 368.41977,164.8397 368.41981,166.68478 C 368.41977,171.33173 366.36965,173.6552 362.26945,173.65518 C 361.24437,173.6552 360.1168,173.45018 358.88676,173.04015 C 361.27853,181.99233 371.35827,186.46842 389.126,186.46842 C 405.66354,186.46842 423.15786,178.02878 441.60901,161.14946 C 448.78431,154.65746 464.70688,137.02646 489.37676,108.25642 C 508.98938,85.431879 525.3903,70.090179 538.57959,62.231275 C 532.77072,55.124334 524.91194,49.657358 515.00323,45.830332 C 505.98254,42.276941 496.51784,40.500174 486.6091,40.500026 C 473.89823,40.500174 459.61576,43.233662 443.76164,48.700497 C 426.2672,54.782648 412.0189,62.573088 401.01668,72.071841 C 388.10088,83.279257 381.64302,95.477446 381.64307,108.66644 C 381.64302,116.25195 384.88903,122.26563 391.38113,126.70748 C 397.05305,130.53443 403.81844,132.44787 411.67729,132.44781 C 425.27632,132.44787 440.13966,127.56176 456.26736,117.78947 C 474.17158,106.85559 483.12375,95.067423 483.1239,82.424936 C 483.12375,77.231416 481.07363,73.267859 476.97355,70.534252 C 473.48821,68.210906 469.04629,67.049174 463.64778,67.049052 C 444.23989,67.049174 422.91868,81.092467 399.6841,109.17897 C 397.63392,111.8442 395.31046,114.64603 392.7137,117.58446 L 391.68864,116.35439 C 395.5838,105.55718 405.56104,94.281546 421.62036,82.527442 C 437.95286,70.568539 451.82532,64.589035 463.23776,64.588911 C 469.52465,64.589035 474.71827,65.955779 478.81865,68.689146 C 483.53377,71.901115 485.89141,76.513875 485.89156,82.527442 C 485.89141,97.288382 477.28092,110.06744 460.06007,120.86465 C 444.82075,130.43192 429.37655,135.21552 413.72741,135.21547 C 404.50181,135.21552 396.6772,133.30208 390.25356,129.47514 C 382.5314,124.82827 378.67035,118.13123 378.6704,109.38399 C 378.67035,88.746233 391.9961,71.183574 418.64769,56.695957 C 441.40389,44.25872 464.05767,38.040035 486.6091,38.039885 C 509.50191,38.040035 527.50876,45.557127 540.62971,60.591181 C 543.97802,58.541193 549.23998,55.568526 556.41561,51.673168 C 565.02588,47.026376 570.01449,44.702912 571.38147,44.702768 C 572.26962,44.702912 572.81632,45.215441 573.02157,46.240356 L 572.50904,47.162909 C 560.48145,52.698363 550.36755,57.926159 542.16729,62.846311 C 546.74568,70.910225 549.03497,78.051462 549.03519,84.270042 C 549.03497,93.017307 545.9598,100.91025 539.80966,107.9489 C 533.38576,115.26106 525.90283,118.9171 517.36087,118.91703 C 514.90054,118.9171 512.71375,118.13123 510.80049,116.5594 C 508.88687,114.91938 507.93015,112.86926 507.93033,110.40904 C 507.93015,106.85559 510.73198,102.61868 516.33581,97.698314 C 521.93928,92.778127 526.55204,90.352157 530.1741,90.420396 L 530.99415,91.752972 L 530.1741,93.085549 C 517.53153,98.210934 511.21034,104.05376 511.21051,110.61406 C 511.21034,113.14261 512.30373,114.40685 514.4907,114.40677 C 521.39258,114.40685 528.15796,109.89659 534.78687,100.876 C 541.07369,92.333936 544.2172,84.475158 544.21741,77.299641 C 544.2172,73.062847 542.81629,68.757604 540.01467,64.383899 C 534.13746,68.210906 528.3288,73.677882 522.58867,80.784842 C 521.90511,81.604996 517.15567,88.09703 508.34035,100.26096 C 492.89597,121.58225 482.50871,135.38637 477.17856,141.67334 C 464.60437,156.5709 452.167,167.74403 439.86641,175.19277 C 424.62711,184.34997 408.12368,188.92856 390.35607,188.92856 C 381.81386,188.92856 374.19426,187.69849 367.49725,185.23835 C 358.06669,181.82149 353.35142,176.62786 353.35144,169.65745 M 480.66378,166.78729 C 489.27429,159.6119 495.59548,153.93992 499.62737,149.77131 C 497.0989,148.9513 495.83466,147.34538 495.83465,144.95353 C 495.83466,140.85334 497.95311,138.80323 502.19001,138.80318 C 504.9235,138.80323 506.29025,140.20414 506.29025,143.00592 C 506.29025,144.64606 505.64104,145.97863 504.34264,147.00365 C 508.44287,147.00369 512.13308,146.49116 515.41327,145.46606 L 519.411,153.56403 C 514.55905,158.75769 509.70711,163.95131 504.85517,169.14492 C 497.06473,177.68709 493.16951,182.60737 493.1695,183.90577 C 493.16951,184.8625 493.85288,185.34086 495.21961,185.34085 C 502.60004,185.34086 514.14903,179.088 529.86661,166.58227 L 531.09668,168.22237 C 531.02831,170.47752 525.32216,174.57775 513.97819,180.52308 C 502.97589,186.26341 495.86883,189.13357 492.65697,189.13357 C 488.35173,189.13357 486.19911,186.57093 486.1991,181.44563 C 486.19911,177.3454 489.5818,171.50257 496.34718,163.91712 C 500.99412,159.20188 505.64104,154.48661 510.28798,149.77131 C 507.89617,150.18137 505.67521,150.31804 503.6251,150.18133 C 491.11939,162.68708 483.70481,169.00827 481.38132,169.14492 L 480.25375,167.70984 L 480.66378,166.78729 M 576.60926,166.37726 L 577.63432,168.01736 L 577.2243,169.04242 C 558.56822,182.50486 545.68666,189.23608 538.57958,189.23608 C 529.62742,189.23608 525.15133,185.78505 525.1513,178.88298 C 525.15133,171.50257 529.83243,164.05382 539.19461,156.5367 C 548.1468,149.36132 556.38143,145.77362 563.89853,145.77358 C 568.20376,145.77362 570.35639,147.55039 570.3564,151.10388 C 570.35639,155.20415 567.0762,158.82602 560.51584,161.96951 C 554.43382,164.56635 548.35181,167.19733 542.26979,169.86246 C 535.70943,173.27934 532.42924,177.44791 532.42922,182.36818 C 532.42924,184.82833 533.96683,186.0584 537.04199,186.05839 C 543.53404,186.0584 551.70033,182.77821 561.5409,176.21783 C 571.44978,169.65747 576.47256,166.37728 576.60926,166.37726 M 544.2174,164.94218 C 559.59328,159.88525 567.28121,155.30666 567.28123,151.20639 C 567.28121,149.63467 566.5295,148.84879 565.0261,148.84875 C 559.76412,148.84879 552.8279,154.21326 544.2174,164.94218 M 611.46132,172.83513 C 614.12645,172.35679 618.80755,170.2725 625.50462,166.58227 L 626.63219,167.91485 C 626.63216,169.6233 624.10368,171.43424 619.04675,173.34766 C 614.67315,175.05611 611.32463,175.97866 609.00117,176.11532 C 598.81892,185.13584 589.62757,189.6461 581.42709,189.6461 C 574.86674,189.6461 571.58655,187.04929 571.58652,181.85565 C 571.58655,176.45702 573.84168,173.7577 578.35191,173.75769 C 581.29043,173.7577 582.75968,175.02194 582.75967,177.5504 C 582.75968,181.85566 580.23121,183.93994 575.17423,183.80326 C 575.31093,185.71671 576.84852,186.67343 579.787,186.67343 C 591.54101,186.67343 601.65492,173.31351 610.12874,146.59362 C 607.80526,148.23376 596.87131,155.78502 577.32685,169.24743 L 575.89177,167.40232 C 576.16514,166.85564 583.64807,161.3545 598.34056,150.89887 C 613.03306,140.44332 621.02851,135.04468 622.32694,134.70294 L 623.86453,136.44554 C 621.74605,138.15402 618.56837,140.71667 614.33148,144.13348 C 614.12645,145.29526 614.02395,146.79868 614.02396,148.64374 C 614.02395,149.87385 614.19479,151.68479 614.53649,154.07655 C 614.9465,156.46839 615.15151,158.27933 615.15153,159.50937 C 615.15151,164.36134 613.92144,168.80325 611.46132,172.83513 M 661.07417,172.83513 C 663.73931,172.35679 668.42041,170.2725 675.11748,166.58227 L 676.24504,167.91485 C 676.24501,169.6233 673.71654,171.43424 668.65961,173.34766 C 664.28601,175.05611 660.93748,175.97866 658.61403,176.11532 C 648.43178,185.13584 639.24042,189.6461 631.03994,189.6461 C 624.47959,189.6461 621.19941,187.04929 621.19938,181.85565 C 621.19941,176.45702 623.45453,173.7577 627.96477,173.75769 C 630.90329,173.7577 632.37254,175.02194 632.37252,177.5504 C 632.37254,181.85566 629.84406,183.93994 624.78708,183.80326 C 624.92378,185.71671 626.46137,186.67343 629.39985,186.67343 C 641.15387,186.67343 651.26777,173.31351 659.74159,146.59362 C 657.41812,148.23376 646.48417,155.78502 626.93971,169.24743 L 625.50463,167.40232 C 625.778,166.85564 633.26092,161.3545 647.95342,150.89887 C 662.64591,140.44332 670.64136,135.04468 671.93979,134.70294 L 673.47738,136.44554 C 671.35891,138.15402 668.18123,140.71667 663.94434,144.13348 C 663.73931,145.29526 663.6368,146.79868 663.63682,148.64374 C 663.6368,149.87385 663.80765,151.68479 664.14935,154.07655 C 664.55935,156.46839 664.76437,158.27933 664.76438,159.50937 C 664.76437,164.36134 663.5343,168.80325 661.07417,172.83513"
+       id="text2770" />
+       style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       d="M 495.24681,169.98288 C 493.82081,176.87409 491.44453,183.76529 488.11799,190.65646 C 485.02859,197.54766 481.10774,203.72598 476.35542,209.19142 C 471.60265,214.65681 466.25605,218.57767 460.31557,220.95397 C 454.37468,223.3302 447.83994,224.51835 440.71131,224.51838 C 429.06739,224.51835 416.11671,222.97377 401.85922,219.88464 C 387.83906,217.03309 373.10618,213.82513 357.66052,210.26072 C 342.21463,206.69631 326.1748,203.25071 309.54097,199.92393 C 293.14461,196.83478 276.74835,195.05256 260.35208,194.57732 C 259.16393,194.33969 258.33224,193.74563 257.857,192.79512 C 257.61935,191.60698 258.45105,191.01291 260.35208,191.01291 C 266.53037,191.01291 271.9958,188.99308 276.74838,184.95341 C 280.55039,181.86427 286.01581,177.23054 293.14468,171.05219 C 300.51108,164.87392 308.82803,157.86392 318.09555,150.02217 C 327.36295,141.9429 337.10566,133.38831 347.32373,124.35841 C 357.77922,115.32864 367.75957,106.41763 377.26479,97.62532 C 387.00738,88.595591 396.03719,80.041001 404.3543,71.961561 C 412.67111,63.6447 419.32468,56.397087 424.31502,50.218629 C 426.21585,47.842492 427.16637,46.17911 427.16656,45.228447 C 427.16637,43.327593 424.7901,42.377081 420.03772,42.376923 C 407.91856,42.377081 395.20551,42.733524 381.89851,43.446243 C 368.82889,43.921644 357.42278,44.753336 347.68016,45.941335 C 341.0265,46.654361 335.08583,47.842492 329.8581,49.505742 C 324.63022,51.169281 320.59057,53.307923 317.7391,55.921684 C 315.60039,58.060465 314.53106,57.822843 314.53114,55.208795 C 316.43209,51.169281 318.09548,48.080127 319.52132,45.941335 C 320.94701,43.802836 323.20446,42.495889 326.2937,42.020478 C 334.37294,41.307751 343.75921,40.8325 354.45255,40.594715 C 365.38329,40.119622 376.31415,39.763178 387.24514,39.525385 C 393.66092,39.525553 400.78975,39.406735 408.63161,39.16895 C 416.71076,38.931483 424.31483,38.812665 431.44384,38.812507 C 438.57248,38.57504 444.86959,38.456232 450.33522,38.456074 C 455.80044,38.218597 459.24604,38.099779 460.67202,38.09963 C 463.04808,38.099779 464.11739,38.693848 463.87999,39.881837 C 463.87977,41.070125 463.04808,41.783011 461.3849,42.020478 C 460.19654,42.258263 458.88961,42.97115 457.46404,44.15913 C 456.03807,45.10978 454.73112,46.17911 453.54319,47.367092 C 448.07756,51.882168 441.54282,57.58521 433.93892,64.476267 C 426.5723,71.129991 418.37416,78.496421 409.34449,86.575631 C 400.55211,94.41744 391.28465,102.7344 381.54209,111.52653 C 372.03684,120.31883 362.65058,129.22985 353.38322,138.25961 C 344.11567,147.05187 335.08583,155.60646 326.2937,163.92337 C 317.73904,172.24036 310.01616,179.96326 303.12503,187.09205 C 301.93682,188.75545 301.34276,189.9436 301.34281,190.65646 C 301.34276,192.08224 302.41208,193.15155 304.55077,193.86443 C 309.77853,195.29021 317.14498,197.07241 326.65014,199.21106 C 336.39278,201.58733 347.086,203.84478 358.72984,205.98344 C 370.6111,208.12207 382.84889,209.90428 395.44328,211.33005 C 408.03738,212.7558 419.91874,213.46868 431.0874,213.4687 C 449.62213,213.46868 463.64215,209.66665 473.14745,202.06258 C 482.88996,194.4585 489.30589,183.52764 492.39528,169.27 C 492.87028,167.84426 493.46435,167.13138 494.17749,167.13134 C 494.89012,167.13138 495.24656,168.08189 495.24681,169.98288 M 490.15638,68.753581 C 490.15628,71.605251 488.84935,74.456781 486.23553,77.308181 C 483.85918,80.159831 481.12646,81.585581 478.03738,81.585471 C 475.18578,81.585581 473.76003,80.159831 473.76009,77.308181 C 473.76003,74.219141 474.82934,71.248801 476.96806,68.397141 C 479.34425,65.545731 482.19578,64.119966 485.52266,64.119839 C 488.61171,64.119966 490.15628,65.664541 490.15638,68.753581 M 506.19624,148.23996 C 500.49308,155.60646 493.95834,162.61645 486.59197,169.27 C 479.22544,175.92358 472.45307,181.2702 466.27482,185.30985 C 461.52222,188.39901 456.65086,190.77529 451.66073,192.43867 C 446.67052,194.10207 442.1556,194.93376 438.11598,194.93376 C 436.69017,194.93376 435.02678,194.81494 433.1258,194.57732 C 431.22474,194.33969 429.44254,193.74563 427.77918,192.79512 C 426.3534,191.84462 425.04645,190.65648 423.85832,189.23071 C 422.9078,187.56733 422.43255,185.42867 422.43257,182.81476 C 422.43255,179.72562 423.62068,175.56714 425.99697,170.33933 C 428.37322,164.87392 431.10593,159.28969 434.19512,153.58659 C 437.52187,147.88358 440.72984,142.41815 443.81902,137.19029 C 447.14577,131.96255 449.75968,128.04171 451.66073,125.42773 C 452.84883,123.52678 454.86866,121.98221 457.72024,120.794 C 460.80934,119.36831 462.82917,118.65543 463.77974,118.65535 C 464.96781,118.65543 465.56188,119.01187 465.56195,119.72467 C 465.56188,120.20001 465.32426,120.9129 464.84906,121.86331 C 464.61138,122.8139 464.25492,123.52678 463.77974,124.00197 C 460.69052,128.75458 457.48255,133.98238 454.15583,139.68538 C 451.06661,145.38849 448.21509,150.97273 445.60124,156.43812 C 442.98731,161.66597 440.84864,166.5373 439.1853,171.05219 C 437.75949,175.56714 437.04662,179.13156 437.04665,181.74543 C 437.04662,184.59698 437.75949,186.73563 439.1853,188.16138 C 440.84864,189.34952 442.98731,189.9436 445.60124,189.94358 C 450.35374,189.9436 455.58154,188.39901 461.28465,185.30985 C 466.98764,181.98307 472.57188,178.06223 478.03738,173.5473 C 483.74037,169.0324 488.96816,164.27984 493.7208,159.28964 C 498.47325,154.29951 502.15647,150.02222 504.77048,146.45777 C 505.95852,145.26968 506.55257,145.03205 506.55267,145.74488 C 506.7902,146.22019 506.67139,147.05187 506.19624,148.23996 M 600.02938,148.95285 C 595.75195,154.89358 590.76178,160.95307 585.05884,167.13134 C 579.59331,173.07206 573.65261,178.41867 567.23679,183.17121 C 561.05839,187.92376 554.64243,191.84462 547.98897,194.93376 C 541.57294,198.02291 535.27582,199.56749 529.09758,199.56749 C 526.24599,199.56749 523.63209,199.09224 521.25588,198.14172 C 518.87956,197.42884 517.69142,195.40901 517.69147,192.08224 C 517.69142,188.75545 518.87956,184.59698 521.25588,179.60679 C 523.63209,174.379 526.36481,168.91358 529.45402,163.21049 C 532.78074,157.50748 536.10752,151.68562 539.43437,145.74488 C 542.99871,139.80425 545.85024,134.33882 547.98897,129.34859 C 548.46414,128.16051 548.46414,127.21 547.98897,126.49706 C 547.75125,125.54662 547.03837,125.4278 545.85032,126.14061 C 543.23634,127.80407 540.14719,130.06154 536.58285,132.91299 C 533.01837,135.76458 529.33514,138.85375 525.53318,142.18047 C 521.9687,145.26968 518.4043,148.47765 514.83994,151.80438 C 511.51311,155.1312 508.7804,158.10155 506.6418,160.7154 C 502.83971,166.65612 499.51293,172.12155 496.66144,177.1117 C 494.04751,182.10189 490.72073,187.68614 486.68109,193.86443 C 485.73057,195.29021 485.01768,196.00309 484.54243,196.00309 C 483.35428,196.00309 482.28495,194.69614 481.33447,192.08224 C 480.62157,189.46834 480.26514,187.80494 480.26514,187.09205 C 480.26514,184.95342 481.6909,182.10189 484.54243,178.53746 C 487.63158,174.73545 490.95835,170.57697 494.52279,166.06203 C 498.3248,158.45799 502.24564,150.49748 506.28535,142.18047 C 510.32498,133.62593 513.77056,126.02186 516.62214,119.36823 C 517.33497,118.18017 518.4043,117.5861 519.8301,117.58602 C 521.25583,117.5861 522.56278,118.18017 523.75096,119.36823 C 524.93904,120.55644 525.53311,121.8634 525.53318,123.28909 C 525.53311,124.23966 523.7509,127.56644 520.18655,133.26944 C 516.85972,138.73493 513.53294,145.15085 510.2062,152.51726 C 514.72107,148.47765 519.59244,144.20035 524.82029,139.68538 C 530.28567,135.17051 535.39464,131.01205 540.14726,127.20994 C 545.13736,123.40797 549.41466,120.31883 552.97914,117.94247 C 556.78109,115.32864 559.395,114.02169 560.82085,114.02161 C 561.77125,114.02169 562.60296,114.61576 563.31593,115.80381 C 564.26635,116.75441 564.7416,117.70492 564.7417,118.65535 C 564.7416,119.60594 564.14753,121.0317 562.95949,122.93264 C 560.34551,126.73476 557.13754,131.60613 553.33558,137.54673 C 549.53346,143.48746 545.85024,149.66578 542.28591,156.08167 C 538.95905,162.26002 536.10752,168.2007 533.73131,173.90373 C 531.35499,179.60681 530.16685,184.12172 530.16691,187.4485 C 530.16685,190.30003 530.76092,192.31986 531.94911,193.50799 C 533.13718,194.4585 535.03821,194.93376 537.65217,194.93376 C 541.69176,194.93376 546.44431,193.38919 551.90983,190.30002 C 557.37516,187.21087 562.95939,183.40884 568.66254,178.89391 C 574.60313,174.14138 580.18738,168.91358 585.41529,163.21049 C 590.64296,157.50748 594.92026,152.04206 598.24717,146.8142 C 598.7223,146.10137 599.43518,145.98256 600.38581,146.45777 C 601.33618,146.69543 601.21737,147.52713 600.02938,148.95285 M 670.93889,152.51726 C 666.89912,157.50748 662.02776,162.73527 656.3248,168.20067 C 650.85929,173.42849 644.79979,178.29986 638.14631,182.81476 C 631.73029,187.09206 624.95792,190.65648 617.82915,193.50799 C 610.93791,196.1219 604.04673,197.42884 597.15556,197.42884 C 585.98705,197.42884 580.40282,192.43867 580.40284,182.45832 C 580.40282,175.80477 582.0662,168.67595 585.39301,161.07185 C 588.9574,153.23019 593.47232,146.10137 598.93778,139.68538 C 604.40317,133.03187 610.34384,127.56644 616.75983,123.28909 C 623.41334,118.77424 629.71046,116.51679 635.65122,116.5167 C 638.97792,116.51679 641.23538,117.11086 642.42361,118.2989 C 643.84929,119.48712 644.56215,121.0317 644.56225,122.93264 C 644.56215,125.78424 643.61165,128.8734 641.71072,132.20011 C 640.04726,135.52695 637.43334,138.73493 633.86901,141.82403 C 630.30453,144.67561 625.78961,147.1707 620.32423,149.30928 C 614.85876,151.21035 608.324,152.16086 600.71997,152.16082 C 599.5318,154.29951 598.22485,157.74511 596.79913,162.49761 C 595.37333,167.01257 594.66045,171.6463 594.66047,176.39882 C 594.66045,186.14155 599.05654,191.01291 607.8488,191.01291 C 613.31419,191.01291 618.89841,189.70596 624.60154,187.09205 C 630.54215,184.47817 636.2452,181.2702 641.71072,177.46814 C 647.17606,173.42849 652.16624,169.15121 656.68124,164.63625 C 661.4337,159.88375 665.35455,155.48764 668.4438,151.44793 C 668.91894,150.97273 669.3942,150.85392 669.86957,151.09149 C 670.58234,151.32917 670.93878,151.80442 670.93889,152.51726 M 633.51256,124.71486 C 633.5125,121.62578 631.96792,120.08119 628.87883,120.08111 C 626.50249,120.08119 624.00742,121.0317 621.39357,122.93264 C 619.01723,124.59611 616.64095,126.85356 614.26474,129.70502 C 611.88842,132.55661 609.63096,135.64577 607.49236,138.97249 C 605.35367,142.29934 603.57147,145.5073 602.14575,148.5964 C 602.62096,148.83408 603.45266,149.07171 604.64083,149.30928 C 605.82892,149.30934 606.77942,149.30934 607.49236,149.30928 C 614.38351,149.30934 620.443,146.93307 625.67086,142.18047 C 630.89859,137.19035 633.5125,131.36848 633.51256,124.71486"
+       id="text2383" />
+    <flowRoot
+       xml:space="preserve"
+       id="flowRoot2418"
+       style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"><flowRegion
+         id="flowRegion2420"><rect
+           id="rect2422"
+           width="119.198"
+           height="32.324883"
+           x="234.35539"
+           y="463.44324" /></flowRegion><flowPara
+         id="flowPara2424"></flowPara></flowRoot>    <text
+       xml:space="preserve"
+       style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="157.14285"
+       y="149.50504"
+       id="text2426"><tspan
+         sodipodi:role="line"
+         id="tspan2428"
+         x="157.14285"
+         y="149.50504"
+         style="font-size:144px;font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:Zapfino;-inkscape-font-specification:Zapfino Bold Italic" /></text>
     <path
        style="font-size:144px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Gill Sans MT"
        d="M 62.317375,64.823151 L 144.37206,64.823151 L 144.37206,77.338776 L 110.12988,77.338776 L 110.12988,163.19034 L 95.997063,163.19034 L 95.997063,77.338776 L 62.317375,77.338776 L 62.317375,64.823151 M 189.583,131.97159 L 144.09081,131.97159 C 144.41892,138.15911 146.48142,143.08098 150.27831,146.73721 C 154.12203,150.39348 159.06734,152.2216 165.11425,152.22159 C 173.5517,152.2216 181.33294,149.5966 188.458,144.34659 L 188.458,156.86221 C 184.52044,159.48722 180.60638,161.36221 176.71581,162.48721 C 172.87202,163.61221 168.34858,164.17471 163.1455,164.17471 C 156.02047,164.17471 150.25485,162.69815 145.84863,159.74503 C 141.44236,156.79191 137.9033,152.83097 135.23144,147.86221 C 132.60643,142.84661 131.29393,137.05755 131.29394,130.49503 C 131.29393,120.65132 134.08299,112.65914 139.66113,106.51846 C 145.23923,100.33103 152.48141,97.237279 161.38769,97.237213 C 169.96577,97.237279 176.80951,100.23728 181.91894,106.23721 C 187.02825,112.23726 189.58294,120.27632 189.583,130.3544 L 189.583,131.97159 M 144.37206,124.30753 L 176.92675,124.30753 C 176.59857,119.19819 175.07514,115.2607 172.35644,112.49503 C 169.63764,109.72945 165.9814,108.34664 161.38769,108.34659 C 156.79391,108.34664 153.02047,109.72945 150.06738,112.49503 C 147.1611,115.2607 145.26267,119.19819 144.37206,124.30753 M 248.01269,98.502838 L 264.3955,98.502838 L 237.74706,130.3544 L 266.29394,163.19034 L 249.91113,163.19034 L 229.59081,139.98721 L 210.3955,163.19034 L 194.29394,163.19034 L 221.50488,130.3544 L 194.29394,98.502838 L 210.3955,98.502838 L 229.59081,120.72159 L 248.01269,98.502838 M 266.29394,108.76846 L 290.34081,85.143463 L 290.34081,98.502838 L 310.80175,98.502838 L 310.80175,110.03409 L 290.34081,110.03409 L 290.34081,141.74503 C 290.34079,149.15129 293.4111,152.85441 299.55175,152.8544 C 304.14546,152.85441 308.99702,151.30754 314.10644,148.21378 L 314.10644,160.1669 C 309.18452,162.93253 303.81734,164.31534 298.00488,164.31534 C 292.14547,164.31534 287.27048,162.6044 283.37988,159.18253 C 282.16111,158.15128 281.1533,157.00284 280.35644,155.73721 C 279.55955,154.42472 278.87986,152.73722 278.31738,150.67471 C 277.80174,148.56535 277.54393,144.58098 277.54394,138.72159 L 277.54394,110.03409 L 266.29394,110.03409 L 266.29394,108.76846 M 324.44238,163.19034 L 324.44238,64.823151 L 355.59081,64.823151 C 364.96576,64.823249 372.44232,67.354496 378.0205,72.416901 C 383.59856,77.479486 386.38762,84.276355 386.38769,92.807526 C 386.38762,98.52634 384.95793,103.58884 382.09863,107.99503 C 379.23919,112.40133 375.32513,115.61226 370.35644,117.62784 C 365.38764,119.59663 358.26264,120.58101 348.98144,120.58096 L 338.57519,120.58096 L 338.57519,163.19034 L 324.44238,163.19034 M 353.12988,77.338776 L 338.57519,77.338776 L 338.57519,108.06534 L 353.97363,108.06534 C 359.69233,108.06539 364.09858,106.72946 367.19238,104.05753 C 370.28607,101.33884 371.83294,97.471654 371.833,92.455963 C 371.83294,82.377919 365.59857,77.338861 353.12988,77.338776 M 410.57519,98.502838 L 410.57519,113.33878 L 411.27831,112.21378 C 417.46578,102.22946 423.65328,97.237279 429.84081,97.237213 C 434.66889,97.237279 439.70795,99.674777 444.958,104.54971 L 438.208,115.79971 C 433.75483,111.58101 429.62983,109.47164 425.833,109.47159 C 421.70797,109.47164 418.12203,111.44039 415.07519,115.37784 C 412.07516,119.31538 410.57516,123.97944 410.57519,129.37003 L 410.57519,163.19034 L 397.708,163.19034 L 397.708,98.502838 L 410.57519,98.502838 M 506.2705,131.97159 L 460.77831,131.97159 C 461.10642,138.15911 463.16892,143.08098 466.96581,146.73721 C 470.80953,150.39348 475.75484,152.2216 481.80175,152.22159 C 490.2392,152.2216 498.02044,149.5966 505.1455,144.34659 L 505.1455,156.86221 C 501.20794,159.48722 497.29388,161.36221 493.40331,162.48721 C 489.55952,163.61221 485.03608,164.17471 479.833,164.17471 C 472.70797,164.17471 466.94235,162.69815 462.53613,159.74503 C 458.12986,156.79191 454.5908,152.83097 451.91894,147.86221 C 449.29393,142.84661 447.98143,137.05755 447.98144,130.49503 C 447.98143,120.65132 450.77049,112.65914 456.34863,106.51846 C 461.92673,100.33103 469.16891,97.237279 478.07519,97.237213 C 486.65327,97.237279 493.49701,100.23728 498.60644,106.23721 C 503.71575,112.23726 506.27044,120.27632 506.2705,130.3544 L 506.2705,131.97159 M 461.05956,124.30753 L 493.61425,124.30753 C 493.28607,119.19819 491.76264,115.2607 489.04394,112.49503 C 486.32514,109.72945 482.6689,108.34664 478.07519,108.34659 C 473.48141,108.34664 469.70797,109.72945 466.75488,112.49503 C 463.8486,115.2607 461.95017,119.19819 461.05956,124.30753 M 516.88769,158.54971 L 516.88769,144.76846 C 520.49705,147.29973 524.17674,149.36223 527.92675,150.95596 C 531.7236,152.50285 534.9111,153.27629 537.48925,153.27628 C 540.1611,153.27629 542.45797,152.62004 544.37988,151.30753 C 546.30171,149.99504 547.26265,148.42473 547.26269,146.59659 C 547.26265,144.72161 546.62984,143.17473 545.36425,141.95596 C 544.14547,140.69036 541.47359,138.88567 537.34863,136.5419 C 529.09861,131.94818 523.68455,128.03412 521.10644,124.79971 C 518.57518,121.5185 517.30956,117.95601 517.30956,114.11221 C 517.30956,109.14352 519.23143,105.08883 523.07519,101.94815 C 526.9658,98.80759 531.95798,97.237279 538.05175,97.237213 C 544.37984,97.237279 550.87202,99.018527 557.52831,102.58096 L 557.52831,115.23721 C 549.93452,110.64352 543.72359,108.34664 538.8955,108.34659 C 536.4111,108.34664 534.39548,108.8857 532.84863,109.96378 C 531.3486,110.99508 530.59861,112.37789 530.59863,114.11221 C 530.59861,115.61226 531.27829,117.04195 532.63769,118.40128 C 534.04391,119.76069 536.48141,121.40132 539.95019,123.32315 L 544.5205,125.92471 C 555.30171,132.01849 560.69233,138.76849 560.69238,146.17471 C 560.69233,151.4716 558.60639,155.83097 554.43456,159.25284 C 550.30952,162.62784 544.98922,164.31534 538.47363,164.31534 C 534.62985,164.31534 531.20798,163.9169 528.208,163.12003 C 525.20799,162.27628 521.43455,160.75284 516.88769,158.54971 M 572.01269,158.54971 L 572.01269,144.76846 C 575.62205,147.29973 579.30174,149.36223 583.05175,150.95596 C 586.8486,152.50285 590.0361,153.27629 592.61425,153.27628 C 595.2861,153.27629 597.58297,152.62004 599.50488,151.30753 C 601.42671,149.99504 602.38765,148.42473 602.38769,146.59659 C 602.38765,144.72161 601.75484,143.17473 600.48925,141.95596 C 599.27047,140.69036 596.59859,138.88567 592.47363,136.5419 C 584.22361,131.94818 578.80955,128.03412 576.23144,124.79971 C 573.70018,121.5185 572.43456,117.95601 572.43456,114.11221 C 572.43456,109.14352 574.35643,105.08883 578.20019,101.94815 C 582.0908,98.80759 587.08298,97.237279 593.17675,97.237213 C 599.50484,97.237279 605.99702,99.018527 612.65331,102.58096 L 612.65331,115.23721 C 605.05952,110.64352 598.84859,108.34664 594.0205,108.34659 C 591.5361,108.34664 589.52048,108.8857 587.97363,109.96378 C 586.4736,110.99508 585.72361,112.37789 585.72363,114.11221 C 585.72361,115.61226 586.40329,117.04195 587.76269,118.40128 C 589.16891,119.76069 591.60641,121.40132 595.07519,123.32315 L 599.6455,125.92471 C 610.42671,132.01849 615.81733,138.76849 615.81738,146.17471 C 615.81733,151.4716 613.73139,155.83097 609.55956,159.25284 C 605.43452,162.62784 600.11422,164.31534 593.59863,164.31534 C 589.75485,164.31534 586.33298,163.9169 583.333,163.12003 C 580.33299,162.27628 576.55955,160.75284 572.01269,158.54971"
        id="text1872" />
+       id="path3394"
+       d="M 123.58177,44.294762 C 90.490614,43.861888 58.514797,65.195017 45.980177,95.789571 C 34.368375,122.66752 37.920524,155.43103 55.427102,178.96867 C 72.310987,202.69683 102.11242,216.40524 131.12229,213.47317 C 160.89386,211.11949 188.29617,191.41001 200.35757,164.14491 C 209.83764,143.54269 210.40847,119.11913 202.08536,98.043614 C 183.81301,114.43145 166.28873,131.64633 149.82372,149.85365 C 144.61286,156.23194 136.72603,160.50335 128.35217,159.91078 C 123.56975,159.94541 118.99476,159.24724 114.29963,159.1137 C 107.42449,160.27994 100.31884,160.31143 93.750337,162.96037 C 85.761976,165.47427 78.191155,169.15015 70.684591,172.74712 C 68.441269,171.80921 68.954878,170.41043 71.039956,171.80669 C 71.798542,170.44057 76.230069,166.48998 74.065954,169.76629 C 72.253215,171.47472 79.313826,168.08141 80.407621,167.50076 C 90.364351,162.16312 101.64374,160.39026 112.01041,156.13602 C 116.12467,153.99113 118.7367,149.30259 123.77377,148.8968 C 126.60727,148.49701 133.31113,147.03921 126.40658,147.68185 C 121.87622,147.88409 113.78126,149.25812 111.50804,149.25747 C 116.18339,148.56443 120.72008,147.30978 125.34692,146.60077 C 120.5464,144.6441 134.45414,146.04088 129.56063,145.04851 C 126.06449,145.5611 126.42812,142.31719 129.73009,143.8222 C 135.42624,143.71521 129.68893,143.33014 127.49056,142.71327 C 129.61644,143.48054 136.39629,141.81385 130.46967,141.97388 C 122.51933,142.10015 135.1461,140.21263 135.25824,139.44185 C 131.33932,139.31109 139.86441,138.66921 134.1684,138.4298 C 131.34329,138.5909 129.35406,138.54224 133.07828,137.40135 C 137.66574,133.11423 144.14656,133.84255 149.17109,131.12138 C 151.30713,129.59927 151.31026,126.59362 149.35009,129.93264 C 146.10758,134.73977 139.99966,131.46838 136.76767,131.15108 C 133.53949,134.84805 128.34535,137.71636 123.28578,138.13659 C 119.54609,138.2457 112.79207,140.90548 110.88006,138.91909 C 112.93106,136.84006 114.34358,135.84212 110.97904,137.89677 C 107.56692,139.63122 113.21439,141.65306 108.7116,140.55506 C 107.49273,142.59318 116.43367,148.29818 111.4541,144.45254 C 106.58217,138.23747 117.70554,144.43041 112.65344,147.51186 C 111.34882,148.97227 111.63549,145.67011 109.14754,145.13581 C 108.32396,144.19865 105.99771,139.96232 108.8697,142.55591 C 105.22449,140.46782 110.2164,135.65271 110.92157,131.98212 C 112.93951,127.19051 113.87515,121.82576 116.73003,117.45219 C 120.77779,114.52932 123.31746,110.49885 124.46611,105.7426 C 124.36155,105.3871 122.57459,113.47272 124.91007,112.46581 C 123.99111,109.88613 127.22303,103.86555 126.01414,109.66072 C 126.9076,113.00242 128.36806,112.67251 126.85875,109.53533 C 127.8781,102.81846 126.77707,112.89123 128.87469,111.63411 C 127.71412,108.71727 131.94846,102.69907 133.365,105.24637 C 134.22328,101.10665 135.47429,107.6993 134.59037,107.92796 C 135.50083,104.56757 135.5469,100.87878 140.18813,100.19507 C 145.56261,96.902791 149.53003,91.906326 155.3847,89.571023 C 161.6886,88.578371 163.86602,82.022596 168.74772,78.753378 C 173.40547,75.388685 178.0536,72.006601 182.73257,68.66866 C 178.06149,64.568284 174.12884,72.69904 169.69566,73.927463 C 159.9272,80.295174 150.28392,86.904443 140.15932,92.685495 C 135.36764,95.338924 130.91981,98.685509 126.0504,101.28304 C 122.62946,103.51866 118.24452,106.41975 115.87885,108.01246 C 114.06302,106.735 111.66035,111.50873 113.69873,106.9614 C 117.50761,103.62717 122.45722,101.36073 126.76207,98.319676 C 131.6739,95.347261 136.47103,92.351494 141.55668,89.699611 C 150.06449,84.602857 157.86932,78.435386 166.35758,73.300807 C 169.75269,70.317075 177.01495,67.430938 177.8534,64.188212 C 162.87366,51.427215 143.26808,44.201609 123.58177,44.294762 z M 182.45194,71.514955 C 178.21045,72.172859 186.28346,71.69209 182.45194,71.514955 z M 179.81611,71.685331 C 176.9528,72.049208 173.91917,78.651471 174.5853,78.519175 C 174.92317,75.331135 178.97467,74.4649 179.81611,71.685331 z M 184.88732,71.785548 C 185.22223,72.558736 186.39514,71.374876 184.88732,71.785548 z M 182.20139,72.256597 C 181.02119,74.525666 172.70949,79.150081 179.03901,75.835758 C 180.62998,75.211806 181.27832,73.574678 182.20139,72.256597 z M 162.38757,72.457033 C 161.91655,73.62346 161.43377,72.486745 162.38757,72.457033 z M 161.16486,72.657478 C 161.83735,73.226277 160.3973,73.357312 161.16486,72.657478 z M 160.79405,73.719827 C 160.25093,74.88436 159.88553,73.75126 160.79405,73.719827 z M 187.6334,73.9303 C 180.81111,73.96079 190.67006,76.081739 187.6334,73.9303 z M 159.41099,74.040534 C 160.05469,74.616696 158.6578,74.729092 159.41099,74.040534 z M 182.97309,74.381295 C 182.40226,76.345777 175.68095,79.913958 180.86513,77.119906 C 177.78969,79.300873 176.8809,81.960827 179.57984,79.996201 C 179.31023,81.683802 183.3997,80.253008 179.85857,81.975135 C 175.97691,81.426831 175.3681,85.386552 171.56413,87.120067 C 168.95118,83.692191 167.68894,90.014132 168.64648,89.469802 C 167.35023,91.19665 163.70923,91.575091 164.11541,91.299336 C 163.624,92.404117 159.11441,93.122038 162.42604,93.691431 C 158.92897,93.791239 159.8182,93.88186 161.68926,94.908054 C 158.48869,95.676233 157.16543,92.309461 156.53905,91.789793 C 152.1831,93.220064 156.1231,98.150397 156.62369,99.214466 C 154.22007,100.61917 147.67318,102.49635 148.26698,101.96796 C 150.25601,105.09127 142.52361,100.89451 142.8217,100.7649 C 145.88719,98.083824 139.53731,101.73648 142.21296,100.35874 C 142.0685,103.4629 140.08148,107.41073 138.5046,108.3872 C 139.60083,109.51887 143.65056,104.77907 144.89264,109.64369 C 148.59143,115.08321 141.96258,105.91136 141.76074,111.00837 C 142.54287,112.57263 146.10808,117.38208 142.62888,113.27973 C 142.09406,108.96836 134.50098,110.28272 135.11937,112.41547 C 139.40072,112.20602 131.04973,115.6645 129.84744,113.50285 C 132.49141,116.18356 123.37033,115.05207 129.65143,115.74026 C 133.97526,117.20593 124.15335,118.56259 126.05119,119.28847 C 125.49214,119.75908 133.73036,118.89149 127.77449,120.60519 C 126.44141,120.78431 121.7673,123.37277 125.55618,122.54067 C 120.75468,123.87393 130.22656,123.32915 125.25752,124.93435 C 122.10689,126.17032 121.87613,127.68308 121.66349,125.78609 C 118.83742,132.37731 125.00246,126.55467 127.20978,124.96315 C 123.87351,126.48942 120.97791,132.12453 125.2686,129.45813 C 119.30792,130.1531 129.00538,125.18576 128.38024,125.60252 C 130.63546,122.91757 124.053,133.08413 130.11007,129.76146 C 135.67982,130.33342 125.39949,131.01502 123.85359,130.88765 C 120.9858,130.43588 116.98197,132.9919 115.94688,133.96415 C 117.47471,132.22827 120.14288,129.71777 118.57052,130.77689 C 121.11362,127.00475 121.83664,119.67669 124.50334,117.59122 C 122.70653,119.73304 121.79266,125.37345 123.90273,119.91892 C 124.99143,117.68468 128.30412,114.25981 123.9115,117.01189 C 121.0792,120.944 120.78663,126.31749 117.07972,129.75603 C 115.26466,132.55441 108.00546,137.15348 109.7655,138.69552 C 115.05357,134.68913 120.93454,130.61708 127.91941,131.16195 C 129.79895,131.33683 136.1781,129.79792 135.20567,128.46622 C 132.02008,129.62099 132.06587,129.62467 135.05781,128.17751 C 137.5301,125.47153 130.75083,130.45461 133.70461,125.97839 C 135.08178,123.09889 136.8391,120.94576 136.24085,125.62901 C 136.78717,132.81752 136.87663,120.03417 138.39897,124.63773 C 138.32222,118.79203 140.06468,129.35364 144.02652,127.58667 C 146.55912,127.9685 149.20736,121.10803 147.78052,126.96305 C 147.24345,131.38409 136.84292,125.95617 142.95458,129.49552 C 148.76364,131.5203 152.40989,118.68383 146.22163,123.33945 C 143.50988,123.74181 142.30683,123.16086 144.68854,125.41407 C 140.17672,129.98549 136.90715,119.7726 141.58776,117.37944 C 140.55375,120.57422 143.035,119.11408 143.87385,117.04401 C 147.05914,118.84354 148.71261,114.73416 149.55271,113.01824 C 151.88704,117.59288 150.13932,109.90766 147.64085,112.06714 C 150.78675,111.28758 151.71376,111.10332 153.08382,109.56068 C 157.87477,111.94657 151.85392,104.32734 156.82447,103.37244 C 158.94079,101.08624 160.44122,100.09129 160.66054,103.97515 C 163.78936,104.36416 168.10343,99.392933 169.43854,96.209891 C 166.42976,92.050042 161.08297,103.84195 161.55633,99.954459 C 164.76465,96.090449 168.75777,92.901344 173.61892,91.579587 C 174.93381,89.246711 175.21193,88.656425 173.14302,89.724141 C 173.2228,85.45294 183.13125,88.991122 183.33952,89.918277 C 179.68839,93.347321 176.54836,97.681714 171.98253,99.902747 C 166.14537,101.53833 164.77301,108.22211 160.29326,111.68984 C 155.75734,115.63566 151.18198,121.49758 145.10056,121.37569 C 144.30618,123.70123 148.67819,119.37034 149.96251,122.55413 C 155.02329,122.75972 158.32445,115.69441 162.44095,112.72523 C 164.26406,111.10363 166.12141,107.7138 166.64335,108.50617 C 168.3415,107.02069 169.27361,108.49186 171.12594,104.7723 C 172.6663,103.93041 174.83073,101.09124 174.01775,101.28654 C 177.25775,104.75612 166.52463,112.84009 172.73445,107.71422 C 175.34515,103.82861 175.51585,98.59454 180.24335,96.227937 C 184.62142,92.113317 188.83512,87.801855 193.34766,83.818413 C 195.03989,80.252855 191.33536,83.291689 190.70319,81.064818 C 187.01299,78.072676 192.13627,82.785459 187.72407,83.527951 C 185.8509,85.022675 180.0345,88.429524 185.37022,86.952263 C 187.1036,84.039323 191.39202,83.256703 187.11532,86.349205 C 185.12932,89.192295 177.3696,89.060993 178.06696,85.877071 C 182.54751,87.197865 188.33042,81.571673 187.31745,79.076431 C 185.06454,79.366821 181.59903,83.041918 185.31777,79.373888 C 186.22631,78.581231 189.54973,76.105091 188.72685,78.907121 C 191.66933,72.916549 183.72186,77.756865 181.31726,78.317869 C 177.65217,78.161136 186.39412,75.300655 182.97309,74.381295 z M 157.67715,75.122937 C 158.35372,75.701055 156.73351,75.522056 157.67715,75.122937 z M 191.17123,78.38013 C 191.11462,80.200129 191.95972,78.769305 191.17123,78.38013 z M 155.91325,78.540489 C 156.9482,78.957603 155.04764,78.876415 155.91325,78.540489 z M 182.12121,78.610646 C 183.72339,78.168797 182.76117,79.48274 182.12121,78.610646 z M 181.72032,78.63069 C 183.32982,80.258119 178.23115,78.959232 181.72032,78.63069 z M 182.85283,79.151842 C 183.49323,79.685378 181.94529,79.60589 182.85283,79.151842 z M 186.96192,80.815518 C 187.7079,81.163663 186.11355,81.435465 186.96192,80.815518 z M 186.08999,81.136225 C 187.5813,81.560068 184.25298,81.627184 186.08999,81.136225 z M 190.44963,81.627317 C 191.44267,81.466324 190.25066,82.365395 190.44963,81.627317 z M 184.67686,81.737562 C 186.33844,82.76685 182.65746,81.858007 184.67686,81.737562 z M 191.22133,82.018182 C 190.92642,83.737369 190.13037,83.836747 191.22133,82.018182 z M 181.95084,82.479204 C 183.14963,86.011374 175.31535,85.440343 180.14689,83.6333 L 181.04428,83.046394 L 181.95084,82.479204 L 181.95084,82.479204 z M 184.44636,82.539334 C 184.29835,83.964935 182.0053,82.939079 184.44636,82.539334 z M 163.19937,82.649579 C 163.67327,83.576611 161.9522,82.871932 163.19937,82.649579 z M 169.38304,82.950242 C 166.5731,83.799968 165.15021,87.554153 168.84177,84.333247 C 169.14095,84.225593 170.02554,83.325744 169.38304,82.950242 z M 156.27406,82.980303 C 156.22286,83.636117 155.42105,82.931315 156.27406,82.980303 z M 174.92529,83.290993 C 174.83882,83.859043 175.55137,83.543007 174.92529,83.290993 z M 147.19397,83.591656 C 147.84333,83.74928 147.15658,84.336985 147.19397,83.591656 z M 182.56218,83.591656 C 183.88597,84.887071 180.50768,84.166272 182.56218,83.591656 L 182.56218,83.591656 z M 160.0023,83.822172 C 160.92608,84.257405 159.25977,84.373815 160.0023,83.822172 z M 161.62589,84.152896 C 162.66482,84.582434 160.71506,84.469342 161.62589,84.152896 z M 160.41321,84.603901 C 161.10428,85.359196 159.2212,85.163881 160.41321,84.603901 z M 171.59794,85.064913 C 170.87849,85.539639 172.47659,85.598049 171.59794,85.064913 z M 185.81938,85.365587 C 186.32735,86.072109 184.79581,85.799662 185.81938,85.365587 z M 189.3071,85.485848 C 188.96318,86.198372 188.57251,85.614405 189.3071,85.485848 z M 160.7239,85.726381 C 162.19193,86.331989 159.31258,86.260663 160.7239,85.726381 z M 169.94428,86.808773 C 171.04502,88.754246 166.35422,87.929839 169.94428,86.808773 z M 139.63727,87.229708 C 138.65231,88.582806 138.46758,87.549677 139.63727,87.229708 z M 139.7876,87.630589 C 139.07189,88.752126 138.85657,87.852 139.7876,87.630589 z M 156.55467,87.941279 C 156.45171,88.597902 155.80275,87.926961 156.55467,87.941279 z M 155.02129,88.62278 C 154.9706,89.274712 154.16882,88.586933 155.02129,88.62278 z M 137.80321,89.15396 C 136.65605,90.809411 135.78998,90.430734 137.80321,89.15396 z M 161.4956,89.21409 C 159.01127,89.653379 158.52917,94.032038 160.50652,90.199573 L 161.03768,89.744522 L 161.4956,89.21409 L 161.4956,89.21409 z M 161.73613,89.294264 C 163.19104,89.972898 162.87329,89.089876 161.73613,89.294264 z M 160.20274,89.324335 C 158.71022,90.198364 159.41514,91.276906 160.20274,89.324335 z M 198.19676,89.534797 C 197.04824,90.094767 198.37459,90.572493 198.19676,89.534797 z M 150.97233,89.705183 C 152.35618,90.99689 149.45035,91.394566 150.97233,89.705183 z M 157.61702,89.955732 C 156.92029,89.868962 157.48504,90.697589 157.61702,89.955732 z M 155.64266,90.386684 C 153.86475,91.280398 156.35683,91.606646 155.64266,90.386684 z M 172.74047,90.446814 C 174.3321,92.612131 168.78322,91.255172 172.74047,90.446814 z M 196.28252,91.338788 C 193.30355,93.856357 194.76668,94.224792 196.28252,91.338788 z M 199.33928,91.779766 C 197.89149,94.271761 194.93238,98.006272 197.4441,93.240179 C 194.38545,96.452083 192.71862,100.82631 188.86813,103.3919 C 192.02259,100.09794 201.56436,96.850404 199.33928,91.779766 z M 176.57895,91.79981 C 173.89719,91.227601 174.05368,97.165396 175.03183,93.313061 C 175.13896,93.026849 178.44031,92.163338 176.57895,91.79981 z M 154.79077,91.950141 C 152.58389,91.383422 155.36805,93.296551 154.79077,91.950141 z M 155.68274,92.761941 C 155.64797,93.432708 154.80812,92.719928 155.68274,92.761941 z M 177.69142,92.862158 C 174.19857,94.005613 177.9402,96.401068 177.69142,92.862158 z M 136.38007,92.872185 C 134.49378,94.654565 137.30123,93.929239 136.38007,92.872185 z M 198.94842,93.453469 C 198.88138,94.080749 198.1224,93.426952 198.94842,93.453469 z M 147.75521,93.54367 C 147.90959,94.645481 145.85174,94.234378 147.75521,93.54367 z M 135.43798,94.044779 C 134.01933,94.949637 134.93302,96.377511 135.43798,94.044779 z M 157.0658,94.054795 C 163.24239,94.869217 153.42091,100.38901 155.5704,95.232059 L 156.15357,94.54512 L 157.0658,94.054795 L 157.0658,94.054795 z M 193.67676,94.636079 C 192.65173,95.447335 193.55364,96.336584 193.67676,94.636079 z M 194.98967,94.906682 C 193.74243,97.9575 187.61063,100.73848 188.53744,103.01534 C 190.7187,99.826813 193.54325,99.97779 194.98967,94.906682 z M 192.95516,95.057014 C 192.31345,94.995941 192.76453,95.780097 192.95516,95.057014 z M 197.55533,95.31759 C 197.22915,96.033135 196.80528,95.438271 197.55533,95.31759 z M 199.64997,95.698427 C 198.86697,96.614275 200.48792,96.303042 199.64997,95.698427 z M 160.88424,95.768585 C 164.385,95.871619 158.90832,96.501552 160.88424,95.768585 z M 167.90979,96.109335 C 166.3138,98.18185 158.31277,105.50252 163.58029,99.948857 C 164.9423,98.581686 166.37197,97.277371 167.90979,96.109335 z M 199.28918,96.410009 C 197.43825,97.065372 198.25166,97.666382 199.28918,96.410009 z M 191.81264,96.47014 C 189.93112,98.033976 190.23455,99.998274 191.81264,96.47014 z M 169.12247,96.660558 C 167.34219,98.633654 161.78956,104.15474 162.43688,102.84058 C 164.53489,100.6549 166.59421,98.348456 169.12247,96.660558 z M 190.68013,97.101537 C 190.00729,97.052672 190.52387,97.830448 190.68013,97.101537 z M 122.79001,97.171684 C 119.80641,99.585728 115.03,104.71449 113.82761,106.06446 C 115.97697,102.43411 119.43393,99.639631 122.79001,97.171684 z M 146.58263,97.332043 C 145.9409,97.27096 146.39199,98.055126 146.58263,97.332043 z M 141.59159,97.512445 C 139.62823,100.25841 138.50221,98.676343 141.59159,97.512445 z M 195.18009,97.692837 C 194.65295,98.896883 194.25814,97.707391 195.18009,97.692837 z M 197.4952,97.913326 C 195.79691,98.326282 197.18977,99.098537 197.4952,97.913326 z M 146.63273,98.063658 C 145.99137,98.099095 146.33438,98.747781 146.63273,98.063658 z M 189.19686,98.434479 C 187.40842,99.560348 181.79661,106.84918 186.12099,101.89429 C 187.19,100.78337 188.37801,99.758602 189.19686,98.434479 z M 137.72303,98.845387 C 139.22382,101.16065 134.88177,102.14238 137.72303,98.845387 z M 196.18231,98.875457 C 195.30962,99.444624 196.98643,99.299086 196.18231,98.875457 z M 189.83827,99.316435 C 189.13292,99.264437 189.71033,100.03547 189.83827,99.316435 z M 118.00944,99.857632 C 117.95628,100.52849 117.16902,99.792677 118.00944,99.857632 z M 195.2302,99.977893 C 194.18002,100.24779 194.51257,101.17142 195.2302,99.977893 z M 193.92732,100.2485 C 193.25829,100.17696 193.76387,100.97126 193.92732,100.2485 z M 120.20429,100.35874 C 120.35784,101.75628 117.99106,101.59899 120.20429,100.35874 z M 116.71658,100.85984 C 116.36897,101.75984 115.99144,100.857 116.71658,100.85984 z M 171.22712,101.01018 C 171.10587,101.67037 170.49375,100.96628 171.22712,101.01018 z M 193.93734,101.26073 C 193.30019,101.30621 193.66385,101.95091 193.93734,101.26073 z M 188.00422,101.27076 C 187.31381,101.23024 187.88457,101.98073 188.00422,101.27076 z M 170.41532,101.32086 C 168.66725,103.32679 167.49244,103.46848 170.17761,101.50398 L 170.41532,101.32086 z M 192.53424,101.58144 C 191.72917,101.69243 191.79104,102.82521 192.53424,101.58144 z M 173.38188,101.64157 C 175.17688,102.12206 172.06417,102.41398 173.38188,101.64157 z M 187.57326,101.73177 C 184.79219,103.77266 180.61894,110.02911 181.24107,111.24928 C 183.43943,108.13588 185.48161,104.91674 187.57326,101.73177 z M 193.14559,101.95226 C 191.97018,102.16176 192.04961,103.30263 193.14559,101.95226 z M 142.84436,102.05249 C 144.4811,101.92233 148.62845,103.94326 144.94904,103.50853 C 143.74668,102.02668 147.20182,107.56722 143.20034,104.73245 C 142.09043,104.23749 140.90884,102.34004 142.84436,102.05249 z M 115.34354,102.19279 C 114.76339,103.13232 114.58015,102.30925 115.34354,102.19279 z M 119.2121,102.33311 C 119.65098,104.63238 116.00017,102.88568 119.09746,102.37409 L 119.2121,102.33311 z M 139.66733,102.49345 C 139.07076,102.47447 138.93143,103.64107 139.66733,102.49345 z M 191.06098,102.53354 C 188.50162,103.00321 191.04161,104.55879 191.06098,102.53354 z M 150.58146,102.80415 C 152.35047,103.61883 147.10606,104.32979 150.58146,102.80415 z M 112.57743,103.17497 C 107.3432,115.48939 103.9829,128.5593 98.109321,140.59906 C 97.402707,142.84348 96.185745,149.35006 96.464266,143.60207 C 98.298552,138.17574 101.54037,133.23777 103.00486,127.65797 C 100.5389,133.85205 96.691003,139.63965 95.215124,146.12099 C 93.319959,151.58285 87.601742,154.09952 83.740088,157.98724 C 79.875933,161.17956 75.914986,164.26511 72.265386,167.707 C 69.241493,171.05562 74.126095,163.48076 75.520485,162.15751 C 81.740764,154.8481 86.184704,146.32786 91.330343,138.28843 C 94.969747,133.11554 101.5829,130.37741 103.76948,124.08227 C 105.42672,120.37152 109.10548,112.86338 108.12069,111.09984 C 105.89232,113.52705 99.935342,117.85768 98.809463,117.46957 C 100.37596,110.92497 109.01612,110.65073 111.45842,104.6539 L 111.99084,103.89179 L 112.57743,103.17497 z M 138.85554,103.33531 C 136.51283,105.00622 136.84533,105.89923 138.85554,103.33531 z M 114.04066,103.42552 C 114.19857,104.77321 112.57075,103.95475 114.04066,103.42552 z M 191.45185,103.4656 C 189.91308,103.83349 191.40758,104.42046 191.45185,103.4656 z M 189.02647,103.73621 C 185.21851,104.68216 191.15786,105.63466 189.02647,103.73621 z M 148.07593,103.80636 C 148.49569,104.57145 147.20882,104.38622 148.07593,103.80636 z M 151.55361,104.30747 C 151.43237,104.96766 150.82023,104.26358 151.55361,104.30747 z M 187.002,104.75847 C 183.55201,105.98798 190.13932,106.81241 187.002,104.75847 z M 143.01473,104.87873 C 147.11632,107.29854 138.843,106.60265 143.01473,104.87873 z M 112.52732,104.94889 C 113.68636,105.90733 111.00055,106.25703 112.52732,104.94889 L 112.52732,104.94889 z M 154.19946,105.01904 C 154.47566,108.29526 148.98378,108.13606 154.19946,105.01904 z M 117.98939,105.0491 C 114.33035,105.28512 117.39619,107.36662 117.98939,105.0491 L 117.98939,105.0491 z M 147.04364,105.1393 C 147.43701,106.25122 146.03666,105.76547 147.04364,105.1393 z M 114.0106,105.31971 C 113.68291,106.02963 113.26362,105.47095 114.0106,105.31971 z M 136.51035,105.75066 C 135.67219,105.85352 136.06504,106.67476 136.51035,105.75066 z M 113.25893,106.05132 C 112.024,108.72311 110.01936,108.48392 113.25893,106.05132 z M 181.55997,106.27181 C 180.0654,107.17627 180.40345,108.1446 181.55997,106.27181 z M 185.34835,106.35199 C 182.40777,108.19312 188.83325,107.73926 185.34835,106.35199 z M 145.7608,106.50232 C 145.86549,108.51788 143.30673,108.67958 145.7608,106.50232 z M 111.64537,106.57247 C 112.19732,108.07444 109.77667,108.45145 111.64537,106.57247 z M 188.00422,106.65266 C 187.04674,106.77727 188.03233,107.23898 188.00422,106.65266 z M 132.20082,106.73283 C 128.68638,108.24073 132.71886,110.76536 132.20082,106.73283 z M 152.68612,106.75288 C 151.6042,107.0976 153.66923,107.34703 152.68612,106.75288 z M 181.58002,107.48449 C 179.9841,108.87766 178.23054,114.50721 178.80181,110.31767 C 177.45538,111.81607 176.75661,115.0433 175.53524,113.89485 C 174.87822,114.56934 174.27425,118.07212 174.05882,115.1473 C 171.63025,116.81268 173.0122,118.51388 173.12832,118.49505 C 171.76672,116.52178 168.77916,120.26765 171.48718,119.65221 C 169.7456,122.73879 169.24385,117.55918 168.03051,121.69882 C 170.71405,120.94919 166.32287,123.73753 169.27382,121.86262 C 171.08145,120.87159 170.35176,122.69435 172.24019,121.28128 C 172.02477,122.62465 172.31425,120.62081 171.3545,120.34605 C 175.47763,116.8717 180.79865,113.25376 181.58002,107.48449 z M 116.58629,107.60476 C 116.99723,108.17801 115.38231,107.47087 116.58629,107.60476 z M 112.48723,107.70498 C 113.42027,108.15038 111.77239,108.25431 112.48723,107.70498 z M 117.31791,107.94551 C 118.04104,109.11406 115.9559,109.81729 117.31791,107.94551 z M 184.03544,107.96556 C 181.59734,109.81102 187.03594,108.98996 184.03544,107.96556 z M 112.1565,108.23616 C 112.26557,109.57254 111.06408,108.6622 112.1565,108.23616 z M 152.15495,108.41655 C 154.55632,108.44954 151.9258,109.39441 152.15495,108.41655 z M 179.34507,108.45664 C 177.55708,109.56449 177.85722,110.84592 179.34507,108.45664 z M 116.02505,109.05798 C 116.27095,114.20671 114.87457,119.4253 111.73861,123.50098 C 111.17537,126.25363 103.28326,134.03532 108.18196,127.41645 C 111.85884,121.84303 115.6571,115.9142 116.02505,109.05798 z M 112.1565,109.18826 C 112.28826,112.19281 109.1444,110.09353 112.1565,109.18826 z M 133.13288,109.19828 C 132.41288,109.12332 133.02239,109.94648 133.13288,109.19828 z M 182.8428,109.63926 C 180.8491,111.19402 184.25225,111.15845 182.8428,109.63926 z M 116.88696,109.94995 C 117.12736,112.08108 116.09616,111.04885 116.88696,109.94995 z M 148.46679,110.59136 C 149.72811,111.09988 146.75067,110.68486 148.46679,110.59136 z M 177.08006,110.79181 C 175.33108,112.26232 175.7124,112.9979 177.08006,110.79181 z M 139.75753,110.86197 C 141.21596,113.2528 134.59552,113.62111 139.3822,112.14286 C 139.83201,111.96607 140.33051,111.26679 139.75753,110.86197 z M 112.07632,111.30294 C 111.55859,114.46544 110.63945,122.72452 109.12356,122.55011 C 110.57031,118.91674 110.83672,115.00117 112.07632,111.30294 z M 181.75039,111.36307 C 180.71629,112.49084 182.08735,111.86838 181.75039,111.36307 z M 144.82874,112.34524 C 149.04316,112.43416 147.7889,117.12352 144.61839,114.65755 C 144.10911,114.07585 143.44192,112.35001 144.82874,112.34524 z M 153.74847,112.35527 C 151.75958,114.54965 150.85693,118.68507 154.70711,115.73684 C 157.05995,112.54083 155.06142,113.47966 153.20556,115.1388 C 153.15337,114.23224 154.4061,113.30318 153.74847,112.35527 z M 147.12382,112.5056 C 148.11438,113.08691 147.13595,113.29723 147.12382,112.5056 z M 109.96164,112.60582 C 110.17649,113.93367 108.952,114.47936 109.96164,112.60582 z M 141.44125,112.92652 C 143.06884,114.28146 139.81945,114.80392 141.44125,112.92652 z M 174.50437,113.34746 C 172.53653,114.88771 173.34308,116.23983 174.50437,113.34746 z M 143.06485,114.74054 C 144.8002,115.84859 142.80475,116.04528 143.06485,114.74054 z M 176.65913,114.85079 C 176.31521,115.5633 175.92454,114.97934 176.65913,114.85079 z M 109.25007,115.09132 C 108.9619,117.38751 108.60315,117.18874 109.25007,115.09132 z M 177.94196,115.10134 C 175.74146,116.44191 178.27733,116.33557 177.94196,115.10134 z M 149.85987,115.20156 C 149.65765,116.04097 151.20223,115.10554 149.85987,115.20156 z M 139.57713,115.22161 C 138.87203,117.07391 136.8127,116.79131 139.57713,115.22161 z M 134.26538,115.6726 C 142.9381,116.55056 131.58517,127.87896 131.28232,119.01421 C 131.65863,117.52557 132.77496,116.14621 134.26538,115.6726 z M 175.66694,115.89309 C 175.34075,116.60864 174.91689,116.01377 175.66694,115.89309 z M 153.38767,115.94319 C 154.68945,116.04281 152.81914,116.52525 153.38767,115.94319 z M 172.1692,115.95322 C 169.82559,117.24785 170.36724,119.67521 172.1692,115.95322 z M 144.95903,116.07348 C 145.97968,116.10856 145.12925,117.19912 144.95903,116.07348 z M 139.20631,116.59464 C 139.10616,117.2433 138.44608,116.5875 139.20631,116.59464 z M 156.83529,116.65478 C 155.43678,118.5047 155.1614,117.67557 156.83529,116.65478 z M 176.9598,116.67482 C 176.27003,116.72616 176.3913,117.6666 176.9598,116.67482 z M 175.89745,116.8953 C 175.16218,117.38903 176.79067,117.39083 175.89745,116.8953 z M 111.8859,116.95544 C 112.01814,118.35303 111.47522,117.63606 111.8859,116.95544 z M 131.56942,117.42648 C 131.45429,118.06207 130.82694,117.41018 131.56942,117.42648 z M 175.48653,117.56679 C 174.4828,117.84579 174.79069,118.6247 175.48653,117.56679 z M 153.6282,117.9376 C 154.47825,119.84206 153.02808,119.53882 153.6282,117.9376 z M 108.60866,118.11801 C 108.26399,121.0686 107.76891,127.76941 106.02904,127.90095 C 106.88103,124.63802 107.93564,121.42614 108.60866,118.11801 z M 154.48009,118.3385 C 155.02498,119.16812 153.37689,119.18817 154.48009,118.3385 z M 141.89225,118.36857 C 142.2705,119.1332 140.95161,118.71745 141.89225,118.36857 z M 128.56278,118.45876 C 128.47304,119.33896 127.42753,118.251 128.56278,118.45876 z M 169.69372,118.69929 C 167.91327,119.97789 169.05951,120.19699 169.69372,118.69929 z M 157.9678,118.77947 C 155.75662,119.42223 159.29614,119.51872 157.9678,118.77947 z M 174.81505,118.87969 C 174.10976,118.8851 174.31317,119.9705 174.81505,118.87969 z M 174.21372,118.88972 C 171.16571,119.43866 173.06715,121.18154 174.21372,118.88972 z M 159.84194,119.87188 C 157.56528,121.17034 159.64309,121.65819 159.84194,119.87188 z M 156.82527,120.09237 C 156.77376,120.75349 157.73061,119.90365 156.82527,120.09237 z M 168.33071,120.37299 C 167.67627,120.26603 168.16609,121.19941 168.33071,120.37299 z M 156.37427,120.38302 C 154.16313,120.44459 157.01751,121.50059 156.37427,120.38302 z M 157.46669,120.75384 C 157.2951,121.94185 158.91846,121.03117 157.46669,120.75384 z M 161.35529,121.4153 C 159.86982,121.59617 160.63274,122.84903 161.35529,121.4153 z M 167.15812,121.45538 C 163.78533,123.14932 168.63377,123.15886 166.42038,122.68272 C 164.86578,123.27647 167.34203,122.02898 167.15812,121.45538 z M 145.851,121.5957 C 144.90937,123.26891 148.47516,121.14841 145.851,121.5957 z M 157.47671,121.6859 C 155.26399,121.9592 157.65741,123.31433 157.47671,121.6859 z M 130.82779,121.85628 C 130.51436,123.89462 128.69364,122.52693 130.82779,121.85628 z M 169.35297,122.3674 C 164.71007,124.47947 161.36272,128.17399 158.74788,132.17858 C 155.79206,137.22445 159.86814,131.45645 160.71221,130.81431 C 158.96551,135.25474 164.40062,127.04731 165.96549,126.04687 C 167.13694,124.86005 168.24889,123.61654 169.35297,122.3674 z M 171.26721,122.46763 C 170.62947,122.34916 171.08589,123.28307 171.26721,122.46763 z M 133.31328,122.64802 C 132.71525,123.8881 131.76148,131.20636 131.91684,126.57482 C 131.50465,131.92066 127.11481,127.69029 131.14088,125.1558 C 131.81095,124.27501 132.537,123.4368 133.31328,122.64802 z M 170.17479,122.75827 C 167.25479,123.60071 169.44201,124.79149 170.17479,122.75827 L 170.17479,122.75827 z M 159.34084,122.81841 C 156.97232,123.67259 158.31462,125.45325 159.34084,122.81841 z M 105.93274,123.37965 C 105.58503,125.28502 104.8689,132.84181 103.60023,130.17711 C 104.31166,127.88857 105.45986,125.74282 105.93274,123.37965 z M 112.21663,123.7204 C 112.52401,124.7691 111.2181,124.10968 112.21663,123.7204 z M 166.70712,124.24155 C 166.59198,124.87716 165.96464,124.22525 166.70712,124.24155 z M 168.29063,124.70257 C 166.38227,125.16276 166.86354,126.85085 168.29063,124.70257 z M 111.71552,124.71259 C 113.06998,128.50359 109.92513,126.17385 111.71552,124.71259 z M 163.96106,124.92306 C 162.73663,125.13304 164.06979,126.10258 163.96106,124.92306 z M 133.36339,124.95312 C 133.69756,125.62403 132.63175,125.43818 133.36339,124.95312 z M 165.12362,125.2137 C 164.77971,125.92622 164.38904,125.34225 165.12362,125.2137 z M 123.65191,125.91525 C 123.68003,126.50157 122.69445,126.03988 123.65191,125.91525 z M 149.63939,126.28607 C 148.59708,131.34171 141.56663,131.00794 139.3084,127.98121 C 139.55393,130.99168 135.81964,125.92091 138.18839,129.3371 C 140.89099,133.07081 149.43182,131.27097 149.63939,126.28607 L 149.63939,126.28607 z M 162.35751,126.39632 C 160.23209,127.49706 157.9855,132.88184 162.35751,126.39632 z M 163.82074,126.50656 C 163.75371,127.13383 162.99472,126.48005 163.82074,126.50656 z M 166.74721,126.51658 C 165.78265,127.58467 168.24653,126.32198 166.74721,126.51658 z M 111.31464,126.52661 C 110.76625,130.37372 109.76611,132.97492 108.64935,134.41399 C 108.09978,138.06641 104.30123,141.63482 101.14056,143.58488 C 97.682344,145.98702 99.112195,139.47174 99.896054,140.96907 C 98.953823,135.14456 107.4709,133.02436 109.40374,128.35747 C 110.60355,128.25036 109.6842,126.70089 111.31464,126.52661 z M 166.1058,126.77715 C 165.43297,126.72829 165.9495,127.50608 166.1058,126.77715 z M 110.39259,127.02771 C 110.30607,127.61465 111.02912,127.25143 110.39259,127.02771 z M 165.27395,127.40855 C 164.33121,127.82526 165.69497,128.13691 165.27395,127.40855 z M 143.86662,128.33059 C 143.75012,129.37254 146.37491,127.84238 143.86662,128.33059 z M 165.05346,128.34061 C 163.97022,128.06526 164.9758,129.21601 165.05346,128.34061 z M 169.33293,128.35064 C 167.51208,128.09183 169.13476,129.24389 169.33293,128.35064 z M 165.37417,128.63126 C 164.53601,128.73411 164.92888,129.55536 165.37417,128.63126 z M 168.24051,129.2827 C 167.14292,129.4689 168.4577,130.10765 168.24051,129.2827 z M 161.93658,129.48314 C 162.01585,130.07099 161.02824,129.5087 161.93658,129.48314 z M 137.76312,129.69361 C 138.73787,131.81088 140.51213,130.79259 137.76312,129.69361 L 137.76312,129.69361 z M 167.58907,129.95418 C 166.80874,130.27553 168.4055,130.29643 167.58907,129.95418 z M 158.76957,130.31498 C 156.6984,131.33029 153.32943,139.75367 157.00707,134.4768 C 157.77676,132.76927 157.3657,131.98141 158.76957,130.31498 z M 167.06792,130.31498 C 165.92888,130.89527 167.50749,131.15357 167.06792,130.31498 z M 123.34123,130.33502 C 120.82186,129.67973 123.71075,131.20441 123.34123,130.33502 z M 166.41648,131.4575 C 165.74747,131.38596 166.25302,132.18028 166.41648,131.4575 z M 162.46775,131.70806 C 161.83217,131.73711 162.1661,132.39812 162.46775,131.70806 z M 161.54571,132.1791 C 160.87668,132.10756 161.38226,132.90187 161.54571,132.1791 z M 164.95325,132.3595 C 164.59858,133.24887 165.98207,132.32495 164.95325,132.3595 z M 161.79626,132.49981 C 161.11369,132.43469 161.66481,133.20705 161.79626,132.49981 z M 111.44492,133.44189 C 110.30885,133.56589 111.47133,134.08105 111.44492,133.44189 z M 160.12257,134.04322 C 159.13694,134.49061 160.58784,134.74835 160.12257,134.04322 z M 158.87982,134.41404 C 157.60072,134.22507 159.31581,135.04438 158.87982,134.41404 z M 163.17933,134.49422 C 162.26162,134.93401 163.81025,135.04237 163.17933,134.49422 z M 161.52567,135.1657 C 161.4875,136.16172 162.68066,135.01383 161.52567,135.1657 z M 154.68053,135.22584 C 151.82634,137.54937 151.82711,139.21151 154.68053,135.22584 z M 157.97782,135.4363 C 156.89418,136.59249 158.11403,136.5221 157.97782,135.4363 z M 162.14704,135.81714 C 161.02229,135.73233 161.67466,137.13499 162.14704,135.81714 z M 157.00567,135.96748 C 154.44378,138.0629 148.47691,142.0738 148.19492,143.09673 C 151.59346,141.38909 154.65863,138.96872 157.00567,135.96748 z M 96.802548,136.41848 C 95.927197,137.01864 97.54462,136.78612 96.802548,136.41848 z M 108.17769,136.45856 C 109.21551,136.98694 107.33954,137.46236 108.17769,136.45856 z M 161.02456,136.68907 C 158.89418,137.28047 161.02776,138.13027 161.02456,136.68907 z M 107.12537,136.79932 C 106.255,137.70819 108.32656,137.59117 107.12537,136.79932 z M 153.85871,136.85945 C 152.15613,137.89166 153.54944,138.75575 153.85871,136.85945 z M 160.04238,137.89173 C 159.13277,138.05378 160.61562,138.68077 160.04238,137.89173 z M 100.4005,138.17235 C 100.25597,139.34882 102.28475,139.57077 100.4005,138.17235 z M 159.48114,138.41289 C 158.60579,139.01306 160.22323,138.78052 159.48114,138.41289 z M 127.29998,138.463 C 129.08707,138.59791 126.23706,138.64515 127.29998,138.463 z M 126.65857,138.54318 C 124.47411,139.58342 121.2434,138.5311 125.62721,138.59077 L 126.65857,138.54318 z M 137.90343,138.70352 C 138.51984,140.3867 140.29945,137.89818 137.90343,138.70352 z M 158.55911,138.79372 C 157.59291,139.93218 159.7332,140.28681 158.55911,138.79372 z M 140.74972,138.87391 C 139.94098,139.85279 142.10366,139.14686 140.74972,138.87391 z M 142.76417,138.95408 C 142.24307,139.92831 143.98021,139.03531 142.76417,138.95408 z M 121.94815,138.97413 C 119.28559,140.16042 111.94303,140.12668 118.72862,139.34447 C 119.80005,139.20633 120.8741,139.08971 121.94815,138.97413 z M 147.27416,138.97413 C 146.36428,139.40256 147.90885,139.51455 147.27416,138.97413 z M 145.10936,139.04428 L 145.14312,139.33465 L 145.10936,139.04428 z M 122.89023,139.64561 C 123.8403,139.92805 122.77715,140.77533 122.89023,139.64561 z M 154.8008,139.69573 C 154.03127,140.07318 155.20947,140.64931 154.8008,139.69573 z M 157.00567,139.73581 C 156.10875,139.99092 157.86823,140.18283 157.00567,139.73581 z M 128.87347,139.97635 C 126.13877,140.55018 120.48693,143.65805 119.64488,142.97251 C 122.48162,141.37563 125.63927,140.34855 128.87347,139.97635 z M 125.47595,140.00641 C 127.01763,139.61304 124.87885,140.61254 125.47595,140.00641 z M 114.19099,140.05652 C 113.70332,141.09574 112.23767,139.61495 114.19099,140.05652 z M 117.7188,140.06655 C 121.71183,139.71098 120.81217,141.91117 117.70161,142.08395 C 117.17817,143.47464 115.03356,142.67518 115.44425,144.42417 C 110.3988,143.25626 113.60091,140.0961 116.54237,140.89452 C 116.79331,140.97341 118.70354,140.65464 117.7188,140.06655 z M 157.82749,140.08659 C 154.83966,141.87998 157.1996,141.95136 157.82749,140.08659 z M 156.60479,140.20685 C 156.61027,140.96998 157.56074,140.23356 156.60479,140.20685 z M 156.08364,140.3171 C 155.61911,141.0039 156.81216,140.86288 156.08364,140.3171 z M 153.38767,140.34717 C 152.28841,140.46509 153.41021,140.98381 153.38767,140.34717 z M 91.621082,140.52756 C 90.913863,140.56913 91.066008,141.53401 91.621082,140.52756 z M 152.20505,141.31931 C 150.19145,141.78909 152.25753,143.35171 152.20505,141.31931 z M 105.65212,141.39949 C 106.65114,142.14569 104.55052,142.81281 105.65212,141.39949 z M 102.50516,141.4496 C 101.80618,141.93264 103.37207,141.96687 102.50516,141.4496 z M 153.61818,141.51976 C 152.95245,141.46324 153.4485,142.22745 153.61818,141.51976 z M 155.91325,141.77031 C 154.39901,144.24074 150.66609,146.08095 152.27436,146.24449 C 153.41434,144.78993 155.86115,143.84716 155.91325,141.77031 z M 106.24343,142.11106 C 108.31597,143.28543 112.99605,151.70782 108.61111,147.01322 C 105.55004,145.07448 106.33845,143.54402 106.24343,142.11106 z M 150.44116,142.45182 C 148.28273,143.56212 151.40125,145.19306 150.44116,142.45182 z M 98.085386,142.61217 C 102.22229,145.60887 95.919403,147.58171 98.085386,142.61217 z M 104.25903,142.8026 C 105.50623,144.58167 111.75345,151.66364 106.38336,147.88941 C 103.94781,146.89125 104.9558,141.71585 103.43788,145.14285 C 105.30565,147.55562 108.14148,151.18201 102.79875,150.06533 C 99.25717,149.10699 100.13804,147.59748 102.9987,149.9438 C 101.98681,149.84433 99.85314,145.98948 102.01982,147.91806 C 98.929683,146.01779 101.95285,144.04858 101.79088,147.55865 C 103.70839,149.83303 106.63523,149.87594 103.15117,147.46977 C 101.82862,144.38675 104.18584,147.44238 102.43692,144.85639 C 102.71578,143.93974 103.79668,143.5959 104.25903,142.8026 z M 122.04837,143.22352 C 123.61146,142.83465 121.4609,143.79955 122.04837,143.22352 z M 148.55699,143.63443 C 146.29344,145.38115 150.73772,145.31386 148.55699,143.63443 z M 121.82788,144.2057 C 126.51853,144.26355 120.96247,144.64306 121.82788,144.2057 z M 151.48346,144.21571 C 150.69109,144.32028 150.6962,145.47217 151.48346,144.21571 z M 127.89129,144.33598 C 126.86286,145.24747 129.27693,144.70673 127.89129,144.33598 z M 147.0236,144.35603 C 144.46314,145.38034 148.31737,146.46669 147.0236,144.35603 z M 121.08625,144.66672 C 121.39558,145.27281 119.20905,144.31353 121.08625,144.66672 z M 139.38671,145.08764 C 135.75342,145.26131 135.38976,147.17791 139.38671,145.08764 z M 97.534163,145.27806 C 99.152026,146.48206 97.034672,147.63661 97.534163,145.27806 z M 118.47046,145.41838 C 120.03753,145.76004 117.33761,145.69151 118.47046,145.41838 z M 151.99459,145.89944 C 150.38014,147.613 150.06426,148.9548 149.35968,148.3264 C 146.5026,152.27134 152.57517,147.18283 151.99459,145.89944 z M 106.85477,145.90946 C 107.65506,146.32998 106.79329,146.57196 106.85477,145.90946 z M 118.02948,145.93953 C 120.0046,145.32192 118.31192,146.78166 118.02948,145.93953 z M 117.43818,146.39052 C 121.36214,146.61241 113.83078,147.24178 117.43818,146.39052 z M 147.42449,146.63106 C 146.64263,146.74087 146.63448,147.85677 147.42449,146.63106 z M 146.60267,146.68117 C 145.48342,147.00065 146.47193,148.19876 146.60267,146.68117 z M 99.889366,146.7413 C 100.50701,148.74276 97.503652,146.78047 99.889366,146.7413 z M 107.70666,147.00188 C 108.35603,147.1595 107.66924,147.7472 107.70666,147.00188 z M 114.92262,147.18228 C 116.96168,147.30444 114.11376,147.87857 114.92262,147.18228 z M 145.65056,147.38272 C 145.0576,148.12543 146.00757,148.48943 145.65056,147.38272 z M 149.53916,147.50299 C 148.51561,147.68373 149.83744,148.55426 149.53916,147.50299 z M 96.892739,147.52303 C 97.818879,149.4212 103.69363,151.40044 102.71647,151.14471 C 100.75977,150.61413 96.746565,150.24213 96.892739,147.52303 z M 96.752434,148.26467 C 95.85198,150.48496 93.637092,150.28521 96.752434,148.26467 z M 120.87578,148.47514 C 116.11586,150.08895 111.04554,151.23757 107.48994,155.09668 C 103.06998,158.87779 97.093041,159.01261 92.068185,161.51086 C 88.433094,163.40521 86.624013,160.74615 89.741157,158.10989 C 93.525188,155.28722 95.654371,146.68863 101.15054,151.42637 C 106.54137,151.67319 111.63908,149.28933 117.00272,148.93088 C 118.28819,148.73633 119.57938,148.57607 120.87578,148.47514 z M 145.27975,148.78583 C 142.56615,148.92647 145.02971,150.97723 145.27975,148.78583 z M 145.51025,149.06645 C 145.04034,149.63734 146.41508,149.07705 145.51025,149.06645 z M 147.4345,149.37714 C 146.21473,151.59626 150.8629,150.02283 147.50456,149.4773 L 147.4345,149.37714 z M 108.70887,149.5876 C 109.45486,149.93574 107.86051,150.20754 108.70887,149.5876 z M 96.191194,149.60764 C 94.262743,151.35231 93.51131,151.42069 96.032485,149.71525 L 96.191194,149.60764 z M 143.48577,149.84817 C 140.11521,151.91683 145.47293,153.92905 143.48577,149.84817 z M 106.36369,150.38937 C 105.2583,151.32492 104.29821,150.14578 106.36369,150.38937 z M 143.68622,150.50963 C 143.15624,152.58906 142.29642,150.61394 143.68622,150.50963 z M 147.03362,150.74015 C 146.88759,151.78612 149.04242,150.22088 147.03362,150.74015 z M 146.68285,151.22121 C 145.17896,152.48951 148.23962,151.95103 146.68285,151.22121 z M 143.37553,151.52188 C 143.71348,152.22865 142.68052,151.87809 143.37553,151.52188 z M 145.87105,152.033 C 144.50121,152.50278 146.50142,153.08141 145.87105,152.033 z M 141.29092,152.50404 C 140.04758,153.11829 141.32455,153.56756 141.29092,152.50404 z M 141.56152,153.33588 C 139.8385,154.06613 141.58431,154.49767 141.56152,153.33588 z M 90.729119,153.86706 C 90.846768,154.45581 89.799967,153.89942 90.729119,153.86706 z M 113.9204,156.35255 C 112.78434,156.47654 113.94679,156.99172 113.9204,156.35255 z M 71.626873,170.94483 C 71.070731,172.78009 69.034061,170.39629 71.626873,170.94483 z"
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:4.33300018;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     <path
+       style="font-size:32px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#6a6a6a;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:URW Palladio L"
+       d="M 263.08597,171.8306 C 255.78998,171.8306 250.92597,176.56661 250.92597,183.6066 C 250.92597,190.32659 255.59798,195.1586 262.06197,195.1586 C 269.22996,195.1586 274.66997,189.81459 274.66997,182.7746 C 274.66997,176.05461 270.18996,171.8306 263.08597,171.8306 M 262.54197,173.1746 C 268.01396,173.1746 271.24597,177.07861 271.24597,183.7346 C 271.24597,190.07059 268.30196,193.8146 263.34197,193.8146 C 257.96597,193.8146 254.34997,189.27059 254.34997,182.4226 C 254.34997,176.50261 257.29397,173.1746 262.54197,173.1746 M 275.16697,181.7186 L 276.35097,181.7186 C 277.63097,181.7186 277.75897,181.9426 277.75897,184.0546 L 277.75897,200.1506 C 277.75897,202.1666 277.66297,202.3906 276.57497,202.4546 L 275.10297,202.5506 L 275.10297,203.5106 C 278.30297,203.4146 278.30297,203.4146 279.10297,203.4146 C 279.90297,203.4146 279.90297,203.4146 283.10297,203.5106 L 283.10297,202.5506 L 281.63097,202.4546 C 280.54297,202.3906 280.44697,202.1666 280.44697,200.1506 L 280.44697,194.1026 C 281.40697,194.6786 282.43097,194.9026 283.87097,194.9026 C 284.79897,194.9026 285.63097,194.7106 286.14297,194.3906 L 289.79097,192.0226 C 291.07097,191.1906 292.57497,187.8946 292.57497,185.8466 C 292.57497,182.2946 289.63097,179.5106 285.91897,179.5106 C 284.73497,179.5106 283.58297,179.8306 283.07097,180.3106 L 280.44697,182.7106 L 280.44697,179.6386 L 280.15897,179.5106 C 278.52697,180.1826 276.86297,180.6306 275.16697,180.8226 L 275.16697,181.7186 M 280.44697,184.7266 C 280.44697,184.2786 280.60697,183.9266 281.02297,183.3826 C 281.95097,182.1986 283.26297,181.5906 284.86297,181.5906 C 287.87097,181.5906 289.79097,183.7026 289.79097,187.0306 C 289.79097,190.6146 287.64697,193.2706 284.76697,193.2706 C 283.00697,193.2706 281.69497,192.6946 280.44697,191.3826 L 280.44697,184.7266 M 307.70597,192.2786 L 307.28997,191.9586 C 305.24197,193.1746 304.50597,193.4626 303.12997,193.4626 C 301.04997,193.4626 299.32197,192.5346 298.42597,190.9666 C 297.81797,189.9106 297.59397,189.0146 297.52997,187.1586 L 302.20197,187.1586 C 304.40997,187.1586 305.78597,187.0626 307.99397,186.7106 C 308.02597,186.2626 308.05797,185.9746 308.05797,185.5906 C 308.05797,181.9106 305.68997,179.5106 302.10597,179.5106 C 300.92197,179.5106 299.54597,179.9266 298.23397,180.6946 C 295.60997,182.1986 294.55397,184.1826 294.55397,187.5106 C 294.55397,189.5266 295.03397,191.2546 295.89797,192.4706 C 297.17797,194.1666 299.32197,195.1586 301.72197,195.1586 C 302.90597,195.1586 304.08997,194.9026 305.40197,194.3266 C 306.26597,193.9746 306.93797,193.5586 307.06597,193.3666 L 307.70597,192.2786 M 305.20997,185.9746 C 303.54597,186.0386 302.77797,186.0706 301.62597,186.0706 C 300.15397,186.0706 299.32197,186.0386 297.59397,185.8786 C 297.59397,184.3746 297.72197,183.6706 298.13797,182.8386 C 298.80997,181.4306 300.18597,180.5666 301.72197,180.5666 C 302.77797,180.5666 303.60997,180.9826 304.18597,181.8466 C 304.88997,182.9026 305.11397,183.8306 305.20997,185.9746 M 321.90447,194.6146 C 323.85647,194.5186 323.88847,194.5186 324.43247,194.5186 C 324.88047,194.5186 324.88047,194.5186 327.08847,194.6146 L 327.08847,193.6546 L 325.77647,193.5586 C 324.68847,193.4946 324.59247,193.3026 324.59247,191.2546 L 324.59247,185.0786 C 324.59247,181.3346 322.83247,179.5106 319.24847,179.5106 C 318.06447,179.5106 317.39247,179.7346 316.72047,180.3106 L 314.28847,182.4226 L 314.28847,179.6386 L 314.00047,179.5106 C 312.36847,180.1826 310.70447,180.6306 309.00847,180.8226 L 309.00847,181.7186 L 310.19247,181.7186 C 311.47247,181.7186 311.60047,181.9426 311.60047,184.0546 L 311.60047,191.2546 C 311.60047,193.2706 311.50447,193.4946 310.41647,193.5586 L 308.97647,193.6546 L 308.97647,194.6146 C 311.15247,194.5506 312.01647,194.5186 312.94447,194.5186 C 313.87247,194.5186 314.73647,194.5506 316.91247,194.6146 L 316.91247,193.6546 L 315.47247,193.5586 C 314.38447,193.4946 314.28847,193.2706 314.28847,191.2546 L 314.28847,184.4706 C 314.28847,183.0306 316.40047,181.4626 318.35247,181.4626 C 320.49647,181.4626 321.90447,183.0626 321.90447,185.5266 L 321.90447,194.6146 M 341.69647,173.9746 C 342.81647,173.7186 343.74447,173.5906 344.83247,173.5906 C 348.28847,173.5906 350.14447,175.1906 350.14447,178.2306 C 350.14447,181.1106 348.19247,183.1266 345.40847,183.1266 C 344.73647,183.1266 344.25647,183.0626 343.42447,182.8066 L 343.74447,183.9586 C 344.51247,184.1186 344.96047,184.1506 345.60047,184.1506 C 349.98447,184.1506 353.34447,181.1746 353.34447,177.3346 C 353.34447,174.2626 350.84847,172.3746 346.78447,172.3746 C 346.62447,172.3746 346.30447,172.3746 345.88847,172.4066 C 344.70447,172.4386 342.27247,172.4706 341.34447,172.4706 C 340.64047,172.4706 340.64046,172.4706 335.52047,172.3746 L 335.52047,173.3346 L 336.96047,173.4306 C 338.40047,173.5266 338.65647,173.9426 338.65647,176.3106 L 338.65647,190.6786 C 338.65647,193.2066 338.49647,193.4626 337.02447,193.5586 L 335.48847,193.6546 L 335.48847,194.6146 C 337.37647,194.5506 338.49647,194.5186 340.16047,194.5186 C 341.82447,194.5186 342.97647,194.5506 344.86447,194.6146 L 344.86447,193.6546 L 343.32847,193.5586 C 341.85647,193.4626 341.69647,193.2066 341.69647,190.6786 L 341.69647,173.9746 M 369.81797,179.6386 L 369.52997,179.5106 C 367.89797,180.1826 366.23397,180.6306 364.53797,180.8226 L 364.53797,181.7186 L 365.72197,181.7186 C 367.00197,181.7186 367.12997,181.9426 367.12997,184.0546 L 367.12997,189.2706 C 367.12997,189.9746 366.68197,190.8706 365.94597,191.6066 C 365.04997,192.5026 364.02597,192.9506 362.77797,192.9506 C 361.65797,192.9506 360.76197,192.5986 360.24997,191.9906 C 359.80197,191.4786 359.57797,190.4866 359.57797,189.0786 L 359.57797,179.6386 L 359.28997,179.5106 C 357.65797,180.1826 355.99397,180.6306 354.29797,180.8226 L 354.29797,181.7186 L 355.48197,181.7186 C 356.76197,181.7186 356.88997,181.9426 356.88997,184.0546 L 356.88997,189.4306 C 356.88997,191.6706 357.08197,192.6626 357.65797,193.4626 C 358.36197,194.4226 359.57797,194.9026 361.40197,194.9026 C 362.84197,194.9026 364.12197,194.4546 364.98597,193.6546 L 367.12997,191.6706 C 367.12997,192.5986 367.09797,193.1106 367.00197,194.6146 C 369.14597,194.5186 369.17797,194.5186 369.65797,194.5186 C 370.10597,194.5186 370.10597,194.5186 372.31397,194.6146 L 372.31397,193.6546 L 371.00197,193.5586 C 369.91397,193.4946 369.81797,193.3026 369.81797,191.2546 L 369.81797,179.6386 M 377.45947,171.5426 L 377.17147,171.2866 C 375.76347,171.8306 374.70747,172.0866 372.17947,172.4706 L 372.17947,173.3666 L 373.97147,173.3666 C 374.54747,173.3666 374.77147,173.7186 374.77147,174.6786 L 374.77147,189.6226 C 374.77147,191.6066 374.73947,192.4706 374.51547,194.7106 L 375.02747,194.9026 L 376.30747,193.7506 C 377.58747,194.5826 378.73947,194.9026 380.43547,194.9026 C 381.68347,194.9026 382.51547,194.6786 383.18747,194.1986 L 386.38747,191.8946 C 387.79547,190.8706 388.91547,188.2146 388.91547,185.8786 C 388.91547,182.1666 386.51547,179.5106 383.12347,179.5106 C 381.61947,179.5106 380.05147,180.0866 379.21947,180.9186 L 377.45947,182.7106 L 377.45947,171.5426 M 377.45947,184.6626 C 377.45947,184.2146 377.77947,183.6386 378.29147,183.0626 C 379.18747,182.1346 380.43547,181.5906 381.74747,181.5906 C 384.43547,181.5906 386.13147,183.7666 386.13147,187.1906 C 386.13147,190.7746 384.21147,193.2706 381.49147,193.2706 C 379.82747,193.2706 377.45947,192.2466 377.45947,191.5426 L 377.45947,184.6626 M 390.77047,173.3666 L 392.56247,173.3666 C 393.13847,173.3666 393.36247,173.7186 393.36247,174.6786 L 393.36247,191.2546 C 393.36247,193.2706 393.26647,193.4946 392.17847,193.5586 L 390.70647,193.6546 L 390.70647,194.6146 C 393.90647,194.5186 393.90647,194.5186 394.70647,194.5186 C 395.50647,194.5186 395.50647,194.5186 398.70647,194.6146 L 398.70647,193.6546 L 397.23447,193.5586 C 396.14647,193.4946 396.05047,193.2706 396.05047,191.2546 L 396.05047,171.5426 L 395.76247,171.2866 C 394.35447,171.8306 393.29847,172.0866 390.77047,172.4706 L 390.77047,173.3666 M 405.17547,179.6386 L 404.88747,179.5106 C 403.25547,180.1826 401.59147,180.6306 399.89547,180.8226 L 399.89547,181.7186 L 401.07947,181.7186 C 402.35947,181.7186 402.48747,181.9426 402.48747,184.0546 L 402.48747,191.2546 C 402.48747,193.2706 402.39147,193.4946 401.30347,193.5586 L 399.83147,193.6546 L 399.83147,194.6146 C 403.03147,194.5186 403.03147,194.5186 403.83147,194.5186 C 404.63147,194.5186 404.63147,194.5186 407.83147,194.6146 L 407.83147,193.6546 L 406.35947,193.5586 C 405.27147,193.4946 405.17547,193.2706 405.17547,191.2546 L 405.17547,179.6386 M 403.70347,172.5346 C 402.74347,172.5346 401.91147,173.3666 401.91147,174.3266 C 401.91147,175.2546 402.74347,176.0866 403.67147,176.0866 C 404.59947,176.0866 405.46347,175.2546 405.46347,174.3266 C 405.46347,173.4306 404.59947,172.5346 403.70347,172.5346 M 409.59647,189.9426 C 409.59647,192.1506 409.50047,193.1106 409.24447,194.3906 C 410.90847,194.9346 412.15647,195.1586 413.62847,195.1586 C 417.82047,195.1586 420.79647,192.9186 420.79647,189.7826 C 420.79647,188.7906 420.50847,188.0546 419.90047,187.4146 C 419.06847,186.6146 418.01247,186.2306 415.19647,185.6866 C 412.57247,185.1746 411.70847,184.5346 411.70847,183.0626 C 411.70847,181.4626 412.82847,180.5666 414.78047,180.5666 C 416.92447,180.5666 418.55647,181.6866 418.55647,183.1906 L 418.55647,183.9266 L 419.45247,183.9266 C 419.48447,182.0706 419.51647,181.3026 419.61247,180.3106 C 417.91647,179.7346 416.76447,179.5106 415.45247,179.5106 C 411.74047,179.5106 409.46847,181.2706 409.46847,184.1506 C 409.46847,185.6866 410.17247,186.7746 411.64447,187.4466 C 412.50847,187.8306 414.20447,188.3426 416.38047,188.8226 C 417.82047,189.1426 418.42847,189.8146 418.42847,191.0306 C 418.42847,192.7586 416.82847,193.9746 414.55647,193.9746 C 412.22047,193.9746 410.55647,192.8546 410.55647,191.2546 L 410.55647,189.9426 L 409.59647,189.9426 M 421.88347,173.3666 L 423.67547,173.3666 C 424.25147,173.3666 424.47547,173.7186 424.47547,174.6786 L 424.47547,191.2546 C 424.47547,193.2706 424.37947,193.4946 423.29147,193.5586 L 421.85147,193.6546 L 421.85147,194.6146 C 424.02747,194.5506 424.89147,194.5186 425.81947,194.5186 C 426.74747,194.5186 427.61147,194.5506 429.78747,194.6146 L 429.78747,193.6546 L 428.34747,193.5586 C 427.25947,193.4946 427.16347,193.2706 427.16347,191.2546 L 427.16347,184.4706 C 427.16347,183.0306 429.27547,181.4626 431.22747,181.4626 C 433.37147,181.4626 434.77947,183.0626 434.77947,185.5266 L 434.77947,194.6146 C 436.73147,194.5186 436.76347,194.5186 437.30747,194.5186 C 437.75547,194.5186 437.75547,194.5186 439.96347,194.6146 L 439.96347,193.6546 L 438.65147,193.5586 C 437.56347,193.4946 437.46747,193.3026 437.46747,191.2546 L 437.46747,185.0786 C 437.46747,181.3346 435.70747,179.5106 432.12347,179.5106 C 430.93947,179.5106 430.26747,179.7346 429.59547,180.3106 L 427.16347,182.4226 L 427.16347,171.5426 L 426.87547,171.2866 C 425.46747,171.8306 424.41147,172.0866 421.88347,172.4706 L 421.88347,173.3666 M 445.92547,179.6386 L 445.63747,179.5106 C 444.00547,180.1826 442.34147,180.6306 440.64547,180.8226 L 440.64547,181.7186 L 441.82947,181.7186 C 443.10947,181.7186 443.23747,181.9426 443.23747,184.0546 L 443.23747,191.2546 C 443.23747,193.2706 443.14147,193.4946 442.05347,193.5586 L 440.58147,193.6546 L 440.58147,194.6146 C 443.78147,194.5186 443.78147,194.5186 444.58147,194.5186 C 445.38147,194.5186 445.38147,194.5186 448.58147,194.6146 L 448.58147,193.6546 L 447.10947,193.5586 C 446.02147,193.4946 445.92547,193.2706 445.92547,191.2546 L 445.92547,179.6386 M 444.45347,172.5346 C 443.49347,172.5346 442.66147,173.3666 442.66147,174.3266 C 442.66147,175.2546 443.49347,176.0866 444.42147,176.0866 C 445.34947,176.0866 446.21347,175.2546 446.21347,174.3266 C 446.21347,173.4306 445.34947,172.5346 444.45347,172.5346 M 462.15447,194.6146 C 464.10647,194.5186 464.13847,194.5186 464.68247,194.5186 C 465.13047,194.5186 465.13047,194.5186 467.33847,194.6146 L 467.33847,193.6546 L 466.02647,193.5586 C 464.93847,193.4946 464.84247,193.3026 464.84247,191.2546 L 464.84247,185.0786 C 464.84247,181.3346 463.08247,179.5106 459.49847,179.5106 C 458.31447,179.5106 457.64247,179.7346 456.97047,180.3106 L 454.53847,182.4226 L 454.53847,179.6386 L 454.25047,179.5106 C 452.61847,180.1826 450.95447,180.6306 449.25847,180.8226 L 449.25847,181.7186 L 450.44247,181.7186 C 451.72247,181.7186 451.85047,181.9426 451.85047,184.0546 L 451.85047,191.2546 C 451.85047,193.2706 451.75447,193.4946 450.66647,193.5586 L 449.22647,193.6546 L 449.22647,194.6146 C 451.40247,194.5506 452.26647,194.5186 453.19447,194.5186 C 454.12247,194.5186 454.98647,194.5506 457.16247,194.6146 L 457.16247,193.6546 L 455.72247,193.5586 C 454.63447,193.4946 454.53847,193.2706 454.53847,191.2546 L 454.53847,184.4706 C 454.53847,183.0306 456.65047,181.4626 458.60247,181.4626 C 460.74647,181.4626 462.15447,183.0626 462.15447,185.5266 L 462.15447,194.6146 M 483.82997,182.4226 L 484.62997,181.1106 L 484.50197,180.7266 L 479.95797,180.8546 C 478.77397,179.8946 477.62197,179.5106 476.05397,179.5106 C 474.64597,179.5106 473.01397,179.9586 471.70197,180.7266 C 469.90997,181.7506 468.98197,183.3186 468.98197,185.2706 C 468.98197,187.6386 470.45397,189.2706 472.82197,189.5266 L 470.29397,191.4786 C 469.97397,191.9586 469.81397,192.3746 469.81397,192.8546 C 469.81397,193.7506 470.38997,194.2626 471.92597,194.7106 L 469.14197,196.2146 C 468.69397,196.4706 468.24597,197.6546 468.24597,198.6466 C 468.24597,201.5586 471.09397,203.5746 475.15797,203.5746 C 479.98996,203.5746 483.79797,200.5346 483.79797,196.6306 C 483.79797,194.3266 482.26197,192.7266 480.02197,192.7266 L 474.90197,192.7266 C 473.23797,192.7266 472.46997,192.3426 472.46997,191.4786 C 472.46997,191.0626 472.72597,190.7106 473.55797,190.0066 C 473.74997,189.8466 473.81397,189.7826 473.94197,189.6546 C 474.26197,189.6866 474.45397,189.7186 474.70997,189.7186 C 476.08597,189.7186 477.78197,189.1106 479.09397,188.1826 C 480.53397,187.1266 481.23797,185.8466 481.23797,184.1506 C 481.23797,183.5106 481.14197,183.0946 480.88597,182.4226 L 483.82997,182.4226 M 474.90197,180.5986 C 477.07797,180.5986 478.54997,182.3906 478.54997,185.1106 C 478.54997,187.1906 477.20597,188.6306 475.25397,188.6306 C 473.10997,188.6306 471.66997,186.9666 471.66997,184.5026 C 471.66997,182.0386 472.85397,180.5986 474.90197,180.5986 M 476.40597,194.9666 C 480.02197,194.9666 481.26997,195.7026 481.26997,197.7826 C 481.26997,200.5346 478.74197,202.5826 475.38197,202.5826 C 472.59797,202.5826 470.67797,200.9506 470.67797,198.5826 C 470.67797,197.1426 471.50997,195.8306 472.78997,195.2866 C 473.30197,195.0306 474.19797,194.9666 476.40597,194.9666 M 499.38397,173.9746 C 500.50397,173.7186 501.43197,173.5906 502.51997,173.5906 C 505.97597,173.5906 507.83197,175.1906 507.83197,178.2306 C 507.83197,181.1106 505.87997,183.1266 503.09597,183.1266 C 502.42397,183.1266 501.94397,183.0626 501.11197,182.8066 L 501.43197,183.9586 C 502.19997,184.1186 502.64797,184.1506 503.28797,184.1506 C 507.67197,184.1506 511.03197,181.1746 511.03197,177.3346 C 511.03197,174.2626 508.53597,172.3746 504.47197,172.3746 C 504.31197,172.3746 503.99197,172.3746 503.57597,172.4066 C 502.39197,172.4386 499.95997,172.4706 499.03197,172.4706 C 498.32797,172.4706 498.32796,172.4706 493.20797,172.3746 L 493.20797,173.3346 L 494.64797,173.4306 C 496.08797,173.5266 496.34397,173.9426 496.34397,176.3106 L 496.34397,190.6786 C 496.34397,193.2066 496.18397,193.4626 494.71197,193.5586 L 493.17597,193.6546 L 493.17597,194.6146 C 495.06397,194.5506 496.18397,194.5186 497.84797,194.5186 C 499.51197,194.5186 500.66397,194.5506 502.55197,194.6146 L 502.55197,193.6546 L 501.01597,193.5586 C 499.54397,193.4626 499.38397,193.2066 499.38397,190.6786 L 499.38397,173.9746 M 512.14547,173.3666 L 513.93747,173.3666 C 514.51347,173.3666 514.73747,173.7186 514.73747,174.6786 L 514.73747,191.2546 C 514.73747,193.2706 514.64147,193.4946 513.55347,193.5586 L 512.08147,193.6546 L 512.08147,194.6146 C 515.28147,194.5186 515.28147,194.5186 516.08147,194.5186 C 516.88147,194.5186 516.88147,194.5186 520.08147,194.6146 L 520.08147,193.6546 L 518.60947,193.5586 C 517.52147,193.4946 517.42547,193.2706 517.42547,191.2546 L 517.42547,171.5426 L 517.13747,171.2866 C 515.72947,171.8306 514.67347,172.0866 512.14547,172.4706 L 512.14547,173.3666 M 530.90247,191.8946 L 530.74247,194.6146 C 532.82247,194.5186 532.82247,194.5186 533.23847,194.5186 C 533.39847,194.5186 534.19847,194.5506 535.60647,194.6146 L 535.60647,193.6546 L 534.35847,193.5906 C 533.59047,193.5586 533.46247,193.3026 533.46247,191.7346 L 533.46247,185.8786 C 533.46247,181.20661 532.11847,179.5106 528.40647,179.5106 C 527.03047,179.5106 525.75047,179.8626 524.53447,180.5986 L 522.83847,181.6226 L 522.83847,183.7026 L 523.67047,183.9266 L 524.08647,182.9346 C 524.75847,181.4306 525.07847,181.2066 526.55047,181.2066 C 529.55847,181.2066 530.80647,182.3906 530.90247,185.3026 L 527.73447,185.8786 C 523.38247,186.6786 521.55847,188.1826 521.55847,190.9666 C 521.55847,193.4626 523.06247,194.9026 525.59047,194.9026 C 526.16647,194.9026 526.71047,194.8066 526.93447,194.6466 L 530.90247,191.8946 M 530.90247,190.5506 C 529.97447,191.8626 527.95847,193.0786 526.71047,193.0786 C 525.43047,193.0786 524.31047,191.8946 524.31047,190.5186 C 524.31047,189.3346 524.95047,188.2146 525.91047,187.6066 C 526.71047,187.1266 528.47047,186.6786 530.90247,186.3266 L 530.90247,190.5506 M 539.35797,182.2946 L 539.35797,191.5106 C 539.35797,193.8786 540.41397,194.9026 542.87797,194.9026 C 543.61397,194.9026 544.38197,194.7426 544.57397,194.5186 L 546.10997,192.8226 L 545.69397,192.2786 C 544.89397,192.7266 544.41397,192.8866 543.80597,192.8866 C 542.55797,192.8866 542.04597,192.2466 542.04597,190.6786 L 542.04597,182.2946 L 546.14197,182.2946 L 546.42997,180.5666 L 542.04597,180.7586 L 542.04597,179.5426 C 542.04597,178.1986 542.14197,177.0466 542.39797,174.9986 L 542.01397,174.6466 C 541.24597,175.1266 540.28597,175.5426 539.29397,175.8626 C 539.38997,176.8226 539.42197,177.4306 539.42197,178.3906 L 539.42197,180.6306 L 536.92597,181.7506 L 536.92597,182.4226 L 539.35797,182.2946 M 557.32147,171.5746 C 556.64947,171.3186 556.26547,171.2226 555.84947,171.2226 C 554.82547,171.2226 553.70547,171.7666 553.00147,172.5666 L 551.14547,174.6786 C 550.21747,175.7346 549.80147,177.1746 549.80147,179.2866 L 549.80147,180.6306 L 547.59347,181.6226 L 547.59347,182.3266 L 549.80147,182.1986 L 549.80147,191.2546 C 549.80147,193.2706 549.70547,193.4946 548.61747,193.5586 L 547.14547,193.6546 L 547.14547,194.6146 C 550.34547,194.5186 550.34547,194.5186 551.14547,194.5186 C 551.94547,194.5186 551.94547,194.5186 555.14547,194.6146 L 555.14547,193.6546 L 553.67347,193.5586 C 552.58547,193.4946 552.48947,193.2706 552.48947,191.2546 L 552.48947,182.1986 L 556.45747,182.1986 L 556.68147,180.5026 L 552.48947,180.6306 L 552.48947,177.9106 C 552.48947,174.2306 552.90547,173.3346 554.72947,173.3346 C 555.59347,173.3346 556.16947,173.5586 556.93747,174.2306 L 557.32147,174.0386 L 557.32147,171.5746 M 565.83747,179.5106 C 561.16547,179.5106 557.93347,182.80661 557.93347,187.5746 C 557.93347,192.0866 560.78147,195.1586 564.90947,195.1586 C 569.83746,195.1586 573.35747,191.7346 573.35747,186.9346 C 573.35747,182.6146 570.22147,179.5106 565.83747,179.5106 M 565.26147,180.5666 C 568.20547,180.5666 570.38147,183.7666 570.38147,188.1186 C 570.38147,191.7986 568.74947,194.1026 566.15747,194.1026 C 563.02147,194.1026 560.90947,191.0306 560.90947,186.4866 C 560.90947,182.6466 562.44547,180.5666 565.26147,180.5666 M 574.77047,181.7186 L 575.95447,181.7186 C 577.23447,181.7186 577.36247,181.9426 577.36247,184.0546 L 577.36247,191.2546 C 577.36247,193.2706 577.26647,193.4946 576.17847,193.5586 L 574.70647,193.6546 L 574.70647,194.6146 C 577.01047,194.5506 577.84247,194.5186 578.64247,194.5186 C 579.28247,194.5186 579.28247,194.5186 583.21847,194.6146 L 583.21847,193.6546 L 581.55447,193.5586 C 580.11447,193.4626 580.05047,193.3666 580.05047,191.2546 L 580.05047,185.7506 C 580.05047,183.8306 581.33047,182.2306 582.89847,182.2306 C 583.85847,182.2306 584.53047,182.6786 585.04247,183.7026 L 585.71447,183.7026 L 586.00247,179.8626 C 585.65047,179.6386 585.07447,179.5106 584.49847,179.5106 C 583.53847,179.5106 582.51447,180.0226 581.84247,180.8226 L 580.05047,182.9346 L 580.05047,179.6386 L 579.76247,179.5106 C 578.13047,180.1826 576.46647,180.6306 574.77047,180.8226 L 574.77047,181.7186 M 587.04797,181.7186 L 588.23197,181.7186 C 589.51197,181.7186 589.63997,181.9426 589.63997,184.0546 L 589.63997,191.2546 C 589.63997,193.2706 589.54397,193.4946 588.45597,193.5586 L 586.98397,193.6546 L 586.98397,194.6146 C 590.05597,194.5186 590.15197,194.5186 591.04797,194.5186 C 591.94397,194.5186 592.77597,194.5506 594.85597,194.6146 L 594.85597,193.6546 L 593.51197,193.5586 C 592.42397,193.4946 592.32797,193.2706 592.32797,191.2546 L 592.32797,184.4706 C 592.32797,183.0306 594.43997,181.4626 596.35997,181.4626 C 598.08797,181.4626 599.27197,183.0946 599.27197,185.5266 L 599.27197,191.2546 C 599.27197,193.2706 599.17597,193.4946 598.08797,193.5586 L 596.61597,193.6546 L 596.61597,194.6146 C 599.81597,194.5186 599.81597,194.5186 600.61597,194.5186 C 601.41597,194.5186 601.41597,194.5186 604.61597,194.6146 L 604.61597,193.6546 L 603.14397,193.5586 C 602.05597,193.4946 601.95997,193.2706 601.95997,191.2546 L 601.95997,184.4706 C 601.95997,183.0306 604.07197,181.4626 605.99197,181.4626 C 607.71997,181.4626 608.90397,183.0946 608.90397,185.5266 L 608.90397,194.6146 C 610.85597,194.5186 610.88797,194.5186 611.43197,194.5186 C 611.84797,194.5186 611.84797,194.5186 614.27997,194.6146 L 614.27997,193.6546 L 612.77597,193.5586 C 611.68797,193.4946 611.59197,193.2706 611.59197,191.2546 L 611.59197,184.6626 C 611.59197,181.4946 609.73597,179.5106 606.79197,179.5106 C 605.67197,179.5106 604.74397,179.7986 604.16797,180.3106 L 601.73597,182.4866 C 600.71197,180.3746 599.39997,179.5106 597.19197,179.5106 C 596.00797,179.5106 595.11197,179.7986 594.53597,180.3106 L 592.32797,182.3586 L 592.32797,179.6386 L 592.03997,179.5106 C 590.40797,180.1826 588.74397,180.6306 587.04797,180.8226 L 587.04797,181.7186"
+       id="text1880" />
+    <text
+       xml:space="preserve"
+       style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="200.71429"
+       y="185.71429"
+       id="text6342"
+       transform="translate(22.69223,16.51978)"><tspan
+         sodipodi:role="line"
+         id="tspan6344"
+         x="200.71429"
+         y="185.71429"></tspan></text>
+       id="path3420"
+       d="M 124.08163,37.364042 C 90.427777,36.9851 57.670478,57.262018 42.761403,87.405099 C 28.300438,115.47558 29.66262,150.98067 46.684864,177.64797 C 62.94738,204.28174 93.585734,221.38381 124.8401,220.7847 C 156.31704,220.8521 186.88112,203.00701 202.60145,175.78884 C 218.95177,148.77122 219.53584,113.31164 204.46168,85.618036 C 189.1384,56.385175 157.11789,37.036465 124.08163,37.364042 z M 124.08163,40.765802 C 156.81633,40.384755 188.66471,60.317367 202.81884,89.815061 C 216.71264,117.5499 214.63907,152.53681 197.09483,178.1979 C 180.74954,203.18123 151.0127,218.65223 121.14473,217.32864 C 90.427104,216.62608 61.067737,198.22367 46.784254,171.06333 C 31.746618,143.85025 32.909199,108.7856 49.414832,82.48609 C 64.952578,56.930362 94.135615,40.486862 124.08163,40.765802 z"
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:10.91891861;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
   </g>
 </svg>

scripts/_init_zine.py

-                      r453
+                      r465
 # -*- coding: utf-8 -*-
 """
     _init_textpress
     ~~~~~~~~~~~~~~~
+    _init_zine
+    ~~~~~~~~~~
     Helper to locate textpress and the instance folder.
+    Helper to locate zine and the instance folder.
     :copyright: 2008 by Armin Ronacher.
 …
 # make sure we load the correct textpress
+# make sure we load the correct zine
 sys.path.insert(0, abspath(join(dirname(__file__), pardir)))
 def find_instance():
     """Find the TextPress instance."""
+    """Find the Zine instance."""
     instance = None
     if isfile(join('instance', 'textpress.ini')):
+    if isfile(join('instance', 'zine.ini')):
         instance = abspath('instance')
     else:
 …
         while old_path != path:
             path = abspath(join(path, pardir))
             if isfile(join(path, 'textpress.ini')):
+            if isfile(join(path, 'zine.ini')):
                 instance = path
                 break

scripts/add-translation

-                      r444
+                      r465
     ~~~~~~~~~~~~~~~~~~~
     This script adds a new translation to TextPress or a TextPress plugin.
+    This script adds a new translation to Zine or a Zine plugin.
     :copyright: 2008 by Armin Ronacher.
 …
 textpress = realpath(join(pardir, 'textpress'))
+zine = realpath(join(pardir, 'zine'))
 …
 def create_application_lang(locale):
     catalog = create_from_pot(locale, join(textpress, 'i18n', 'messages.pot'))
     write_catalog(catalog, join(textpress, 'i18n'))
+    catalog = create_from_pot(locale, join(zine, 'i18n', 'messages.pot'))
+    write_catalog(catalog, join(zine, 'i18n'))
     print 'Created catalog for %s' % locale
 …
     # incorporate existing translations from the application
     path = join(textpress, 'i18n', str(locale), 'LC_MESSAGES', 'messages.po')
+    path = join(zine, 'i18n', str(locale), 'LC_MESSAGES', 'messages.po')
     if isfile(path):
         f = file(path)

scripts/build-documentation

-                      r452
+                      r465
     ~~~~~~~~~~~~~~~~~~~~~~~
     This command builds the documentation for TextPress or a plugin.
+    This command builds the documentation for Zine or a plugin.
     :copyright: 2008 by Armin Ronacher.
 …
 sys.path.append(dirname(__file__))
 import _init_textpress
 from textpress.docs.builder import walk
+import _init_zine
+from zine.docs.builder import walk
 …
     options, args = parser.parse_args()
     if not args:
         path = join(dirname(__file__), pardir, 'textpress', 'docs')
+        path = join(dirname(__file__), pardir, 'zine', 'docs')
     elif len(args) == 1:
         path = join(args[0], 'docs')

scripts/build-event-map

-                      r463
+                      r465
     ~~~~~~~~~~~~~~~~~~~
     Lists all the events send in a given TextPress installation.
+    Lists all the events send in a given Zine installation.
     :copyright: 2008 by Armin Ronacher.
 …
 sys.path.append(os.path.dirname(__file__))
 from _init_textpress import find_instance
 import textpress
+from _init_zine import find_instance
+import zine
 …
 def build_eventmap(instance_folder):
     app = textpress.make_textpress(instance_folder)
     textpress_root = os.path.realpath(os.path.dirname(textpress.__file__))
     searchpath = [(textpress_root, '__builtin__')]
+    app = zine.make_zine(instance_folder)
+    zine_root = os.path.realpath(os.path.dirname(zine.__file__))
+    searchpath = [(zine_root, '__builtin__')]
     for plugin in app.plugins.itervalues():
         path = os.path.realpath(plugin.path)
         if os.path.commonprefix([textpress_root, path]) != textpress_root:
+        if os.path.commonprefix([zine_root, path]) != zine_root:
             searchpath.append((plugin.path, plugin.name))
 …
     parser = OptionParser(usage='%prog')
     parser.add_option('--instance', '-I', dest='instance',
                       help='Use the path provided as TextPress instance.')
+                      help='Use the path provided as Zine instance.')
     options, args = parser.parse_args()
     if args:

scripts/bundle-plugin

-                      r450
+                      r465
     This script creates a .plugin file from a plugin installed in
     the given TextPress instance (which usually is a development
     instance of TextPress).
+    the given Zine instance (which usually is a development
+    instance of Zine).
     The file created can be used to distribute the plugin.
 …
 sys.path.append(dirname(__file__))
 from _init_textpress import find_instance
+from _init_zine import find_instance
 …
     parser = OptionParser(usage='%prog [options] plugin [output-file]')
     parser.add_option('--instance', '-I', dest='instance',
                       help='Use the path provided as TextPress instance.')
+                      help='Use the path provided as Zine instance.')
     options, args = parser.parse_args()
     if len(args) not in (1, 2):
 …
         parser.error('instance not found.  Specify path to instance')
     from textpress import make_textpress
     plugin = make_textpress(instance, True).plugins[args[0]]
+    from zine import make_zine
+    plugin = make_zine(instance, True).plugins[args[0]]
     if plugin is None:
         parser.error('Plugin not found')

scripts/compile-translations

r461	r465
26	26	print 'Compiling builtin languages'
27	27	root = path.abspath(path.join(path.dirname(__file__),
28		path.pardir, '~~textpress~~', 'i18n'))
	28	path.pardir, 'zine', 'i18n'))
29	29	elif len(args) == 1:
30	30	root = path.join(path.abspath(args[0]), 'i18n')

scripts/extract-messages

-                      r451
+                      r465
     'lazy_ngettext': (1, 2)
+}
 BUGS_ADDRESS = 'textpress-i18n@pocoo.org'
+BUGS_ADDRESS = 'zine-i18n@pocoo.org'
 COPYRIGHT = 'The Pocoo Team'
 METHODS = [
 …
         print 'Extracting core strings'
         root = path.abspath(path.join(path.dirname(__file__),
                                       path.pardir, 'textpress'))
+                                      path.pardir, 'zine'))
     elif len(args) == 1:
         root = path.join(path.abspath(args[0]))

scripts/install-posix

-                      r451
+                      r465
 #!/bin/bash
 # This script copies textpress into PREFIX and compiles the python
+# This script copies zine into PREFIX and compiles the python
 # files with PYTHON.  If PREFIX is not defined /usr is assumed.
 SRC="`dirname $0`/../textpress"
+SRC="`dirname $0`/../zine"
 PACKAGES="_dynamic _ext importers parsers utils views websetup i18n"
 …
 # make sure the target folders exist
 mkdir -p $PREFIX/lib/textpress/textpress
 mkdir -p $PREFIX/share/textpress
+mkdir -p $PREFIX/lib/zine/zine
+mkdir -p $PREFIX/share/zine
 # the packages to copy
 cp $SRC/*.py $PREFIX/lib/textpress/textpress
+cp $SRC/*.py $PREFIX/lib/zine/zine
 for package in $PACKAGES; do
   mkdir -p $PREFIX/lib/textpress/textpress/$package
   cp -R $SRC/$package $PREFIX/lib/textpress/textpress/
+  mkdir -p $PREFIX/lib/zine/zine/$package
+  cp -R $SRC/$package $PREFIX/lib/zine/zine/
 done
 # all the plugins
 cp -R $SRC/{experimental_,}plugins $PREFIX/lib/textpress
+cp -R $SRC/{experimental_,}plugins $PREFIX/lib/zine
 # compile all files
 $PYTHON -O -mcompileall -qf $PREFIX/lib/textpress/{textpress,plugins}
+$PYTHON -O -mcompileall -qf $PREFIX/lib/zine/{zine,plugins}
 # templates and shared data
 cp -R $SRC/shared $PREFIX/share/textpress/htdocs
 cp -R $SRC/templates $PREFIX/share/textpress/templates
+cp -R $SRC/shared $PREFIX/share/zine/htdocs
+cp -R $SRC/templates $PREFIX/share/zine/templates
 # copy the server files and adjust the TEXTPRESS_LIB path
 cp -R $SRC/../servers $PREFIX/share/textpress
 sed -i'' -r "s|^TEXTPRESS_LIB\s*=.*$|TEXTPRESS_LIB = '$PREFIX/lib/textpress'|g" $PREFIX/share/textpress/servers/*
+# copy the server files and adjust the ZINE_LIB path
+cp -R $SRC/../servers $PREFIX/share/zine
+sed -i'' -r "s|^ZINE_LIB\s*=.*$|ZINE_LIB = '$PREFIX/lib/zine'|g" $PREFIX/share/zine/servers/*

scripts/new-plugin

-                      r454
+                      r465
 # -*- coding: utf-8 -*-
 """
     textpress.plugins.{{ package }}
     ~~~~~~~~~~~~~~~~~~{{ '~' * package|length }}
+    zine.plugins.{{ package }}
+    ~~~~~~~~~~~~~{{ '~' * package|length }}
     Plugin implementation description goes here.
 …
 sys.path.append(os.path.dirname(__file__))
 import _init_textpress
+import _init_zine
 from textpress.utils.admin import gen_slug
 from textpress.utils.mail import split_email
+from zine.utils.admin import gen_slug
+from zine.utils.mail import split_email

scripts/reset-instance

-                      r445
+                      r465
 sys.path.append(path.dirname(__file__))
 from _init_textpress import find_instance
+from _init_zine import find_instance
 …
     parser.add_option('--password', '-p', dest='password', default='default')
     parser.add_option('--blog-url', dest='blog_url', default='http://localhost:4000/')
     parser.add_option('--database', dest='database_uri', default='sqlite:///textpress.db')
+    parser.add_option('--database', dest='database_uri', default='sqlite:///zine.db')
     parser.add_option('--language', dest='lang', default='en')
 …
     mkdir(instance)
     from textpress.application import make_textpress
     from textpress.database import users, init_database, db
     from textpress.utils.crypto import gen_pwhash, gen_secret_key
     from textpress.config import Configuration
+    from zine.application import make_zine
+    from zine.database import users, init_database, db
+    from zine.utils.crypto import gen_pwhash, gen_secret_key
+    from zine.config import Configuration
     e = db.create_engine(options.database_uri, instance)
     init_database(e)
     cfg = Configuration(path.join(instance, 'textpress.ini'))
+    cfg = Configuration(path.join(instance, 'zine.ini'))
     t = cfg.edit()
     t.update(
 …
     t.commit()
     from textpress.models import User, ROLE_ADMIN
     app = make_textpress(instance, True)
+    from zine.models import User, ROLE_ADMIN
+    app = make_zine(instance, True)
     User(options.username, options.password, 'admin@localhost', role=ROLE_ADMIN)
     db.commit()

scripts/run-tests

r446	r465
4	4	~~~~~~~~~~~
5	5
6		This is a wrapper script for running the ~~TextPress~~ unittests.
	6	This is a wrapper script for running the Zine unittests.
7	7	Run it with the --help option for usage information.
8	8

scripts/server

-                      r450
+                      r465
 # -*- coding: utf-8 -*-
 """
     Open a TextPress Server
     ~~~~~~~~~~~~~~~~~~~~~~
+    Start a Zine Server
+    ~~~~~~~~~~~~~~~~~~~
     This script opens a development server for TextPress.
+    This script opens a development server for Zine.
     :copyright: 2008 by Armin Ronacher.
 …
 sys.path.append(dirname(__file__))
 from _init_textpress import find_instance
 from textpress import make_app
+from _init_zine import find_instance
+from zine import make_app
 …
                       help='Enable the profiler')
     parser.add_option('--instance', '-I', dest='instance',
                       help='Use the path provided as TextPress instance.')
+                      help='Use the path provided as Zine instance.')
     options, args = parser.parse_args()
     if args:

scripts/shell

-                      r450
+                      r465
 # -*- coding: utf-8 -*-
 """
     Open a TextPress Shell
     ~~~~~~~~~~~~~~~~~~~~~~
+    Open a Zine Shell
+    ~~~~~~~~~~~~~~~~~
     This script opens a shell for TextPress.
+    This script opens a shell for Zine.
     :copyright: 2008 by Armin Ronacher.
 …
 sys.path.append(dirname(__file__))
 from _init_textpress import find_instance
+from _init_zine import find_instance
 def init_func(instance):
     from textpress import make_textpress
     app = make_textpress(instance, True)
     from textpress import models
     from textpress.database import db
     del make_textpress
+    from zine import make_zine
+    app = make_zine(instance, True)
+    from zine import models
+    from zine.database import db
+    del make_zine
     return locals()
 …
                       help='Do not launch ipython, even if present.')
     parser.add_option('--instance', '-I', dest='instance',
                       help='Use the path provided as TextPress instance.')
+                      help='Use the path provided as Zine instance.')
     options, args = parser.parse_args()
     if args:
 …
         parser.error('instance not found.  Specify path to instance')
     make_shell(lambda: init_func(instance), banner='TextPress Shell [%s]' %
+    make_shell(lambda: init_func(instance), banner='Zine Shell [%s]' %
                abspath(instance))(ipython=not options.no_ipython)

scripts/uninstall-posix

-                      r451
+                      r465
 #!/bin/bash
 # This script uninstalls textpress from PREFIX which defaults
+# This script uninstalls zine from PREFIX which defaults
 # to /usr.
 …
 fi
 echo "Uninstalling TextPress from $PREFIX"
 rm -rf $PREFIX/lib/textpress
 rm -rf $PREFIX/share/textpress
+echo "Uninstalling Zine from $PREFIX"
+rm -rf $PREFIX/lib/zine
+rm -rf $PREFIX/share/zine
 echo "All done."

scripts/update-translations

r451	r465
27	27	print 'Updating core strings'
28	28	root = path.abspath(path.join(path.dirname(__file__),
29		path.pardir, '~~textpress~~', 'i18n'))
	29	path.pardir, 'zine', 'i18n'))
30	30	elif len(args) == 1:
31	31	root = path.join(path.abspath(args[0]), 'i18n')

servers/README

-                      r450
+                      r465
 The following files exist currently:
 `textpress.cgi`
     This file implements can be used to use TextPress over CGI.  This
     should *NOT* be used unless you have to.  TextPress is not designed
+`zine.cgi`
+    This file implements can be used to use Zine over CGI.  This
+    should *NOT* be used unless you have to.  Zine is not designed
     for the run-once nature of CGI and will perform poorly on it.
 `textpress.fcgi`
     This file serves TextPress over FastCGI.  It requires the flup
+`zine.fcgi`
+    This file serves Zine over FastCGI.  It requires the flup
     module for Python.
 `textpress.wsgi`
     This file can be used to execute TextPress over mod_wsgi.
+`zine.wsgi`
+    This file can be used to execute Zine over mod_wsgi.
 Just take the file of choice, copy it to where you want it to be and

servers/zine.cgi

-                      r450
+                      r465
 # -*- coding: utf-8 -*-
 """
     TextPress CGI Runner
     ~~~~~~~~~~~~~~~~~~~~
+    Zine CGI Runner
+    ~~~~~~~~~~~~~~~
     Run TextPress as CGI. Requires python 2.5 or python 2.4 with
+    Run Zine as CGI. Requires python 2.5 or python 2.4 with
     the wsgiref module installed.
 …
 INSTANCE_FOLDER = '/path/to/instance/folder'
 # path to the TextPress application code.
 TEXTPRESS_LIB = '/usr/lib/textpress'
+# path to the Zine application code.
+ZINE_LIB = '/usr/lib/zine'
 # enable this to enable an internal CGI debugging feature.
 …
 import sys
 sys.path.insert(0, TEXTPRESS_LIB)
+sys.path.insert(0, ZINE_LIB)
 from textpress import make_app
+from zine import make_app
 from wsgiref.handlers import CGIHandler
 app = make_app(INSTANCE_FOLDER)

servers/zine.fcgi

-                      r450
+                      r465
 # -*- coding: utf-8 -*-
 """
     TextPress FastCGI Runner
     ~~~~~~~~~~~~~~~~~~~~~~~~
+    Zine FastCGI Runner
+    ~~~~~~~~~~~~~~~~~~~
     If FastCGI is your hosting environment this is the correct file.
 …
 INSTANCE_FOLDER = '/path/to/instance/folder'
 # path to the TextPress application code.
 TEXTPRESS_LIB = '/usr/lib/textpress'
+# path to the Zine application code.
+ZINE_LIB = '/usr/lib/zine'
 …
 # but usually you don't have to touch them
 import sys
 sys.path.insert(0, TEXTPRESS_LIB)
+sys.path.insert(0, ZINE_LIB)
 from textpress import make_app
+from zine import make_app
 from flup.server.fcgi import WSGIServer
 app = make_app(INSTANCE_FOLDER)

servers/zine.wsgi

-                      r450
+                      r465
 # -*- coding: utf-8 -*-
 """
     TextPress mod_wsgi Runner
+    Zine mod_wsgi Runner
     ~~~~~~~~~~~~~~~~~~~~~~~~~
     Run TextPress in mod_wsgi.
+    Run Zine in mod_wsgi.
     :copyright: 2008 by Armin Ronacher.
 …
 INSTANCE_FOLDER = '/path/to/instance/folder'
 # path to the TextPress application code.
 TEXTPRESS_LIB = '/usr/lib/textpress'
+# path to the Zine application code.
+ZINE_LIB = '/usr/lib/zine'
 # here you can further configure the wsgi app settings but usually you don't
 # have to touch them
 import sys
 sys.path.insert(0, TEXTPRESS_LIB)
+sys.path.insert(0, ZINE_LIB)
 from textpress import make_app
+from zine import make_app
 application = make_app(INSTANCE_FOLDER)

tests/init.py

-                      r446
+                      r465
 """
     TextPress Test Suite
     ~~~~~~~~~~~~~~~~~~~~
+    Zine Test Suite
+    ~~~~~~~~~~~~~~~
     This is the TextPress test suite. It collects all modules in the textpress
+    This is the Zine test suite. It collects all modules in the zine
     package, builds a TestSuite with their doctests and executes them. It also
     collects the tests from the text files in this directory (which are too
 …
 #: the modules in this list are not tested in a full run
 untested = ['textpress.experimental_plugins.hyphenation_en',
             'textpress.experimental_plugins.hyphenation_en.hyphenate',
             'textpress.experimental_plugins.notification']
+untested = ['zine.experimental_plugins.hyphenation_en',
+            'zine.experimental_plugins.hyphenation_en.hyphenate',
+            'zine.experimental_plugins.notification']
 try:
 …
     The first argument is a list of modules to be tested. If it is empty (which
     it is by default), all sub-modules of the textpress package are tested.
+    it is by default), all sub-modules of the zine package are tested.
     If the second argument is True, this function returns two objects: a
     TestSuite instance and a list of the names of the tested modules. Otherwise
 …
     # The instance directory of this object is located in the tests directory.
+    #
     # make_textpress isn't imported at module level because this way coverage
     # can track the whole textpress imports
     from textpress.application import make_textpress
+    # make_zine isn't imported at module level because this way coverage
+    # can track the whole zine imports
+    from zine.application import make_zine
     instance_path = join(dirname(__file__), 'instance')
     app = make_textpress(instance_path, True)
+    app = make_zine(instance_path, True)
     if return_covermods:
 …
             continue
         # the fromlist must contain something, otherwise the textpress
+        # the fromlist must contain something, otherwise the zine
         # package is returned, not our module
         try:
 …
 def find_tp_modules():
     """Find all sub-modules of the textpress package."""
+    """Find all sub-modules of the zine package."""
     modules = []
     import textpress
     base = dirname(textpress.__file__)
+    import zine
+    base = dirname(zine.__file__)
     start = len(dirname(base))
     if base != 'textpress':
+    if base != 'zine':
         start += 1
 …
     usage = ('Usage: %prog [option] [modules to be tested]\n'
              'Modules names have to be given in the form utils.mail (without '
              'textpress.)\nIf no module names are given, all tests are run')
+             'zine.)\nIf no module names are given, all tests are run')
     parser = OptionParser(usage=usage)
     parser.add_option('-c', '--coverage', action='store_true', dest='coverage',
 …
     options, args = parser.parse_args(sys.argv[1:])
     modnames = ['textpress.' + modname for modname in args]
+    modnames = ['zine.' + modname for modname in args]
     if options.coverage:
         if coverage is not None:

tests/config.txt

-                      r446
+                      r465
         <Configuration ...>
         >>> app.cfg['blog_title']
         iu'My TextPress Blog'
+        iu'My Zine Blog'
 …
         >>> t['pings_enabled'] = True
         >>> t['blog_title']
         iu'My TextPress Blog'
+        iu'My Zine Blog'
         >>> t['blog_title'] = 'Another Blog Title'
         >>> t.commit()
 …
         >>> t.revert_to_default('blog_title')
         >>> t['blog_title']
         iu'My TextPress Blog'
+        iu'My Zine Blog'
         >>> t.commit()
         >>> app.cfg['blog_title']
         iu'My TextPress Blog'
+        iu'My Zine Blog'
 …
         >>> big_t = app.cfg.edit()
         >>> big_t.update({'textpress/blog_tagline': '...and the test goes on',
+        >>> big_t.update({'zine/blog_tagline': '...and the test goes on',
         ...               'language': 'de'})
         >>> big_t['blog_tagline']
         u'...and the test goes on'
         >>> app.cfg['blog_tagline']
         iu'just another TextPress blog'
+        iu'just another Zine blog'
         >>> app.cfg['language']
         u'en'
         >>> big_t.set_from_string('textpress/posts_per_page', '42')
+        >>> big_t.set_from_string('zine/posts_per_page', '42')
         >>> big_t.commit()
 …
 Was the transaction commited correctly?
         >>> app.cfg['textpress/language']
+        >>> app.cfg['zine/language']
         u'de'
         >>> app.cfg['blog_tagline']
 …
 __contains__
         >>> 'textpress/blog_title' in app.cfg
+        >>> 'zine/blog_title' in app.cfg
         True
         >>> 'foobar' in app.cfg
 …
         >>> reset = app.cfg.edit()
         >>> reset.revert_to_default('textpress/blog_tagline')
+        >>> reset.revert_to_default('zine/blog_tagline')
         >>> reset.revert_to_default('posts_per_page')
         >>> reset.revert_to_default('language')

tests/instance/zine.ini

-                      r448
+                      r465
 # TextPress configuration file
 # This file is also updated by the TextPress admin interface which will strip
+# Zine configuration file
+# This file is also updated by the Zine admin interface which will strip
 # all comments due to a limitation in the current implementation.  If you
 # want to maintain the file with your text editor be warned that comments
 # may disappear.  The charset of this file must be utf-8!
 [textpress]
+[zine]
 blog_url = http://localhost:4000
 database_uri = sqlite:///database.db

zine/init.py

-                      r357
+                      r465
 # -*- coding: utf-8 -*-
 """
     textpress
     ~~~~~~~~~
+    zine
+    ~~~~
     TextPress is a simple python weblog software.
+    Zine is a simple python weblog software.
 …
     ======================
     To get the WSGI application for TextPress you can use the `make_app`
+    To get the WSGI application for Zine you can use the `make_app`
     function.  This function can either create a dispatcher for one instance
     or for multiple application instances where the current active instance
 …
     hosting via mod_wsgi or similar interfaces.
     Here a small example `textpress.wsgi` for mod_wsgi::
+    Here a small example `zine.wsgi` for mod_wsgi::
         from textpress import make_app
+        from zine import make_app
         application = make_app('/path/to/instance')
 …
     an instance path::
         from textpress import make_app
+        from zine import make_app
         application = make_app('/path/to/instance')
     In that case it will create a new independent WSGI application when
     requested.  The path to the instance of the TextPress installation for a
     given request must be in the `textpress.instance` key of the WSGI
+    requested.  The path to the instance of the Zine installation for a
+    given request must be in the `zine.instance` key of the WSGI
     environ.  Here an example mod_wsgi configuration for dynamic dispatching::
 …
         RewriteEngine On
         RewriteCond %{REQUEST_URI} ^/([^/]+)
         RewriteRule . - [E=textpress.instance:/var/textpress/%1]
         WSGIScriptAliasMatch ^/([^/]+) /var/textpress.wsgi
+        RewriteRule . - [E=zine.instance:/var/zine/%1]
+        WSGIScriptAliasMatch ^/([^/]+) /var/zine.wsgi
     You can create WSGI applications for not yet existing instances too, in
     that case TextPress will display the web setup.
+    that case Zine will display the web setup.
     Getting the TextPress Application
+    Getting the Zine Application
     =================================
     The object returned by `make_app` is a wrapper around the central
     `TextPress` application.  If you want access to this object you can use
     the `make_textpress` function and pass it the path to the instance you
+    `Zine` application.  If you want access to this object you can use
+    the `make_zine` function and pass it the path to the instance you
     want control over.  If that instance does not exist it will raise an
     exception however.
 …
 """
 __version__ = '0.1 alpha'
 __url__ = 'http://textpress.pocoo.org/'
+__url__ = 'http://zine.pocoo.org/'
 # init the import system by importing it.  at the end of the module
 # the import system is hooked into the python import system
 import textpress.pluginsystem
+import zine.pluginsystem
 from textpress.application import make_app, make_textpress
+from zine.application import make_app, make_zine

zine/_dynamic/init.py

-                      r48
+                      r465
 # -*- coding: utf-8 -*-
 """
     textpress._dynamic
+    zine._dynamic
     ~~~~~~~~~~~~~~~~~~
 …
     The module is nonpublic but all the important constants are imported
     into the "textpress.utils" module.
+    into the "zine.utils" module.
     :copyright: 2007 by Armin Ronacher.

zine/_dynamic/_helper.py

r11	r465
1	1	# -- coding: utf-8 --
2	2	"""
3		~~textpress~~._dynamic._helper
	3	zine._dynamic._helper
4	4	~~~~~~~~~~~~~~~~~~~~~~~~~~
5	5

zine/_ext/init.py

-                      r37
+                      r465
 # -*- coding: utf-8 -*-
 """
     textpress._ext
     ~~~~~~~~~~~~~~
+    zine._ext
+    ~~~~~~~~~
     This module contains external dependencies that are not installable via

zine/api.py

-                      r441
+                      r465
 # -*- coding: utf-8 -*-
 """
     textpress.api
     ~~~~~~~~~~~~~
+    zine.api
+    ~~~~~~~~
     Module for plugins and core. Star import this to get
 …
 """
 from textpress.application import (
+from zine.application import (
     # Event handling
     emit_event, iter_listeners,
 …
 # Database
 from textpress.database import db
+from zine.database import db
 # Cache
 from textpress import cache
+from zine import cache
 # Gettext
 from textpress.i18n import gettext, ngettext, lazy_gettext, lazy_ngettext, _
+from zine.i18n import gettext, ngettext, lazy_gettext, lazy_ngettext, _
 # Plugin syste
 from textpress.pluginsystem import SetupError
+from zine.pluginsystem import SetupError

zine/application.py

-                      r464
+                      r465
 # -*- coding: utf-8 -*-
 """
     textpress.application
     ~~~~~~~~~~~~~~~~~~~~~
     This module implements the central application object :class:`TextPress`
+    zine.application
+    ~~~~~~~~~~~~~~~~
+    This module implements the central application object :class:`Zine`
     and a couple of helper functions and classes.
 …
 from werkzeug.contrib.securecookie import SecureCookie
 from textpress.environment import SHARED_DATA, BUILTIN_TEMPLATE_PATH, \
+from zine.environment import SHARED_DATA, BUILTIN_TEMPLATE_PATH, \
      BUILTIN_PLUGIN_FOLDER
 from textpress.database import db, cleanup_session
 from textpress.config import Configuration
 from textpress.cache import get_cache
 from textpress.utils import ClosingIterator, local, local_manager
 from textpress.utils.validators import check_external_url
 from textpress.utils.mail import split_email
+from zine.database import db, cleanup_session
+from zine.config import Configuration
+from zine.cache import get_cache
+from zine.utils import ClosingIterator, local, local_manager
+from zine.utils.validators import check_external_url
+from zine.utils.mail import split_email
 …
         # get the session and try to get the user object for this request.
         from textpress.models import User
+        from zine.models import User
         user = None
         cookie_name = app.cfg['session_cookie_name']
 …
         a full blown user object.
         """
         from textpress.models import User
+        from zine.models import User
         if isinstance(user, (int, long)):
             user = User.objects.get(user)
 …
     def logout(self):
         """Log the current user out."""
         from textpress.models import User
+        from zine.models import User
         user = self.user
         self.user = User.objects.get_nobody()
 …
 class TextPress(object):
+class Zine(object):
     """The central application object.
     Even though the :class:`TextPress` class is a regular Python class, you
+    Even though the :class:`Zine` class is a regular Python class, you
     can't create instances by using the regular constructor.  The only
     documented way to create this class is the :func:`make_textpress`
+    documented way to create this class is the :func:`make_zine`
     function or by using one of the dispatchers created by :func:`make_app`.
     """
 …
     def __init__(self, instance_folder):
         # this check ensures that only make_app can create TextPress instances
+        # this check ensures that only make_app can create Zine instances
         if get_application() is not self:
             raise TypeError('cannot create %r instances. use the '
                             'make_textpress factory function.' %
+                            'make_zine factory function.' %
                             self.__class__.__name__)
         self.instance_folder = instance_folder
 …
         # and instanciate the configuration. this won't fail,
         # even if the database is not connected.
         self.cfg = Configuration(path.join(instance_folder, 'textpress.ini'))
+        self.cfg = Configuration(path.join(instance_folder, 'zine.ini'))
         if not self.cfg.exists:
             raise InstanceNotInitialized()
 …
         # setup core package urls and shared stuff
         import textpress
         from textpress.urls import make_urls, absolute_url_handlers
         from textpress.views import all_views
         from textpress.services import all_services
         from textpress.parsers import all_parsers
         from textpress import i18n
+        import zine
+        from zine.urls import make_urls, absolute_url_handlers
+        from zine.views import all_views
+        from zine.services import all_services
+        from zine.parsers import all_parsers
+        from zine import i18n
         self.views = all_views.copy()
         self.parsers = all_parsers.copy()
 …
         # register the pingback API.
         from textpress import pingback
+        from zine import pingback
         self.add_api('pingback', True, pingback.service)
         self.pingback_endpoints = pingback.endpoints.copy()
         # register our builtin importers
         from textpress.importers import all_importers
+        from zine.importers import all_importers
         for importer in all_importers:
             self.add_importer(importer)
         # insert list of widgets
         from textpress.widgets import all_widgets
+        from zine.widgets import all_widgets
         self.widgets = dict((x.NAME, x) for x in all_widgets)
         # load plugins
         from textpress.pluginsystem import find_plugins, \
+        from zine.pluginsystem import find_plugins, \
              register_application
         self.plugin_folder = path.join(instance_folder, 'plugins')
 …
         # init the template system with the core stuff
         from textpress import htmlhelpers, models
+        from zine import htmlhelpers, models
         env = Environment(loader=ThemeLoader(self),
                           extensions=['jinja2.ext.i18n'])
 …
             render_widgets=lambda: render_template('_widgets.html'),
             get_page_metadata=self.get_page_metadata,
             textpress={
                 'version':      textpress.__version__,
+            zine={
+                'version':      zine.__version__,
                 'copyright':    _('Copyright %(years)s by the Pocoo Team')
                                 % {'years': '2007-2008'}
 …
         Multiple calls to :meth:`close` are safe and won't cause errors.
         """
         from textpress.pluginsystem import unregister_application
+        from zine.pluginsystem import unregister_application
         unregister_application(self)
         local.application = None
 …
     def add_importer(self, importer):
         """Register an importer.  For more informations about importers
         see the :mod:`textpress.importers`.
+        see the :mod:`zine.importers`.
         """
         importer = importer(self)
 …
         creates an url rule for <name>/shared that takes a filename
         parameter.  A shared export is some sort of static data from a
         plugin.  Per default TextPress will shared the data on it's own but
+        plugin.  Per default Zine will shared the data on it's own but
         in the future it would be possible to generate an Apache/nginx
         config on the fly for the static data.
 …
         variable should be named ``<plugin_name>/<variable_name>``.  The
         `variable_name` itself must not contain another slash.  Variables
         that are not prefixed are reserved for TextPress' internal usage.
+        that are not prefixed are reserved for Zine' internal usage.
         The `type` can be one of the following builtins:
 …
         `NotFound` exception or return `None`.
         This is for example used to implement the pages support in TextPress.
+        This is for example used to implement the pages support in Zine.
         """
         self._absolute_url_handlers.append(handler)
 …
     def add_parser(self, name, class_):
         """Add a new parser class.  This parser has to be a subclass of
         :class:`textpress.parsers.BaseParser`.
+        :class:`zine.parsers.BaseParser`.
         """
         self.parsers[name] = class_
 …
         called by the layout template to get the metadata for the head section.
         """
         from textpress.models import ROLE_ADMIN
         from textpress.htmlhelpers import script, meta, link
         from textpress.utils import dump_json
+        from zine.models import ROLE_ADMIN
+        from zine.htmlhelpers import script, meta, link
+        from zine.utils import dump_json
         generators = {'script': script, 'meta': meta, 'link': link,
                       'snippet': lambda html: html}
         result = [
             meta(name='generator', content='TextPress'),
+            meta(name='generator', content='Zine'),
             link('EditURI', url_for('blog/service_rsd'),
                  type='application/rsd+xml', title='RSD'),
             script(url_for('core/shared', filename='js/jQuery.js')),
             script(url_for('core/shared', filename='js/TextPress.js')),
+            script(url_for('core/shared', filename='js/Zine.js')),
             script(url_for('blog/serve_translations'))
+        ]
 …
         base_url = self.cfg['blog_url'].rstrip('/')
         request = get_request()
         javascript = ['TextPress.BLOG_URL = %s' % dump_json(base_url)]
+        javascript = ['Zine.BLOG_URL = %s' % dump_json(base_url)]
         if request is None or request.user.role >= ROLE_ADMIN:
             javascript.append('TextPress.ADMIN_URL = %s' %
+            javascript.append('Zine.ADMIN_URL = %s' %
                               dump_json(base_url + self.cfg['admin_url_prefix']))
         result.append(u'<script type="text/javascript">%s;</script>' %
 …
            request.path != admin_prefix and not \
            request.path.startswith(admin_prefix + '/'):
             from textpress.models import ROLE_ADMIN
+            from zine.models import ROLE_ADMIN
             if request.user.role < ROLE_ADMIN:
                 response = render_response('maintenance.html')
 …
     def __repr__(self):
         return '<TextPress %r [%s]>' % (
+        return '<Zine %r [%s]>' % (
             self.instance_folder,
             self.iid
 …
 class StaticDispatcher(object):
     """Dispatches to textpress or the websetup and handles reloads.  Instances
+    """Dispatches to zine or the websetup and handles reloads.  Instances
     of this class are created by :func:`make_app` when passed the path to an
     instance folder.
 …
             # websetup in.
             try:
                 self.application = make_textpress(self.instance_folder)
+                self.application = make_zine(self.instance_folder)
             except InstanceNotInitialized:
                 from textpress.websetup import WebSetup
+                from zine.websetup import WebSetup
                 return WebSetup(self.instance_folder)
         finally:
 …
     def __call__(self, environ, start_response):
         instance_folder = path.realpath(environ['textpress.instance_folder'])
+        instance_folder = path.realpath(environ['zine.instance_folder'])
         self.init_lock.acquire()
         try:
 …
 def make_app(instance_folder=None):
     """This function creates a WSGI application for TextPress.   Even though
     the central :class:`TextPress` object implements the WSGI protocol it's
+    """This function creates a WSGI application for Zine.   Even though
+    the central :class:`Zine` object implements the WSGI protocol it's
     not forwarded to the webserver directly because the it's reloaded under
     some circumstances by the :ref:`dispatchers <dispatchers>` that wrap it.
 …
     If the `instance_folder` is provided a simple dispatcher is returned that
     manages the TextPress application for this instance.  If you don't provide
+    manages the Zine application for this instance.  If you don't provide
     one the return value will be a dynamic dispatcher that can handle multiple
     TextPress instances.  The textpress instance for one request is specified
     in the WSGI environ in the ``'textpress.instance'`` key.
     If you need a :class:`TextPress` object for scripts or other situations
     you should use the :func:`make_textpress` function that returns a
     :class:`TextPress` object instead.
+    Zine instances.  The zine instance for one request is specified
+    in the WSGI environ in the ``'zine.instance'`` key.
+    If you need a :class:`Zine` object for scripts or other situations
+    you should use the :func:`make_zine` function that returns a
+    :class:`Zine` object instead.
     """
     if instance_folder is None:
 …
 def make_textpress(instance_folder, bind_to_thread=False):
+def make_zine(instance_folder, bind_to_thread=False):
     """Creates a new instance of the application.  Always use this function
     to create an application because the process of setting the application
     up requires locking which *only* happens in :func:`make_textpress`.
+    up requires locking which *only* happens in :func:`make_zine`.
     If `bind_to_thread` is `True` the application will be set for this thread.
 …
     scripting / testing or if you know what you're doing.
     The :class:`TextPress` object alone does not handle any reloading or
+    The :class:`Zine` object alone does not handle any reloading or
     instance setup.
     """
 …
         # make sure this thread has access to the variable so just set
         # up a partial class and call __init__ later.
         local.application = app = object.__new__(TextPress)
+        local.application = app = object.__new__(Zine)
         # attach the iid
 …
         app.__init__(instance_folder)
     finally:
         # if there was no error when setting up the TextPress instance
+        # if there was no error when setting up the Zine instance
         # we should now have an attribute here to delete
         app = get_application()

zine/cache.py

-                      r359
+                      r465
 # -*- coding: utf-8 -*-
 """
     textpress.cache
     ~~~~~~~~~~~~~~~
+    zine.cache
+    ~~~~~~~~~~
     This module implements the TextPress caching system.  This is essentially
+    This module implements the Zine caching system.  This is essentially
     a binding to memcached.
 …
         have_memcache = False
 from thread import allocate_lock
 from textpress.utils import local
+from zine.utils import local
 from werkzeug.contrib.cache import NullCache, SimpleCache, FileSystemCache, \
      MemcachedCache
 …
             if cache_key is None:
                 module =  cls.__module__
                 if module.startswith('textpress.'):
+                if module.startswith('zine.'):
                     module = module[10:]
                 key = 'instance/%s.%s' % (module, cls.__name__)
 …
     This method doesn't do anything if eager caching is disabled (by default).
     """
     from textpress.application import Response
+    from zine.application import Response
     if not 'method' in vary:
         vary = set(vary)

zine/config.py

-                      r446
+                      r465
 # -*- coding: utf-8 -*-
 """
     textpress.config
     ~~~~~~~~~~~~~~~~
+    zine.config
+    ~~~~~~~~~~~
     This module implements the configuration.  The configuration is a more or
 …
 from os import path
 from threading import Lock
 from textpress.i18n import lazy_gettext
 #: variables the textpress core uses
+from zine.i18n import lazy_gettext
+#: variables the zine core uses
 DEFAULT_VARS = {
     # general settings
     'database_uri':             (unicode, u''),
     'blog_title':               (unicode, lazy_gettext(u'My TextPress Blog')),
     'blog_tagline':             (unicode, lazy_gettext(u'just another TextPress blog')),
+    'blog_title':               (unicode, lazy_gettext(u'My Zine Blog')),
+    'blog_tagline':             (unicode, lazy_gettext(u'just another Zine blog')),
     'blog_url':                 (unicode, u''),
     'blog_email':               (unicode, u''),
     'timezone':                 (unicode, u'UTC'),
     'maintenance_mode':         (bool, False),
     'session_cookie_name':      (unicode, u'textpress_session'),
+    'session_cookie_name':      (unicode, u'zine_session'),
     'theme':                    (unicode, u'default'),
     'secret_key':               (unicode, u''),
 …
     # htmlprocessor module bypasses this test when falling back to
     # the default parser. If there plans to change the default parser
     # for future TextPress versions that code must be altered first.
+    # for future Zine versions that code must be altered first.
     'default_parser':           (unicode, u'default'),
     'comment_parser':           (unicode, u'comment'),
 …
     'upload_folder':            (unicode, u'uploads'),
     'upload_mimetypes':         (unicode, u'*.plugin:application/'
                                           u'x-textpress-plugin'),
+                                          u'x-zine-plugin'),
     'im_path':                  (unicode, u''),
 …
 #: header for the config file
 CONFIG_HEADER = '''\
 # TextPress configuration file
 # This file is also updated by the TextPress admin interface which will strip
+# Zine configuration file
+# This file is also updated by the Zine admin interface which will strip
 # all comments due to a limitation in the current implementation.  If you
 # want to maintain the file with your text editor be warned that comments
 …
     >>> app.cfg['blog_title']
     iu'My TextPress Blog'
+    iu'My Zine Blog'
     >>> app.cfg.change_single('blog_title', 'Test Blog')
     True
 …
         self._load_time = path.getmtime(self.filename)
         self.exists = True
         section = 'textpress'
+        section = 'zine'
         f = file(self.filename)
         try:
 …
                     key, value = line.split('=', 1)
                     key = key.strip()
                     if section != 'textpress':
+                    if section != 'zine':
                         key = section + '/' + key
                     self._values[key] = unquote_value(value.strip())
 …
     def __getitem__(self, key):
         """Return the value for a key."""
         if key.startswith('textpress/'):
             key = key[10:]
+        if key.startswith('zine/'):
+            key = key[5:]
         try:
             return self._converted_values[key]
 …
     def __contains__(self, key):
         """Check if a given key exists."""
         if key.startswith('textpress/'):
             key = key[10:]
+        if key.startswith('zine/'):
+            key = key[5:]
         return key in self.config_vars
 …
                 category, name = key.split('/', 1)
             else:
                 category = 'textpress'
+                category = 'zine'
                 name = key
             categories.setdefault(category, []).append({
 …
         def sort_func(item):
             """Sort by key, case insensitive, ignore leading underscores and
             move the implicit "textpress" to the index.
+            move the implicit "zine" to the index.
             """
             if item[0] == 'textpress':
+            if item[0] == 'zine':
                 return 1
             return item[0].lower().lstrip('_')
 …
         """Set the value for a key by a python value."""
         self._assert_uncommitted()
         if key.startswith('textpress/'):
             key = key[10:]
+        if key.startswith('zine/'):
+            key = key[5:]
         if key not in self.cfg.config_vars:
             raise KeyError(key)
 …
         """Set the value for a key from a string."""
         self._assert_uncommitted()
         if key.startswith('textpress/'):
             key = key[10:]
+        if key.startswith('zine/'):
+            key = key[5:]
         conv, default = self.cfg.config_vars[key]
         new = from_string(value, conv, default)
 …
         """Revert a key to the default value."""
         self._assert_uncommitted()
         if key.startswith('textpress'):
             key = key[10:]
+        if key.startswith('zine'):
+            key = key[5:]
         self._remove.append(key)
 …
                     section, key = key.split('/', 1)
                 else:
                     section = 'textpress'
+                    section = 'zine'
                 sections.setdefault(section, []).append((key, value))
             sections = sorted(sections.items())

zine/database.py

-                      r461
+                      r465
 # -*- coding: utf-8 -*-
 """
     textpress.database
     ~~~~~~~~~~~~~~~~~~
+    zine.database
+    ~~~~~~~~~~~~~
     This module is a rather complex layer on top of SQLAlchemy 0.4.
     Basically you will never use the `textpress.database` module except you
+    Basically you will never use the `zine.database` module except you
     are a core developer, but always the high level
     :mod:`~textpress.database.db` module which you can import from the
     :mod:`textpress.api` module.
+    :mod:`~zine.database.db` module which you can import from the
+    :mod:`zine.api` module.
 …
 from sqlalchemy.engine.url import make_url
 from textpress.utils import local, local_manager
+from zine.utils import local, local_manager
 …
     application).  If no application is enabled this has an undefined behavior.
     If you are not sure if the application is bound to the active thread, use
     :func:`~textpress.application.get_application` and check it for `None`.
+    :func:`~zine.application.get_application` and check it for `None`.
     The database engine is stored on the application object as `database_engine`.
     """
 …
 #: create a new module for all the database related functions and objects
 sys.modules['textpress.database.db'] = db = ModuleType('db')
+sys.modules['zine.database.db'] = db = ModuleType('db')
 public_names = set(['mapper', 'get_engine', 'session', 'DatabaseManager'])
 key = value = mod = None
 …
 def init_database(engine):
     """This is called from the websetup which explains why it takes an engine
     and not a textpress application.
+    and not a zine application.
     """
     metadata.create_all(engine)

zine/docs/init.py

-                      r452
+                      r465
 # -*- coding: utf-8 -*-
 """
     textpress.docs
+    zine.docs
     ~~~~~~~~~~~~~~
     This module implements a simple multilingual documentation system on
     top of docutils.  The `build-docs` script builds pickled files for all
     the documentation in TextPress or a plugin.
+    the documentation in Zine or a plugin.
     This is separate from the sphinx powered developer documentation.
 …
 from werkzeug import escape
 from textpress.application import Response, url_for
 from textpress.i18n import _
+from zine.application import Response, url_for
+from zine.i18n import _

zine/docs/builder.py

r452	r465
1	1	# -- coding: utf-8 --
2	2	"""
3		~~textpress~~.docs.builder
	3	zine.docs.builder
4	4	~~~~~~~~~~~~~~~~~~~~~~
5	5

zine/environment.py

-                      r451
+                      r465
 # -*- coding: utf-8 -*-
 """
     textpress.environment
     ~~~~~~~~~~~~~~~~~~~~~
+    zine.environment
+    ~~~~~~~~~~~~~~~~
     This module can figure how TextPress is installed and where it has to look
+    This module can figure how Zine is installed and where it has to look
     for shared information.  Currently it knows about two modes: development
     environment and installation on a posix system.  OS X should be special
 …
     development
         in development mode all the files are relative to the textpress
+        in development mode all the files are relative to the zine
         package::
             textpress/                      application code
+            zine/                      application code
                 plugins/                    builtin plugins
                 shared/                     core shared data
 …
         /usr in the following example::
             /usr/lib/textpress/textpress    application code
             /usr/lib/textpress/plugins      builtin plugins
             /usr/share/textpress/htdocs     core shared data
             /usr/share/textpress/templates  core templates
+            /usr/lib/zine/zine    application code
+            /usr/lib/zine/plugins      builtin plugins
+            /usr/share/zine/htdocs     core shared data
+            /usr/share/zine/templates  core templates
     windows
 …
         folder alone. % is the path to the program folder::
             %/TextPress/textpress           application code
             %/TextPress/plugins             builtin plugins
             %/TextPress/htdocs              core shared data
             %/TextPress/templates           core templates
+            %/Zine/zine           application code
+            %/Zine/plugins             builtin plugins
+            %/Zine/htdocs              core shared data
+            %/Zine/templates           core templates
     :copyright: 2008 by Armin Ronacher.
 …
 # the path to the contents of the textpress package
+# the path to the contents of the zine package
 PACKAGE_CONTENTS = realpath(dirname(__file__))
 # the path to the folder where the "textpress" package is stored in.
+# the path to the folder where the "zine" package is stored in.
 PACKAGE_LOCATION = realpath(join(PACKAGE_CONTENTS, pardir))
 …
     BUILTIN_TEMPLATE_PATH = join(PACKAGE_CONTENTS, 'templates')
 # a TextPress installation on a posix system
+# a Zine installation on a posix system
 elif PLATFORM == 'posix':
     MODE = 'posix'
     share = join(PACKAGE_LOCATION, pardir, pardir, 'share')
     BUILTIN_PLUGIN_FOLDER = realpath(join(PACKAGE_LOCATION, 'plugins'))
     BUILTIN_TEMPLATE_PATH = realpath(join(share, 'textpress', 'templates'))
     SHARED_DATA = realpath(join(share, 'textpress', 'htdocs'))
+    BUILTIN_TEMPLATE_PATH = realpath(join(share, 'zine', 'templates'))
+    SHARED_DATA = realpath(join(share, 'zine', 'htdocs'))
     del share
 # a TextPress installation on windows
+# a Zine installation on windows
 elif PLATFORM == 'nt':
     raise NotImplementedError('installation in windows not possible')
 else:
     raise EnvironmentError('Could not determine TextPress environment')
+    raise EnvironmentError('Could not determine Zine environment')

zine/fragment.py

-                      r303
+                      r465
 # -*- coding: utf-8 -*-
 """
     textpress.fragment
     ~~~~~~~~~~~~~~~~~~
+    zine.fragment
+    ~~~~~~~~~~~~~
     This module implements the fragment system used by the parsers from
     the `textpress.parsers` module.  All parsers have to return such
+    the `zine.parsers` module.  All parsers have to return such
     fragments so that the caching system can work properly, and more
     important, that plugins can modify the dom tree.  Full plugin support
 …
 from xml.sax.saxutils import quoteattr, escape
 from textpress.application import iter_listeners
+from zine.application import iter_listeners

zine/htmlhelpers.py

-                      r164
+                      r465
 # -*- coding: utf-8 -*-
 """
     textpress.htmlhelpers
     ~~~~~~~~~~~~~~~~~~~~~
+    zine.htmlhelpers
+    ~~~~~~~~~~~~~~~~
     This module povides helpers for the templates but can be useful for
     the views and modules too. In the template it's available as "h".
     :copyright: 2007 by Armin Ronacher.
+    :copyright: 2007-2008 by Armin Ronacher.
     :license: GNU GPL.
 """
 from xml.sax.saxutils import escape, quoteattr
 from textpress.fragment import SELF_CLOSING_TAGS
+from zine.fragment import SELF_CLOSING_TAGS
-jinja_allowed_attributes = __all__ = [
-    'input_field', 'checkbox', 'radio_button', 'textarea'
+]
 _binary = object()

zine/i18n/init.py

-                      r464
+                      r465
 # -*- coding: utf-8 -*-
 """
     textpress.i18n
+    zine.i18n
     ~~~~~~~~~~~~~~
     i18n tools for TextPress.  This module provides various helpers for
+    i18n tools for Zine.  This module provides various helpers for
     internationalization.  That is a translation system (with an API,
     compatible to standard gettext), timezone helpers as well as date
 …
     Translations are handled in a gettext inspired way via babel.  The
     translatable strings are stored in POT and PO files but the files
     TextPress loads afterwards are stored in pickles rather than MO files.
+    Zine loads afterwards are stored in pickles rather than MO files.
     The reason for that is that we have to put additional information into
 …
     --------------------
     The extracting of strings (either for TextPress core or plugins) is done
+    The extracting of strings (either for Zine core or plugins) is done
     with the `extract-messages` script.  If called without arguments it will
     extract the strings of the core, otherwise the strings of the plugin which
 …
 from werkzeug.exceptions import NotFound
 import textpress.application
 from textpress.environment import LOCALE_PATH
+import zine.application
+from zine.environment import LOCALE_PATH
 …
     a `UnknownLocaleError` is raised.
     This only loads the translations for TextPress itself and not the
+    This only loads the translations for Zine itself and not the
     plugins.  Plugins themselves have an attribute translations that is
     the translations object pointing to the active translations of the
 …
 class Translations(object):
     """A gettext like API for TextPress."""
+    """A gettext like API for Zine."""
     def __init__(self, catalog=None, locale=None):
 …
 def gettext(string):
     """Translate the given string to the language of the application."""
     app = textpress.application.get_application()
+    app = zine.application.get_application()
     if app is None:
         return string
 …
     application.
     """
     app = textpress.application.get_application()
+    app = zine.application.get_application()
     if app is None:
         if n == 1:
 …
     """
     def lookup():
         app = textpress.application.get_application()
+        app = zine.application.get_application()
         lang = app and app.cfg['language'] or 'en'
         if lang in languages:
 …
     """Return a list of all languages."""
     if not self_translated:
         app = textpress.application.get_application()
+        app = zine.application.get_application()
         if app:
             locale = app.locale
 …
             return to_utc(rv)
         return rv
     cfg = textpress.application.get_application().cfg
+    cfg = zine.application.get_application().cfg
     # first of all try the following format because this is the format
 …
 def _date_format(formatter, obj, format, rebase, **extra):
     """Internal helper that formats the date."""
     app = textpress.application.get_application()
+    app = zine.application.get_application()
     if app is None:
         locale = Locale('en')
 …
     """
     if name is None:
         name = textpress.application.get_application().cfg['timezone']
+        name = zine.application.get_application().cfg['timezone']
     return timezone(name)
 …
     if code is None:
         t = request.app.translations
         code = 'TextPress.addTranslations(%s)' % simplejson.dumps(dict(
+        code = 'Zine.addTranslations(%s)' % simplejson.dumps(dict(
             messages=dict((k, t.messages[k]) for k in t.client_keys),
             plural_expr=t.plural_expr,
 …
         ))
         _js_translations[request.app] = code
     response = textpress.application.Response(code, mimetype='application/javascript')
+    response = zine.application.Response(code, mimetype='application/javascript')
     response.add_etag()
     response.make_conditional(request)

zine/i18n/de/messages.po

-                      r464
+                      r465
 "Report-Msgid-Bugs-To: armin.ronacher@active-4.com\n"
 "POT-Creation-Date: 2008-06-29 17:22+0200\n"
 "PO-Revision-Date: 2008-08-24 23:15+0200\n"
+"PO-Revision-Date: 2008-08-28 22:32+0200\n"
 "Last-Translator: Armin Ronacher <armin.ronacher@active-4.com>\n"
 "Language-Team: de <LL@li.org>\n"
 …
 "Generated-By: Babel 1.0dev-r444\n"
 #: textpress/application.py:591
+#: zine/application.py:591
 msgid "Default Theme"
 msgstr "Standard Thema"
 #: textpress/application.py:592
+#: zine/application.py:592
 msgid "Simple default theme that doesn't contain any style information."
 msgstr "Ein einfaches Standard Thema, dass keine Stilinformationen beinhaltet."
 #: textpress/application.py:649
+#: zine/application.py:649
 #, python-format
 msgid "Copyright %(years)s by the Pocoo Team"
 msgstr "Copyright %(years)s by the Pocoo Team"
 #: textpress/config.py:24
 msgid "My TextPress Blog"
 msgstr "Mein TextPress Blog"
 #: textpress/config.py:25
 msgid "just another TextPress blog"
 msgstr "einfach nur ein weiteres TextPress Blog"
 #: textpress/models.py:97 textpress/views/admin.py:1122
+#: zine/config.py:24
+msgid "My Zine Blog"
+msgstr "Mein Zine Blog"
+#: zine/config.py:25
+msgid "just another Zine blog"
+msgstr "einfach nur ein weiteres Zine Blog"
+#: zine/models.py:97 zine/views/admin.py:1124
 msgid "Administrator"
 msgstr "Administrator"
 #: textpress/models.py:99 textpress/views/admin.py:1123
+#: zine/models.py:99 zine/views/admin.py:1125
 msgid "Editor"
 msgstr "Editor"
 #: textpress/models.py:101 textpress/templates/admin/edit_comment.html:15
 #: textpress/templates/admin/edit_comment.html:28
 #: textpress/templates/admin/edit_post.html:87
 #: textpress/templates/admin/information.html:82
 #: textpress/templates/admin/inspect_import.html:61
 #: textpress/templates/admin/show_posts.html:19 textpress/views/admin.py:1124
+#: zine/models.py:101 zine/templates/admin/edit_comment.html:15
+#: zine/templates/admin/edit_comment.html:28
+#: zine/templates/admin/edit_post.html:87
+#: zine/templates/admin/information.html:82
+#: zine/templates/admin/inspect_import.html:61
+#: zine/templates/admin/show_posts.html:19 zine/views/admin.py:1126
 msgid "Author"
 msgstr "Autor"
 #: textpress/models.py:103 textpress/views/admin.py:1125
+#: zine/models.py:103 zine/views/admin.py:1127
 msgid "Subscriber"
 msgstr "Abonent"
 #: textpress/models.py:104
+#: zine/models.py:104
 msgid "Nobody"
 msgstr "Niemand"
 #: textpress/pingback.py:62
+#: zine/pingback.py:62
 msgid "source URL does not exist"
 msgstr "Quell-URL existiert nicht."
 #: textpress/pingback.py:63
+#: zine/pingback.py:63
 msgid "The source URL does not contain a link to the target URL"
 msgstr "Die Quell-URL verlint nicht auf die Ziel-URL"
 #: textpress/pingback.py:64
+#: zine/pingback.py:64
 msgid "The specified target URL does not exist"
 msgstr "Die angebenene Ziel-URL existiert nicht."
 #: textpress/pingback.py:65
+#: zine/pingback.py:65
 msgid "The specified target URL cannot be used as a target"
 msgstr "Die spezifizierte Ziel-URL kann nicht als Ziel verwendet werden."
 #: textpress/pingback.py:66
+#: zine/pingback.py:66
 msgid "The pingback has already been registered"
 msgstr "Der Pingback wurde bereits registriert"
+#: textpress/pingback.py:67 textpress/templates/403.html:2
+#: textpress/templates/403.html:4
+#: zine/pingback.py:67 zine/templates/403.html:2 zine/templates/403.html:4
 msgid "Access Denied"
 msgstr "Zugriff verweigert"
 #: textpress/pingback.py:68
+#: zine/pingback.py:68
 #, python-format
 msgid "An unknown server error (%s) occoured"
 msgstr "Ein unbekannter Fehler (%s) trat auf"
 #: textpress/widgets.py:98 textpress/templates/tag_cloud.html:2
 #: textpress/templates/tag_cloud.html:4
+#: zine/widgets.py:98 zine/templates/tag_cloud.html:2
+#: zine/templates/tag_cloud.html:4
 msgid "Tag Cloud"
 msgstr "Tag Wolke"
 #: textpress/widgets.py:109
+#: zine/widgets.py:109
 msgid "Maximum number of tags must be empty or a number."
 msgstr "Die maximale Anazhl der Markierungen muss leer oder eine Nummer sein."
 #: textpress/widgets.py:137
+#: zine/widgets.py:137
 msgid "Post Archive Summary"
 msgstr "Archiv-Zusammenfassung"
 #: textpress/widgets.py:146
+#: zine/widgets.py:146
 msgid "Detail must be years, months or days."
 msgstr "Datail muss Jahre, Monate oder Tage sein."
 #: textpress/widgets.py:151 textpress/widgets.py:189 textpress/widgets.py:227
+#: zine/widgets.py:151 zine/widgets.py:189 zine/widgets.py:227
 msgid "Limit must be omited or a valid number."
 msgstr "Beschränkung muss leergelassen werden oder eine gültige Nummer sein."
 #: textpress/widgets.py:178 textpress/templates/widgets/latest_posts.html:2
+#: zine/widgets.py:178 zine/templates/widgets/latest_posts.html:2
 msgid "Latest Posts"
 msgstr "Letzte Einträge"
 #: textpress/widgets.py:216 textpress/templates/widgets/latest_comments.html:2
+#: zine/widgets.py:216 zine/templates/widgets/latest_comments.html:2
 msgid "Latest Comments"
 msgstr "Letzte Kommentare"
 #: textpress/widgets.py:255
+#: zine/widgets.py:255
 msgid "Pages Navigation"
 msgstr "Seiten-Navigation"
 #: textpress/docs/__init__.py:67
+#: zine/docs/__init__.py:67
 msgid "no documented plugins installed."
 msgstr "Keine dokumentierten Plugins installiert."
 #: textpress/experimental_plugins/notification/__init__.py:28
+#: zine/experimental_plugins/notification/__init__.py:28
 #, python-format
 msgid "New comment on your blog to \"%(title)s\" by %(author)s"
 msgstr "Neuer Kommentar in deinem Blog zu \"%(title)s\" von %(author)s"
 #: textpress/experimental_plugins/notification/__init__.py:33
+#: zine/experimental_plugins/notification/__init__.py:33
 #, python-format
 msgid ""
 …
 "%(signature)s"
 #: textpress/experimental_plugins/notification/__init__.py:49
+#: zine/experimental_plugins/notification/__init__.py:49
 msgid "Unmoderated Comments"
 msgstr "Unmoderierte Kommentare"
 #: textpress/experimental_plugins/notification/__init__.py:50
+#: zine/experimental_plugins/notification/__init__.py:50
 #, python-format
 msgid ""
 …
 "%(signature)s"
+#: textpress/i18n/__init__.py:406 textpress/views/admin.py:332
+#: textpress/views/admin.py:382
+#: zine/i18n/__init__.py:435 zine/views/admin.py:334 zine/views/admin.py:384
 msgid "now"
 msgstr "jetzt"
 #: textpress/importers/__init__.py:110
+#: zine/importers/__init__.py:110
 msgid "set blog title from dump"
 msgstr "Blog Titel von Dump setzen"
 #: textpress/importers/__init__.py:113
+#: zine/importers/__init__.py:113
 msgid "set blog tagline from dump"
 msgstr "Blog Tagline von Dump setzen"
 #: textpress/importers/__init__.py:144 textpress/importers/__init__.py:149
+#: zine/importers/__init__.py:144 zine/importers/__init__.py:149
 msgid "done"
 msgstr "erledigt"
 #: textpress/importers/__init__.py:147
+#: zine/importers/__init__.py:147
 msgid "Committing transaction..."
 msgstr "Transaktion wird abgesendet..."
 #: textpress/importers/blogger.py:310
+#: zine/importers/blogger.py:310
 #, python-format
 msgid ""
 …
 "%(download_link)s</p>"
 #: textpress/importers/wordpress.py:157
+#: zine/importers/wordpress.py:157
 msgid "Both dump uploaded and download URL given."
 msgstr "Es wurde sowohl eine Datei hochgeladen als auch eine URL angegeben."
 #: textpress/importers/wordpress.py:162
+#: zine/importers/wordpress.py:162
 #, python-format
 msgid "Error downloading from URL: %s"
 msgstr "Fehler beim Herunterladen von URL: %s"
 #: textpress/importers/wordpress.py:172
+#: zine/importers/wordpress.py:172
 #, python-format
 msgid "Error parsing uploaded file: %s"
 msgstr "Fehler beim Analysieren der hochgeladenen Datei: %s"
 #: textpress/parsers/comments.py:54
+#: zine/parsers/comments.py:54
 msgid "Emphasized Text"
 msgstr "Hervorgehobener Text"
 #: textpress/parsers/simplehtml.py:37
+#: zine/parsers/simplehtml.py:37
 msgid "Raw HTML"
 msgstr "Rohes HTML"
 #: textpress/parsers/simplehtml.py:118
+#: zine/parsers/simplehtml.py:118
 msgid "Simplified HTML"
 msgstr "Vereinfachtes HTML"
 #: textpress/parsers/simplehtml.py:134
+#: zine/parsers/simplehtml.py:134
 msgid "Automatic Paragraphs"
 msgstr "Automatische Absätze"
 #: textpress/plugins/akismet_spam_filter/__init__.py:74
+#: zine/plugins/akismet_spam_filter/__init__.py:74
 msgid "No Akismet key provided."
 msgstr "Es wurde kein Akismet Schlüssel angegeben."
 #: textpress/plugins/akismet_spam_filter/__init__.py:81
+#: zine/plugins/akismet_spam_filter/__init__.py:81
 msgid "Could not verify key because of a server to server connection error."
 msgstr ""
 …
 "aufgebaut werden konnte."
 #: textpress/plugins/akismet_spam_filter/__init__.py:84
+#: zine/plugins/akismet_spam_filter/__init__.py:84
 msgid "The key you have entered is not valid."
 msgstr "Der angebenene Schlüssel ist nicht gültig."
 #: textpress/plugins/akismet_spam_filter/__init__.py:96
+#: zine/plugins/akismet_spam_filter/__init__.py:96
 msgid "<strong>Akismet is not active!</strong>"
 msgstr "<strong>Akisment nicht aktiv!</strong>"
 #: textpress/plugins/akismet_spam_filter/__init__.py:101
+#: zine/plugins/akismet_spam_filter/__init__.py:101
 msgid "Edit key"
 msgstr "Schlüssel bearbeiten"
 #: textpress/plugins/akismet_spam_filter/__init__.py:153
+#: zine/plugins/akismet_spam_filter/__init__.py:153
 msgid "Akismet"
 msgstr "Akismet"
 #: textpress/plugins/akismet_spam_filter/__init__.py:165
+#: zine/plugins/akismet_spam_filter/__init__.py:165
 msgid "Akismet could not be enabled."
 msgstr "Akismet konnte nicht aktiviert werden."
 #: textpress/plugins/akismet_spam_filter/__init__.py:175
+#: zine/plugins/akismet_spam_filter/__init__.py:175
 msgid "Akismet enabled successfully. The API key provided is valid"
 msgstr "Akismet wurde erfolgreich aktiveirt.  Der Schlüssel ist gültig"
 #: textpress/plugins/akismet_spam_filter/__init__.py:197
+#: zine/plugins/akismet_spam_filter/__init__.py:197
 msgid "Akismet Blocked Comments"
 msgstr "Von Akismet Geblockte Kommentare"
 #: textpress/plugins/akismet_spam_filter/templates/akismet_widget.html:4
+#: zine/plugins/akismet_spam_filter/templates/akismet_widget.html:4
 #, python-format
 msgid "Akisment blocked <b>%(spam_comments)s</b> comments."
 msgstr "Akismet blockte <b>%(spam_comments)s</b> Kommentare."
 #: textpress/plugins/akismet_spam_filter/templates/admin/akismet_spam_filter.html:2
 #: textpress/plugins/akismet_spam_filter/templates/admin/akismet_spam_filter.html:4
+#: zine/plugins/akismet_spam_filter/templates/admin/akismet_spam_filter.html:2
+#: zine/plugins/akismet_spam_filter/templates/admin/akismet_spam_filter.html:4
 msgid "Akismet Configuration"
 msgstr "Akismet Konfiguration"
 #: textpress/plugins/akismet_spam_filter/templates/admin/akismet_spam_filter.html:5
+#: zine/plugins/akismet_spam_filter/templates/admin/akismet_spam_filter.html:5
 #, python-format
 msgid ""
 …
 "  "
 #: textpress/plugins/akismet_spam_filter/templates/admin/akismet_spam_filter.html:14
+#: zine/plugins/akismet_spam_filter/templates/admin/akismet_spam_filter.html:14
 msgid "Update Key"
 msgstr "Schlüssel aktivieren"
 #: textpress/plugins/akismet_spam_filter/templates/admin/akismet_widget.html:4
 #: textpress/templates/admin/widgets/latest_comments.html:6
 #: textpress/templates/admin/widgets/latest_posts.html:6
 #: textpress/templates/admin/widgets/post_archive_summary.html:17
 #: textpress/templates/admin/widgets/tagcloud.html:6
+#: zine/plugins/akismet_spam_filter/templates/admin/akismet_widget.html:4
+#: zine/templates/admin/widgets/latest_comments.html:6
+#: zine/templates/admin/widgets/latest_posts.html:6
+#: zine/templates/admin/widgets/post_archive_summary.html:17
+#: zine/templates/admin/widgets/tagcloud.html:6
 msgid "Show Title"
 msgstr "Titel anzeigen"
+#: textpress/plugins/akismet_spam_filter/templates/admin/akismet_widget.html:6
+#: textpress/templates/admin/edit_post.html:22
+#: textpress/templates/admin/import.html:25
+#: textpress/templates/admin/inspect_import.html:60
+#: textpress/templates/admin/show_pages.html:9
+#: textpress/templates/admin/show_posts.html:18
+#: textpress/templates/admin/write_page.html:7
+#: zine/plugins/akismet_spam_filter/templates/admin/akismet_widget.html:6
+#: zine/templates/admin/edit_post.html:22 zine/templates/admin/import.html:25
+#: zine/templates/admin/inspect_import.html:60
+#: zine/templates/admin/show_pages.html:9
+#: zine/templates/admin/show_posts.html:18
+#: zine/templates/admin/write_page.html:7
 msgid "Title"
 msgstr "Titel"
 #: textpress/plugins/eric_the_fish/__init__.py:85
 #: textpress/plugins/eric_the_fish/templates/admin/eric_the_fish.html:2
 #: textpress/plugins/eric_the_fish/templates/admin/eric_the_fish.html:4
+#: zine/plugins/eric_the_fish/__init__.py:85
+#: zine/plugins/eric_the_fish/templates/admin/eric_the_fish.html:2
+#: zine/plugins/eric_the_fish/templates/admin/eric_the_fish.html:4
 msgid "Eric The Fish"
 msgstr "Erik der Fisch"
 #: textpress/plugins/eric_the_fish/__init__.py:97
+#: zine/plugins/eric_the_fish/__init__.py:97
 msgid "The skin could not be changed."
 msgstr "Das Thema konnte nicht geändert werden."
 #: textpress/plugins/eric_the_fish/templates/admin/eric_the_fish.html:5
+#: zine/plugins/eric_the_fish/templates/admin/eric_the_fish.html:5
 msgid ""
 "\n"
 …
 "  "
 #: textpress/plugins/miniblog_theme/templates/_post.html:8
 #: textpress/templates/_post.html:13
+#: zine/plugins/miniblog_theme/templates/_post.html:8
+#: zine/templates/_post.html:13
 msgid "Read on"
 msgstr "Weiterlesen"
 #: textpress/plugins/miniblog_theme/templates/_post.html:13
 #: textpress/templates/widgets/latest_comments.html:7
+#: zine/plugins/miniblog_theme/templates/_post.html:13
+#: zine/templates/widgets/latest_comments.html:7
 msgid "by"
 msgstr "von"
 #: textpress/plugins/miniblog_theme/templates/_post.html:15
 #: textpress/templates/_post.html:24
+#: zine/plugins/miniblog_theme/templates/_post.html:15
+#: zine/templates/_post.html:24
 #, python-format
 msgid "%(comments)s comment"
 …
 msgstr[1] "%(comments)s Kommentare"
+#: textpress/plugins/miniblog_theme/templates/_widgets.html:5
+#: textpress/plugins/vessel_theme/templates/_widgets.html:5
+#: textpress/templates/admin/layout.html:5
+#: textpress/templates/admin/layout.html:12
+#: textpress/templates/admin/login.html:5
+#: zine/plugins/miniblog_theme/templates/_widgets.html:5
+#: zine/plugins/vessel_theme/templates/_widgets.html:5
+#: zine/templates/admin/layout.html:5 zine/templates/admin/layout.html:12
+#: zine/templates/admin/login.html:5
 msgid "Administration"
 msgstr "Administration"
 #: textpress/plugins/miniblog_theme/templates/_widgets.html:7
 #: textpress/plugins/vessel_theme/templates/_widgets.html:7
+#: zine/plugins/miniblog_theme/templates/_widgets.html:7
+#: zine/plugins/vessel_theme/templates/_widgets.html:7
 #, python-format
 msgid "logged in as %(username)s."
 msgstr "angemeldet als %(username)s"
 #: textpress/plugins/miniblog_theme/templates/_widgets.html:8
 #: textpress/plugins/vessel_theme/templates/_widgets.html:8
+#: zine/plugins/miniblog_theme/templates/_widgets.html:8
+#: zine/plugins/vessel_theme/templates/_widgets.html:8
 msgid "go to admin panel"
 msgstr "zur Administration"
 #: textpress/plugins/miniblog_theme/templates/layout.html:26
 #: textpress/plugins/vessel_theme/templates/layout.html:30
 #: textpress/templates/layout.html:19
 #, python-format
 msgid "Proudly powered by %(textpress)s."
 msgstr "%(textpress)s unter der Haube."
 #: textpress/plugins/myrtle_theme/templates/layout.html:27
 #, python-format
 msgid "Proudly powered by %(textpress)s, %(theme)s designed by %(author)s."
 msgstr "%(textpress)s unter der Haube, %(theme)s designed von %(author)s."
 #: textpress/plugins/myrtle_theme/templates/layout.html:32
+#: zine/plugins/miniblog_theme/templates/layout.html:26
+#: zine/plugins/vessel_theme/templates/layout.html:30
+#: zine/templates/layout.html:19
+#, python-format
+msgid "Proudly powered by %(zine)s."
+msgstr "%(zine)s unter der Haube."
+#: zine/plugins/myrtle_theme/templates/layout.html:27
+#, python-format
+msgid "Proudly powered by %(zine)s, %(theme)s designed by %(author)s."
+msgstr "%(zine)s unter der Haube, %(theme)s designed von %(author)s."
+#: zine/plugins/myrtle_theme/templates/layout.html:32
 msgid "Admin Panel"
 msgstr "Administration"
 #: textpress/plugins/myrtle_theme/templates/layout.html:33
 #: textpress/templates/admin/layout.html:16
+#: zine/plugins/myrtle_theme/templates/layout.html:33
+#: zine/templates/admin/layout.html:16
 msgid "Logout"
 msgstr "Abmelden"
 #: textpress/plugins/pygments_support/__init__.py:136
+#: zine/plugins/pygments_support/__init__.py:136
 msgid "Pygments theme changed successfully."
 msgstr "Pygments Thema wurde erfolgreich geändert."
 #: textpress/plugins/pygments_support/__init__.py:138
+#: zine/plugins/pygments_support/__init__.py:138
 msgid "Pygments theme could not be changed."
 msgstr "Pygments Thema konnte nicht geändert werden."
 #: textpress/plugins/pygments_support/templates/admin/pygments_support.html:2
 #: textpress/plugins/pygments_support/templates/admin/pygments_support.html:4
+#: zine/plugins/pygments_support/templates/admin/pygments_support.html:2
+#: zine/plugins/pygments_support/templates/admin/pygments_support.html:4
 msgid "Pygments"
 msgstr "Pygments"
 #: textpress/plugins/pygments_support/templates/admin/pygments_support.html:5
+#: zine/plugins/pygments_support/templates/admin/pygments_support.html:5
 msgid ""
 "\n"
 …
 "  "
 #: textpress/plugins/pygments_support/templates/admin/pygments_support.html:12
 #: textpress/views/admin.py:119
+#: zine/plugins/pygments_support/templates/admin/pygments_support.html:12
+#: zine/views/admin.py:119
 msgid "Theme"
 msgstr "Thema"
 #: textpress/plugins/pygments_support/templates/admin/pygments_support.html:19
+#: zine/plugins/pygments_support/templates/admin/pygments_support.html:19
 msgid "Preview"
 msgstr "Vorschau"
 #: textpress/plugins/pygments_support/templates/admin/pygments_support.html:20
+#: zine/plugins/pygments_support/templates/admin/pygments_support.html:20
 msgid "Select"
 msgstr "Auswählen"
 #: textpress/plugins/typography/__init__.py:81
 #: textpress/plugins/typography/templates/admin/typography.html:2
 #: textpress/plugins/typography/templates/admin/typography.html:4
+#: zine/plugins/typography/__init__.py:81
+#: zine/plugins/typography/templates/admin/typography.html:2
+#: zine/plugins/typography/templates/admin/typography.html:4
 msgid "Typography"
 msgstr "Typographie"
 #: textpress/plugins/typography/__init__.py:101
+#: zine/plugins/typography/__init__.py:101
 msgid "Typography settings could not be changed."
 msgstr "Typographische Einstellungen wurden geändert."
 #: textpress/plugins/typography/__init__.py:103
+#: zine/plugins/typography/__init__.py:103
 msgid "Typography settings changed."
 msgstr "Typographische Einstellungen wurden geändert."
 #: textpress/plugins/typography/templates/admin/typography.html:5
+#: zine/plugins/typography/templates/admin/typography.html:5
 msgid ""
 "\n"
 …
 "  "
 #: textpress/plugins/typography/templates/admin/typography.html:12
+#: zine/plugins/typography/templates/admin/typography.html:12
 msgid "Double Quote Pairs"
 msgstr "Doppelte Anführungszeichen"
 #: textpress/plugins/typography/templates/admin/typography.html:19
+#: zine/plugins/typography/templates/admin/typography.html:19
 msgid "Single Quote Pairs"
 msgstr "Einfache Anführungszeichen"
 #: textpress/plugins/typography/templates/admin/typography.html:28
+#: zine/plugins/typography/templates/admin/typography.html:28
 msgid "Use Common Character"
 msgstr "Verwende häufige Zeichen"
+#: textpress/plugins/typography/templates/admin/typography.html:35
+#: textpress/plugins/vessel_theme/templates/admin/configure_vessel_theme.html:20
+#: textpress/plugins/xapian_search/templates/admin/configure_xapian_search.html:14
+#: textpress/templates/admin/basic_options.html:70
+#: textpress/templates/admin/cache.html:107
+#: textpress/templates/admin/configuration.html:42
+#: textpress/templates/admin/edit_comment.html:59
+#: textpress/templates/admin/edit_post.html:99
+#: textpress/templates/admin/edit_tag.html:20
+#: textpress/templates/admin/edit_user.html:66
+#: textpress/templates/admin/pages_config.html:23
+#: textpress/templates/admin/url_options.html:24
+#: textpress/templates/admin/write_page.html:51
+#: textpress/templates/admin/file_uploads/config.html:48
+#: zine/plugins/typography/templates/admin/typography.html:35
+#: zine/plugins/vessel_theme/templates/admin/configure_vessel_theme.html:20
+#: zine/plugins/xapian_search/templates/admin/configure_xapian_search.html:14
+#: zine/templates/admin/basic_options.html:70
+#: zine/templates/admin/cache.html:107
+#: zine/templates/admin/configuration.html:42
+#: zine/templates/admin/edit_comment.html:59
+#: zine/templates/admin/edit_post.html:99 zine/templates/admin/edit_tag.html:20
+#: zine/templates/admin/edit_user.html:66
+#: zine/templates/admin/pages_config.html:23
+#: zine/templates/admin/url_options.html:24
+#: zine/templates/admin/write_page.html:51
+#: zine/templates/admin/file_uploads/config.html:48
 msgid "Save"
 msgstr "Speichern"
 #: textpress/plugins/vessel_theme/__init__.py:21
+#: zine/plugins/vessel_theme/__init__.py:21
 msgid "Blue"
 msgstr "Blau"
 #: textpress/plugins/vessel_theme/__init__.py:22
+#: zine/plugins/vessel_theme/__init__.py:22
 msgid "Gray"
 msgstr "Grau"
 #: textpress/plugins/vessel_theme/__init__.py:23
+#: zine/plugins/vessel_theme/__init__.py:23
 msgid "Green"
 msgstr "Grün"
 #: textpress/plugins/vessel_theme/__init__.py:39
+#: zine/plugins/vessel_theme/__init__.py:39
 msgid "Color variation changed successfully."
 msgstr "Farbvariation wurde erfolgreich geändert."
 #: textpress/plugins/vessel_theme/templates/admin/configure_vessel_theme.html:2
 #: textpress/plugins/vessel_theme/templates/admin/configure_vessel_theme.html:4
+#: zine/plugins/vessel_theme/templates/admin/configure_vessel_theme.html:2
+#: zine/plugins/vessel_theme/templates/admin/configure_vessel_theme.html:4
 msgid "Configure Vessel Theme"
 msgstr "Vessel Thema Konfigurieren"
 #: textpress/plugins/vessel_theme/templates/admin/configure_vessel_theme.html:5
+#: zine/plugins/vessel_theme/templates/admin/configure_vessel_theme.html:5
 msgid ""
 "\n"
 …
 "  "
 #: textpress/plugins/vessel_theme/templates/admin/configure_vessel_theme.html:10
+#: zine/plugins/vessel_theme/templates/admin/configure_vessel_theme.html:10
 msgid "Color Variation"
 msgstr "Farbvariation"
+#: textpress/plugins/vessel_theme/templates/admin/configure_vessel_theme.html:21
+#: textpress/plugins/xapian_search/templates/admin/configure_xapian_search.html:15
+#: textpress/templates/admin/change_password.html:17
+#: textpress/templates/admin/edit_comment.html:61
+#: textpress/templates/admin/edit_post.html:104
+#: textpress/templates/admin/edit_tag.html:22
+#: textpress/templates/admin/edit_user.html:71
+#: textpress/templates/admin/inspect_import.html:85
+#: textpress/templates/admin/write_page.html:55
+#: zine/plugins/vessel_theme/templates/admin/configure_vessel_theme.html:21
+#: zine/plugins/xapian_search/templates/admin/configure_xapian_search.html:15
+#: zine/templates/admin/change_password.html:17
+#: zine/templates/admin/edit_comment.html:61
+#: zine/templates/admin/edit_post.html:104
+#: zine/templates/admin/edit_tag.html:22 zine/templates/admin/edit_user.html:71
+#: zine/templates/admin/inspect_import.html:85
+#: zine/templates/admin/write_page.html:55
 msgid "Cancel"
 msgstr "Abbrechen"
 #: textpress/plugins/xapian_search/__init__.py:72
+#: zine/plugins/xapian_search/__init__.py:72
 msgid "Search settings changed successfully."
 msgstr "Sucheinstellungen wurden erfolgreich geändert."
 #: textpress/plugins/xapian_search/__init__.py:93
 #: textpress/plugins/xapian_search/templates/widgets/quicksearch.html:5
+#: zine/plugins/xapian_search/__init__.py:93
+#: zine/plugins/xapian_search/templates/widgets/quicksearch.html:5
 msgid "Search"
 msgstr "Suche"
 #: textpress/plugins/xapian_search/__init__.py:112
+#: zine/plugins/xapian_search/__init__.py:112
 msgid "Search index update failed. Please check the path in the settings menu."
 msgstr ""
 …
 "die Einstellungen."
 #: textpress/plugins/xapian_search/__init__.py:134
+#: zine/plugins/xapian_search/__init__.py:134
 msgid ""
 "Invalid stemming language. Stemming is disabled. Please check your "
 …
 " die Einstellungen."
 #: textpress/plugins/xapian_search/templates/search_results.html:6
+#: zine/plugins/xapian_search/templates/search_results.html:6
 msgid "Search Results for"
 msgstr "Suchergebnisse für"
 #: textpress/plugins/xapian_search/templates/admin/configure_xapian_search.html:2
 #: textpress/plugins/xapian_search/templates/admin/configure_xapian_search.html:4
+#: zine/plugins/xapian_search/templates/admin/configure_xapian_search.html:2
+#: zine/plugins/xapian_search/templates/admin/configure_xapian_search.html:4
 msgid "Configure Xapian Search"
 msgstr "Xapian Suche Konfigurieren"
 #: textpress/plugins/xapian_search/templates/admin/configure_xapian_search.html:7
+#: zine/plugins/xapian_search/templates/admin/configure_xapian_search.html:7
 msgid "Database Path"
 msgstr "Datenbank-Pfad"
 #: textpress/plugins/xapian_search/templates/admin/configure_xapian_search.html:9
+#: zine/plugins/xapian_search/templates/admin/configure_xapian_search.html:9
 msgid "Stemming Language"
 msgstr "Stemming-Sprache"
 #: textpress/shared/js/Admin.js:49
+#: zine/shared/js/Admin.js:49
 msgid "Bookmarklet"
 msgstr "Bookmarklet"
 #: textpress/shared/js/Admin.js:51
+#: zine/shared/js/Admin.js:51
 msgid ""
 "Right click on the following link and choose \"Add to favorites\" or "
 …
 "das Erstellen von neuen Einträgen hinzuzufügen."
 #: textpress/shared/js/Admin.js:55
+#: zine/shared/js/Admin.js:55
 msgid ""
 "Next time you visit an interesting page, just select some text and click "
 …
 "erstellten Bookmark."
 #: textpress/shared/js/Admin.js:59
+#: zine/shared/js/Admin.js:59
 msgid "Blog It!"
 msgstr "Blogge Es!"
 #: textpress/shared/js/Admin.js:61
+#: zine/shared/js/Admin.js:61
 msgid ""
 "Right click on this link and choose \"Add to favorites\" or \"Bookmark "
 …
 " von neuen Einträgen hinzuzufügen."
 #: textpress/shared/js/Admin.js:79
+#: zine/shared/js/Admin.js:79
 msgid "Finishing upload, stand by...."
 msgstr "Daten wurden hochgeladen, bitte warten...."
 #: textpress/shared/js/Admin.js:87
+#: zine/shared/js/Admin.js:87
 msgid "Starting upload..."
 msgstr "Upload wird gestartet..."
 #: textpress/shared/js/TextPress.js:31
+#: zine/shared/js/TextPress.js:31
 #, python-format
 msgid "Replying to comment by %s."
 msgstr "Antworte zu Kommentar von %s."
 #: textpress/shared/js/TextPress.js:33
+#: zine/shared/js/TextPress.js:33
 msgid "(Create as top level comment)"
 msgstr "(Erstelle als top-level Kommentar)"
 #: textpress/templates/403.html:5
+#: zine/templates/403.html:5
 msgid ""
 "\n"
 …
 "  "
 #: textpress/templates/404.html:2 textpress/templates/404.html:4
+#: zine/templates/404.html:2 zine/templates/404.html:4
 msgid "Page Not Found"
 msgstr "Seite nicht gefunden"
 #: textpress/templates/404.html:5
+#: zine/templates/404.html:5
 msgid "Sorry, the page you requested does not exist."
 msgstr "Die gewünsche Seite wurde leider nicht gefunden."
 #: textpress/templates/404.html:6
+#: zine/templates/404.html:6
 msgid ""
 "You may have followed a bad link or mis-typed a URL.\n"
 …
 "    Das ist möglicherweise was passiert ist."
 #: textpress/templates/404.html:8
+#: zine/templates/404.html:8
 #, python-format
 msgid ""
 …
 "    in der <a href=\"%(index_link)s\">Übersicht</a> was du gesucht hast."
 #: textpress/templates/_comment.html:6
+#: zine/templates/_comment.html:6
 msgid "Pingback by"
 msgstr "Pingback von"
 #: textpress/templates/_comment.html:7
+#: zine/templates/_comment.html:7
 msgid "Comment by"
 msgstr "Kommentar von"
 #: textpress/templates/_comment.html:14
+#: zine/templates/_comment.html:14
 msgid "reply to this comment"
 msgstr "antworte diesem Kommentar"
 #: textpress/templates/_comment.html:28
+#: zine/templates/_comment.html:28
 msgid "Name*"
 msgstr "Name*"
 #: textpress/templates/_comment.html:30
+#: zine/templates/_comment.html:30
 msgid "Mail* (not published)"
 msgstr "E-Mail* (nicht veröffentlicht)"
+#: textpress/templates/_comment.html:32
+#: textpress/templates/admin/edit_comment.html:23
+#: textpress/templates/admin/edit_user.html:27
+#: zine/templates/_comment.html:32 zine/templates/admin/edit_comment.html:23
+#: zine/templates/admin/edit_user.html:27
 msgid "Website"
 msgstr "Webseite"
 #: textpress/templates/_comment.html:41
+#: zine/templates/_comment.html:41
 msgid "Could not Post Comment"
 msgstr "Konnte Kommentar nicht absenden"
 #: textpress/templates/_comment.html:49
+#: zine/templates/_comment.html:49
 msgid "Submit Comment"
 msgstr "Kommentar absenden"
 #: textpress/templates/_comment.html:50
+#: zine/templates/_comment.html:50
 msgid "Reset Form"
 msgstr "Formular zurücksetzen"
 #: textpress/templates/_post.html:5
+#: zine/templates/_post.html:5
 #, python-format
 msgid "written by %(author)s, on %(pub_date)s."
 msgstr "geschrieben von %(author)s am %(pub_date)s."
 #: textpress/templates/_post.html:17 textpress/templates/show_post.html:15
+#: zine/templates/_post.html:17 zine/templates/show_post.html:15
 msgid "Tagged as"
 msgstr "Markiert als"
 #: textpress/templates/_post.html:22 textpress/templates/show_post.html:20
+#: zine/templates/_post.html:22 zine/templates/show_post.html:20
 msgid "nothing"
 msgstr "nichts"
+#: textpress/templates/_post.html:27 textpress/templates/show_post.html:24
+#: textpress/templates/admin/_comment.html:12
+#: textpress/templates/admin/index.html:56
+#: zine/templates/_post.html:27 zine/templates/show_post.html:24
+#: zine/templates/admin/_comment.html:12 zine/templates/admin/index.html:56
 msgid "Edit"
 msgstr "Bearbeiten"
 #: textpress/templates/archive.html:2 textpress/templates/archive.html:7
 #: textpress/templates/widgets/post_archive_summary.html:2
+#: zine/templates/archive.html:2 zine/templates/archive.html:7
+#: zine/templates/widgets/post_archive_summary.html:2
 msgid "Archive"
 msgstr "Archiv"
 #: textpress/templates/archive.html:13
+#: zine/templates/archive.html:13
 msgid "empty archive"
 msgstr "leeres Archiv"
 #: textpress/templates/archive.html:18
+#: zine/templates/archive.html:18
 #, python-format
 msgid "Archive for %(year)s"
 msgstr "Archiv für %(year)s"
 #: textpress/templates/archive.html:20
+#: zine/templates/archive.html:20
 #, python-format
 msgid "Archive for %(month)s"
 msgstr "Archiv für %(month)s"
 #: textpress/templates/archive.html:22
+#: zine/templates/archive.html:22
 #, python-format
 msgid "Archive for %(day)s"
 msgstr "Archiv für %(day)s"
 #: textpress/templates/authors.html:2 textpress/templates/authors.html:4
 #: textpress/templates/admin/inspect_import.html:28
+#: zine/templates/authors.html:2 zine/templates/authors.html:4
+#: zine/templates/admin/inspect_import.html:28
 msgid "Authors"
 msgstr "Authoren"
 #: textpress/templates/index.html:2
+#: zine/templates/index.html:2
 msgid "Index"
 msgstr "Übersicht"
 #: textpress/templates/index.html:8
+#: zine/templates/index.html:8
 msgid "Welcome"
 msgstr "Willkommen"
 #: textpress/templates/index.html:10
+#: zine/templates/index.html:10
 msgid "So far there are no posts in this blog."
 msgstr "Bis jetzt gibt es keine Einträge in diesem Blog."
 #: textpress/templates/page_base.html:7
+#: zine/templates/page_base.html:7
 msgid "Children"
 msgstr "Kinder"
 #: textpress/templates/show_author.html:12
+#: zine/templates/show_author.html:12
 msgid "Posts this user wrote"
 msgstr "Einträge von diesem Benutzer"
 #: textpress/templates/show_author.html:15
+#: zine/templates/show_author.html:15
 #, python-format
 msgid "%(post)s, on %(date)s"
 msgstr "%(post)s, am %(date)s."
 #: textpress/templates/show_post.html:7
+#: zine/templates/show_post.html:7
 msgid "written by"
 msgstr "geschrieben von"
+#: textpress/templates/show_post.html:29
+#: textpress/templates/admin/inspect_import.html:62
+#: textpress/templates/admin/show_posts.html:21 textpress/views/admin.py:88
+#: zine/templates/show_post.html:29 zine/templates/admin/inspect_import.html:62
+#: zine/templates/admin/show_posts.html:21 zine/views/admin.py:88
 msgid "Comments"
 msgstr "Kommentare"
 #: textpress/templates/show_post.html:48
+#: zine/templates/show_post.html:48
 msgid "Leave a Reply"
 msgstr "Hinterlasse eine Nachricht"
 #: textpress/templates/show_tag.html:2
+#: zine/templates/show_tag.html:2
 #, python-format
 msgid "Show Tag \"%(tag)s\""
 msgstr "Zeige Markierung \"%(tag)s\""
 #: textpress/templates/show_tag.html:5
+#: zine/templates/show_tag.html:5
 #, python-format
 msgid "Entries tagged \"%(tag)s\""
 msgstr "Einträge als \"%(tag)s\" markiert"
 #: textpress/templates/show_tag.html:12
+#: zine/templates/show_tag.html:12
 msgid "No public posts found"
 msgstr "Keine öffentlichen Beiträge gefunden"
+#: textpress/templates/tag_cloud.html:8
+#: textpress/templates/widgets/tagcloud.html:7
+#: zine/templates/tag_cloud.html:8 zine/templates/widgets/tagcloud.html:7
 #, python-format
 msgid "%(count)s post tagged %(tag)s"
 …
 msgstr[1] "%(count)s Einträge markiert als %(tag)s"
+#: textpress/templates/admin/_comment.html:14
+#: textpress/templates/admin/edit_comment.html:60
+#: textpress/templates/admin/edit_post.html:102
+#: textpress/templates/admin/edit_tag.html:21
+#: textpress/templates/admin/edit_user.html:69
+#: textpress/templates/admin/index.html:58
+#: textpress/templates/admin/inspect_import.html:84
+#: textpress/templates/admin/show_comments.html:22
+#: textpress/templates/admin/write_page.html:53
+#: textpress/templates/admin/file_uploads/browse.html:19
+#: zine/templates/admin/_comment.html:14
+#: zine/templates/admin/edit_comment.html:60
+#: zine/templates/admin/edit_post.html:102
+#: zine/templates/admin/edit_tag.html:21 zine/templates/admin/edit_user.html:69
+#: zine/templates/admin/index.html:58
+#: zine/templates/admin/inspect_import.html:84
+#: zine/templates/admin/show_comments.html:22
+#: zine/templates/admin/write_page.html:53
+#: zine/templates/admin/file_uploads/browse.html:19
 msgid "Delete"
 msgstr "Löschen"
 #: textpress/templates/admin/_comment.html:16
+#: zine/templates/admin/_comment.html:16
 msgid "Not Spam"
 msgstr "Kein Spam"
+#: textpress/templates/admin/_comment.html:19
+#: textpress/templates/admin/index.html:60
+#: textpress/templates/admin/show_comments.html:21
+#: zine/templates/admin/_comment.html:19 zine/templates/admin/index.html:60
+#: zine/templates/admin/show_comments.html:21
 msgid "Approve"
 msgstr "Bestätigen"
 #: textpress/templates/admin/_comment.html:22
+#: zine/templates/admin/_comment.html:22
 msgid "Block"
 msgstr "Blocken"
 #: textpress/templates/admin/about_textpress.html:2
 #: textpress/templates/admin/about_textpress.html:4
 msgid "About TextPress"
 msgstr "Über TextPress"
 #: textpress/templates/admin/about_textpress.html:6
 msgid ""
 "\n"
 "      TextPress is an open source content publishing platform emphasizing"
 " ease\n"
+#: zine/templates/admin/about_textpress.html:2
+#: zine/templates/admin/about_textpress.html:4
+msgid "About Zine"
+msgstr "Über Zine"
+#: zine/templates/admin/about_textpress.html:6
+msgid ""
+"\n"
+"      Zine is an open source content publishing platform emphasizing ease"
+"\n"
 "      of use and extensibility. It provides an powerful internal "
 "infrastructure,\n"
 …
 msgstr ""
 "\n"
 "      TextPress ist eine Plattform für das Veröffentlichen von Inhalten\n"
+"      Zine ist eine Plattform für das Veröffentlichen von Inhalten\n"
 "      mit Benutzerfreundlichkeit und Erweiterbarbeit als Schwerpunkten.\n"
 "      Es verfügt über eine umfangreiche interne Infrastruktur und einer\n"
 …
 "    "
+#: textpress/templates/admin/about_textpress.html:11
+msgid ""
+"\n"
+"      TextPress is distributed under the GNU GPL 2 or any later version. "
+"The\n"
+#: zine/templates/admin/about_textpress.html:11
+msgid ""
+"\n"
+"      Zine is distributed under the GNU GPL 2 or any later version. The\n"
 "      complete text of the license can be found online as well as in the "
 "LICENSE\n"
 …
 msgstr ""
 "\n"
 "      TextPress wird under der GNU GPL 2 oder einer späteren Version"
+"      Zine wird under der GNU GPL 2 oder einer späteren Version"
 "       vertrieben.  Der komplette Lizenztext kann online gefunden werden,"
 "\n"
 …
 "    "
 #: textpress/templates/admin/about_textpress.html:16
+#: zine/templates/admin/about_textpress.html:16
 #, python-format
 msgid "© Copyright %(years)s by the Pocoo Team. Some rights reserved."
 msgstr "© Copyright %(years)s by the Pocoo Team. Some rights reserved."
 #: textpress/templates/admin/approve_comment.html:2
 #: textpress/templates/admin/approve_comment.html:4
+#: zine/templates/admin/approve_comment.html:2
+#: zine/templates/admin/approve_comment.html:4
 msgid "Approve Comment"
 msgstr "Kommentar akzeptieren"
 #: textpress/templates/admin/approve_comment.html:8
+#: zine/templates/admin/approve_comment.html:8
 #, python-format
 msgid ""
 …
 "akzeptieren?"
 #: textpress/templates/admin/approve_comment.html:12
 #: textpress/templates/admin/block_comment.html:14
 #: textpress/templates/admin/delete_comment.html:11
 #: textpress/templates/admin/delete_comments.html:11
 #: textpress/templates/admin/delete_import.html:11
 #: textpress/templates/admin/delete_page.html:10
 #: textpress/templates/admin/delete_post.html:18
 #: textpress/templates/admin/delete_tag.html:11
 #: textpress/templates/admin/delete_user.html:28
 #: textpress/templates/admin/remove_plugin.html:12
 #: textpress/templates/admin/unblock_comment.html:12
 #: textpress/templates/admin/file_uploads/delete.html:13
+#: zine/templates/admin/approve_comment.html:12
+#: zine/templates/admin/block_comment.html:14
+#: zine/templates/admin/delete_comment.html:11
+#: zine/templates/admin/delete_comments.html:11
+#: zine/templates/admin/delete_import.html:11
+#: zine/templates/admin/delete_page.html:10
+#: zine/templates/admin/delete_post.html:18
+#: zine/templates/admin/delete_tag.html:11
+#: zine/templates/admin/delete_user.html:28
+#: zine/templates/admin/remove_plugin.html:12
+#: zine/templates/admin/unblock_comment.html:12
+#: zine/templates/admin/file_uploads/delete.html:13
 msgid "No"
 msgstr "Nein"
 #: textpress/templates/admin/approve_comment.html:13
 #: textpress/templates/admin/block_comment.html:15
 #: textpress/templates/admin/delete_comment.html:12
 #: textpress/templates/admin/delete_comments.html:12
 #: textpress/templates/admin/delete_import.html:12
 #: textpress/templates/admin/delete_page.html:11
 #: textpress/templates/admin/delete_post.html:19
 #: textpress/templates/admin/delete_tag.html:12
 #: textpress/templates/admin/delete_user.html:29
 #: textpress/templates/admin/remove_plugin.html:13
 #: textpress/templates/admin/unblock_comment.html:13
 #: textpress/templates/admin/file_uploads/delete.html:14
+#: zine/templates/admin/approve_comment.html:13
+#: zine/templates/admin/block_comment.html:15
+#: zine/templates/admin/delete_comment.html:12
+#: zine/templates/admin/delete_comments.html:12
+#: zine/templates/admin/delete_import.html:12
+#: zine/templates/admin/delete_page.html:11
+#: zine/templates/admin/delete_post.html:19
+#: zine/templates/admin/delete_tag.html:12
+#: zine/templates/admin/delete_user.html:29
+#: zine/templates/admin/remove_plugin.html:13
+#: zine/templates/admin/unblock_comment.html:13
+#: zine/templates/admin/file_uploads/delete.html:14
 msgid "Yes"
 msgstr "Ja"
 #: textpress/templates/admin/basic_options.html:2
 #: textpress/templates/admin/basic_options.html:4
+#: zine/templates/admin/basic_options.html:2
+#: zine/templates/admin/basic_options.html:4
 msgid "Basic Options"
 msgstr "Grundeinstellungen"
 #: textpress/templates/admin/basic_options.html:5
+#: zine/templates/admin/basic_options.html:5
 msgid ""
 "\n"
 …
 "  "
 #: textpress/templates/admin/basic_options.html:11
 #: textpress/templates/admin/inspect_import.html:16
+#: zine/templates/admin/basic_options.html:11
+#: zine/templates/admin/inspect_import.html:16
 msgid "Blog Title"
 msgstr "Blog Titel"
 #: textpress/templates/admin/basic_options.html:13
+#: zine/templates/admin/basic_options.html:13
 msgid "Blog Tagline"
 msgstr "Blog Tagline"
 #: textpress/templates/admin/basic_options.html:15
+#: zine/templates/admin/basic_options.html:15
 msgid "Blog E-Mail"
 msgstr "Blog E-Mail"
 #: textpress/templates/admin/basic_options.html:17
 #: textpress/templates/admin/inspect_import.html:20
+#: zine/templates/admin/basic_options.html:17
+#: zine/templates/admin/inspect_import.html:20
 msgid "Language"
 msgstr "Sprache"
 #: textpress/templates/admin/basic_options.html:24
+#: zine/templates/admin/basic_options.html:24
 msgid "Timezone"
 msgstr "Zeitzone"
 #: textpress/templates/admin/basic_options.html:31
+#: zine/templates/admin/basic_options.html:31
 msgid "Cookie Name"
 msgstr "Cookie Name"
 #: textpress/templates/admin/basic_options.html:33
+#: zine/templates/admin/basic_options.html:33
 msgid "Comments Enabled"
 msgstr "Kommentare aktivieren"
 #: textpress/templates/admin/basic_options.html:35
+#: zine/templates/admin/basic_options.html:35
 msgid "enable comments per default"
 msgstr "aktiviere Kommentare standardmäßig"
 #: textpress/templates/admin/basic_options.html:36
+#: zine/templates/admin/basic_options.html:36
 msgid "Comment Moderation"
 msgstr "Kommentar Moderation"
 #: textpress/templates/admin/basic_options.html:38
+#: zine/templates/admin/basic_options.html:38
 msgid "Automatically approve all commments"
 msgstr "Automatisch alle Kommentare bestätigen"
 #: textpress/templates/admin/basic_options.html:39
+#: zine/templates/admin/basic_options.html:39
 msgid "An administrator must always approve the comment"
 msgstr "Ein Administrator muss Kommentare immer bestätigen"
 #: textpress/templates/admin/basic_options.html:40
+#: zine/templates/admin/basic_options.html:40
 msgid "Automatically approve comments by known comment authors"
 msgstr "Automatisch Kommentare von bekannten Autoren bestätigen"
 #: textpress/templates/admin/basic_options.html:46
+#: zine/templates/admin/basic_options.html:46
 msgid "Pingbacks Enabled"
 msgstr "Pingbacks aktivieren"
 #: textpress/templates/admin/basic_options.html:48
+#: zine/templates/admin/basic_options.html:48
 msgid "enable pingbacks per default"
 msgstr "aktiviere Pingbacks standardmäßig"
 #: textpress/templates/admin/basic_options.html:49
+#: zine/templates/admin/basic_options.html:49
 msgid "Use Flat Comments"
 msgstr "Flache Kommentare"
 #: textpress/templates/admin/basic_options.html:51
+#: zine/templates/admin/basic_options.html:51
 msgid "use flat comments"
 msgstr "flache Kommentare verwenden"
 #: textpress/templates/admin/basic_options.html:52
+#: zine/templates/admin/basic_options.html:52
 msgid "Default Parser"
 msgstr "Standard Parser"
 #: textpress/templates/admin/basic_options.html:59
+#: zine/templates/admin/basic_options.html:59
 msgid "Comment Parser"
 msgstr "Kommentar-Parser"
 #: textpress/templates/admin/basic_options.html:66
+#: zine/templates/admin/basic_options.html:66
 msgid "Posts Per Page"
 msgstr "Einträge pro Seite"
 #: textpress/templates/admin/block_comment.html:2
 #: textpress/templates/admin/block_comment.html:4
 #: textpress/templates/admin/edit_comment.html:50
+#: zine/templates/admin/block_comment.html:2
+#: zine/templates/admin/block_comment.html:4
+#: zine/templates/admin/edit_comment.html:50
 msgid "Block Comment"
 msgstr "Kommentare blocken"
 #: textpress/templates/admin/block_comment.html:8
+#: zine/templates/admin/block_comment.html:8
 #, python-format
 msgid ""
 …
 "        blocken?       "
 #: textpress/templates/admin/blogger_perform_import.html:2
 #: textpress/templates/admin/blogger_perform_import.html:4
 #: textpress/templates/admin/perform_import.html:2
 #: textpress/templates/admin/perform_import.html:4
+#: zine/templates/admin/blogger_perform_import.html:2
+#: zine/templates/admin/blogger_perform_import.html:4
+#: zine/templates/admin/perform_import.html:2
+#: zine/templates/admin/perform_import.html:4
 msgid "Importing..."
 msgstr "Importieren..."
 #: textpress/templates/admin/blogger_perform_import.html:5
+#: zine/templates/admin/blogger_perform_import.html:5
 msgid ""
 "\n"
 …
 "  "
 #: textpress/templates/admin/blogger_perform_import.html:11
+#: zine/templates/admin/blogger_perform_import.html:11
 msgid ""
 "\n"
 …
 "   "
 #: textpress/templates/admin/blogger_perform_import.html:15
+#: zine/templates/admin/blogger_perform_import.html:15
 msgid "Import review page"
 msgstr "Import-Überprüfung"
+#: textpress/templates/admin/cache.html:2
+#: textpress/templates/admin/cache.html:4
+#: zine/templates/admin/cache.html:2 zine/templates/admin/cache.html:4
 msgid "Cache Options"
 msgstr "Cache Einstellungen"
+#: textpress/templates/admin/cache.html:5
+msgid ""
+"\n"
+"    TextPress comes with a cache system that allows you to survive a "
+"sudden\n"
+#: zine/templates/admin/cache.html:5
+msgid ""
+"\n"
+"    Zine comes with a cache system that allows you to survive a sudden\n"
 "    storm of visitors.  The caching system has different backends you can"
 "\n"
 …
 msgstr ""
 "\n"
+"    TextPress verfügt über ein Cache System, dass es dir erlaubt einen"
+"     plötzlichen Besucherstrom zu bewältigen.  Das Cache System hat "
+"mehrere     Backends von denen du wählen kannst, je nach dem wie dein "
+"Server     konfiguriert ist und wie viele Besucher du erwartest.\n"
+"  "
+#: textpress/templates/admin/cache.html:11
+"    Zine bringt ein ausgeklügeltes Caching System mit, dass es dir\n"
+"    erlaubt einen plötzlichen Besuchersturm zu bewältigen.  Das Cache\n"
+"    System hat verschiedene Backends von denen du wählen kannst."
+"  "
+#: zine/templates/admin/cache.html:11
 msgid ""
 "\n"
 …
 "  "
 #: textpress/templates/admin/cache.html:28
+#: zine/templates/admin/cache.html:28
 msgid "Cache System"
 msgstr "Cache System"
 #: textpress/templates/admin/cache.html:29
 msgid "Current TextPress supports three caching systems:"
 msgstr "Momentan unterstützt TextPress die folgenden drei Cache Systeme:"
 #: textpress/templates/admin/cache.html:31
+#: zine/templates/admin/cache.html:29
+msgid "Current Zine supports three caching systems:"
+msgstr "Momentan unterstützt Zine die folgenden drei Cache Systeme:"
+#: zine/templates/admin/cache.html:31
 msgid ""
 "<strong>Simple Cache</strong>: The simple cache is a very\n"
 …
 "    verwenden kannst solltest du den einfachen Cache nicht nutzen."
 #: textpress/templates/admin/cache.html:37
+#: zine/templates/admin/cache.html:37
 msgid ""
 "<strong>memcached</strong>: This cache system uses one\n"
 …
 "    ist besonders für Seiten mit vielen Besuchern sinnvoll."
 #: textpress/templates/admin/cache.html:41
+#: zine/templates/admin/cache.html:41
 msgid ""
 "<strong>Filesystem</strong>: This cache system stores the\n"
 …
 "meisten Fällen sollte das Dateisystem jedoch schnell     genug sein."
 #: textpress/templates/admin/cache.html:46
+#: zine/templates/admin/cache.html:46
 msgid "Per default no cache system is active."
 msgstr "Standardmäßig ist kein Cache System aktiv."
 #: textpress/templates/admin/cache.html:51
+#: zine/templates/admin/cache.html:51
 msgid "Memcached Options"
 msgstr "Memcached Einstellungen"
 #: textpress/templates/admin/cache.html:52
+#: zine/templates/admin/cache.html:52
 msgid ""
 "\n"
 …
 "    "
 #: textpress/templates/admin/cache.html:61
+#: zine/templates/admin/cache.html:61
 msgid ""
 "\n"
 …
 "    "
 #: textpress/templates/admin/cache.html:70
+#: zine/templates/admin/cache.html:70
 msgid "Filesystem Options"
 msgstr "Dateisystem Optionen"
+#: textpress/templates/admin/cache.html:71
+msgid ""
+"\n"
+"        When using the filesystem cache you can control where TextPress "
+"puts\n"
+"        all the cache data.  This path is relative to your TextPress "
+"instance\n"
+"        folder and will be created automatically by TextPress.  Keep in "
+"mind\n"
+#: zine/templates/admin/cache.html:71
+msgid ""
+"\n"
+"        When using the filesystem cache you can control where Zine puts\n"
+"        all the cache data.  This path is relative to your Zine instance\n"
+"        folder and will be created automatically by Zine.  Keep in mind\n"
 "        that if you change that path and old cache data is left in the "
 "old\n"
 "        folder, TextPress won't clean up the data left for you.\n"
+"        folder, Zine won't clean up the data left for you.\n"
 "      "
 msgstr ""
 "\n"
+"    Wenn du das Dateisystem für Caching nutz kannst du hier den\n"
+"    Speicherort für die Cache Dateien angeben.  Dieser Pfad ist realtiv\n"
+"    zum Instanzordner deiner TextPress installation und wird automatisch\n"
+"    von TextPress erstellt.  Beachte bitte, dass bei Pfadänderungen weder"
+"\n"
+"    der alte Cache Ordner noch die Dateien darin gelöscht werden.\n"
+"    "
+#: textpress/templates/admin/cache.html:78
+"       Wenn der Dateisystem Cache verwendet ist kannst du einen Pfad\n"
+"       angeben in dem Zine die die Daten ablegt.  Beachte bitte, dass\n"
+"       das Ändern des Pfades die alten Cache Dateien in diesem Ordner\n"
+"       nicht automatisch löscht."
+"      "
+#: zine/templates/admin/cache.html:78
 msgid ""
 "\n"
 "        One thing you have to keep in mind is that the cache path "
 "<em>must</em>\n"
+"        be a directory that only TextPress uses for file management.  The"
+"\n"
+"        TextPress code cleans up there from time to time and it could "
+"delete\n"
+"        files that are otherwise not tracked by TextPress.  This is "
+"especially\n"
+"        be a directory that only Zine uses for file management.  The\n"
+"        Zine code cleans up there from time to time and it could delete\n"
+"        files that are otherwise not tracked by Zine.  This is especially"
+"\n"
 "        the case if you try to cache into <code>/tmp</code> or a similar\n"
 "        folder where all kinds of applications put temporary files in.\n"
 …
 "\n"
 "    Außerdem muss beachtet werden, dass der Cache Pfad ausschließlich\n"
 "    von TextPress für Dateien verwendet wird.  TextPress wird von Zeit\n"
+"    von Zine für Dateien verwendet wird.  TextPress wird von Zeit\n"
 "    zu Zeit den Cache leeren und würde ohne Nachfrage alle Dateien in\n"
 "    diesem Ordner löschen.  Nutze also nicht einfach nur "
 …
 "   "
 #: textpress/templates/admin/cache.html:89
+#: zine/templates/admin/cache.html:89
 msgid "General Cache Settings"
 msgstr "Generelle Cache Einstellungen"
 #: textpress/templates/admin/cache.html:90
+#: zine/templates/admin/cache.html:90
 msgid ""
 "\n"
 …
 "   "
 #: textpress/templates/admin/cache.html:100
+#: zine/templates/admin/cache.html:100
 msgid "Default cache timeout"
 msgstr "Standardmäßiger Timeout"
 #: textpress/templates/admin/cache.html:102
+#: zine/templates/admin/cache.html:102
 msgid "Enable eager caching"
 msgstr "Eager caching aktivieren"
 #: textpress/templates/admin/cache.html:104
+#: zine/templates/admin/cache.html:104
 msgid "enable"
 msgstr "aktivieren"
 #: textpress/templates/admin/cache.html:108
+#: zine/templates/admin/cache.html:108
 msgid "Clear Cache"
 msgstr "Cache leeren"
 #: textpress/templates/admin/change_password.html:2
 #: textpress/templates/admin/change_password.html:4
 #: textpress/templates/admin/change_password.html:16
 #: textpress/templates/admin/layout.html:15
+#: zine/templates/admin/change_password.html:2
+#: zine/templates/admin/change_password.html:4
+#: zine/templates/admin/change_password.html:16
+#: zine/templates/admin/layout.html:15
 msgid "Change Password"
 msgstr "Passwort ändern"
 #: textpress/templates/admin/change_password.html:7
+#: zine/templates/admin/change_password.html:7
 msgid "Old Password"
 msgstr "Altes Passwort"
 #: textpress/templates/admin/change_password.html:9
+#: zine/templates/admin/change_password.html:9
 msgid "New Password"
 msgstr "Neues Passwort"
 #: textpress/templates/admin/change_password.html:11
+#: zine/templates/admin/change_password.html:11
 msgid "Repeat"
 msgstr "Wiederholen"
 #: textpress/templates/admin/configuration.html:2
 #: textpress/templates/admin/configuration.html:4 textpress/views/admin.py:125
+#: zine/templates/admin/configuration.html:2
+#: zine/templates/admin/configuration.html:4 zine/views/admin.py:140
 msgid "Configuration Editor"
 msgstr "Konfigurationseditor"
 #: textpress/templates/admin/configuration.html:5
+#: zine/templates/admin/configuration.html:5
 msgid ""
 "\n"
 …
 "   "
 #: textpress/templates/admin/configuration.html:24
+#: zine/templates/admin/configuration.html:24
 msgid "True"
 msgstr "Wahr"
 #: textpress/templates/admin/configuration.html:25
+#: zine/templates/admin/configuration.html:25
 msgid "False"
 msgstr "Falsch"
 #: textpress/templates/admin/configuration.html:43
+#: zine/templates/admin/configuration.html:43
 msgid "Disable Editor"
 msgstr "Editor deaktivieren"
 #: textpress/templates/admin/configuration.html:46
+#: zine/templates/admin/configuration.html:46
 msgid ""
 "\n"
 …
 "   "
 #: textpress/templates/admin/configuration.html:52
+#: zine/templates/admin/configuration.html:52
 msgid "Enable Editor"
 msgstr "Editor aktivieren"
 #: textpress/templates/admin/delete_comment.html:2
 #: textpress/templates/admin/delete_comment.html:4
+#: zine/templates/admin/delete_comment.html:2
+#: zine/templates/admin/delete_comment.html:4
 msgid "Delete Comment"
 msgstr "Kommentar löschen"
 #: textpress/templates/admin/delete_comment.html:8
+#: zine/templates/admin/delete_comment.html:8
 #, python-format
 msgid ""
 …
 "   "
 #: textpress/templates/admin/delete_comments.html:2
 #: textpress/templates/admin/delete_comments.html:4
+#: zine/templates/admin/delete_comments.html:2
+#: zine/templates/admin/delete_comments.html:4
 msgid "Delete Comments"
 msgstr "Kommentare löschen"
 #: textpress/templates/admin/delete_comments.html:8
+#: zine/templates/admin/delete_comments.html:8
 msgid "Do you really want to delete the selected comments?"
 msgstr "Möchtest du wirklich die ausgewählten Kommentare löschen?"
 #: textpress/templates/admin/delete_import.html:2
 #: textpress/templates/admin/delete_import.html:4
+#: zine/templates/admin/delete_import.html:2
+#: zine/templates/admin/delete_import.html:4
 msgid "Delete Import Dump"
 msgstr "Import-Dump löschen"
 #: textpress/templates/admin/delete_import.html:7
+#: zine/templates/admin/delete_import.html:7
 #, python-format
 msgid ""
 …
 "    "
 #: textpress/templates/admin/delete_page.html:2
 #: textpress/templates/admin/delete_page.html:4
+#: zine/templates/admin/delete_page.html:2
+#: zine/templates/admin/delete_page.html:4
 msgid "Delete Page"
 msgstr "Seite Löschen"
 #: textpress/templates/admin/delete_page.html:7
+#: zine/templates/admin/delete_page.html:7
 #, python-format
 msgid ""
 …
 "    "
 #: textpress/templates/admin/delete_post.html:2
 #: textpress/templates/admin/delete_post.html:4
+#: zine/templates/admin/delete_post.html:2
+#: zine/templates/admin/delete_post.html:4
 msgid "Delete Post"
 msgstr "Eintrag löschen"
 #: textpress/templates/admin/delete_post.html:8
+#: zine/templates/admin/delete_post.html:8
 #, python-format
 msgid ""
 …
 "    "
 #: textpress/templates/admin/delete_post.html:12
+#: zine/templates/admin/delete_post.html:12
 #, python-format
 msgid ""
 …
 "   "
 #: textpress/templates/admin/delete_tag.html:2
 #: textpress/templates/admin/delete_tag.html:4
+#: zine/templates/admin/delete_tag.html:2
+#: zine/templates/admin/delete_tag.html:4
 msgid "Delete Tag"
 msgstr "Markierung löschen"
 #: textpress/templates/admin/delete_tag.html:8
+#: zine/templates/admin/delete_tag.html:8
 #, python-format
 msgid ""
 …
 "    "
 #: textpress/templates/admin/delete_user.html:2
 #: textpress/templates/admin/delete_user.html:4
+#: zine/templates/admin/delete_user.html:2
+#: zine/templates/admin/delete_user.html:4
 msgid "Delete User"
 msgstr "Benutzer löschen"
 #: textpress/templates/admin/delete_user.html:7
+#: zine/templates/admin/delete_user.html:7
 #, python-format
 msgid ""
 …
 "   "
 #: textpress/templates/admin/delete_user.html:11
+#: zine/templates/admin/delete_user.html:11
 #, python-format
 msgid ""
 …
 "    "
 #: textpress/templates/admin/delete_user.html:18
+#: zine/templates/admin/delete_user.html:18
 msgid "reassign to user"
 msgstr "anderem Benutzer zuweisen"
 #: textpress/templates/admin/delete_user.html:25
+#: zine/templates/admin/delete_user.html:25
 msgid "delete posts"
 msgstr "Einträge löschen"
 #: textpress/templates/admin/edit_comment.html:2
 #: textpress/templates/admin/edit_comment.html:4
+#: zine/templates/admin/edit_comment.html:2
+#: zine/templates/admin/edit_comment.html:4
 msgid "Edit Comment"
 msgstr "Kommentar bearbeiten"
 #: textpress/templates/admin/edit_comment.html:19
 #: textpress/templates/admin/edit_user.html:23
 #: textpress/websetup/templates/admin_account.html:16
+#: zine/templates/admin/edit_comment.html:19
+#: zine/templates/admin/edit_user.html:23
+#: zine/websetup/templates/admin_account.html:16
 msgid "E-Mail"
 msgstr "E-Mail"
 #: textpress/templates/admin/edit_comment.html:33
+#: zine/templates/admin/edit_comment.html:33
 msgid "Text"
 msgstr "Text"
 #: textpress/templates/admin/edit_comment.html:37
 #: textpress/templates/admin/edit_post.html:58
 #: textpress/templates/admin/write_page.html:22
+#: zine/templates/admin/edit_comment.html:37
+#: zine/templates/admin/edit_post.html:58
+#: zine/templates/admin/write_page.html:22
 msgid "Parser"
 msgstr "Parser"
 #: textpress/templates/admin/edit_comment.html:46
 #: textpress/templates/admin/import.html:24
 #: textpress/templates/admin/inspect_import.html:59
 #: textpress/templates/admin/show_posts.html:22
+#: zine/templates/admin/edit_comment.html:46
+#: zine/templates/admin/import.html:24
+#: zine/templates/admin/inspect_import.html:59
+#: zine/templates/admin/show_posts.html:22
 msgid "Date"
 msgstr "Datum"
 #: textpress/templates/admin/edit_comment.html:52
+#: zine/templates/admin/edit_comment.html:52
 msgid "block comment"
 msgstr "Kommentar blocken"
 #: textpress/templates/admin/edit_comment.html:54
+#: zine/templates/admin/edit_comment.html:54
 msgid "Block message"
 msgstr "Nachricht blocken"
 #: textpress/templates/admin/edit_post.html:2
 #: textpress/templates/admin/edit_post.html:4 textpress/views/admin.py:85
+#: zine/templates/admin/edit_post.html:2 zine/templates/admin/edit_post.html:4
+#: zine/views/admin.py:85
 msgid "Write Post"
 msgstr "Eintrag schreiben"
 #: textpress/templates/admin/edit_post.html:8
+#: zine/templates/admin/edit_post.html:8
 msgid "Your other draft:"
 msgid_plural "Your other drafts:"
 …
 msgstr[1] "Deine anderen Entwürfe:"
 #: textpress/templates/admin/edit_post.html:11
 #: textpress/templates/admin/show_posts.html:7
+#: zine/templates/admin/edit_post.html:11
+#: zine/templates/admin/show_posts.html:7
 msgid "Your draft:"
 msgid_plural "Your drafts:"
 …
 msgstr[1] "Deine Entwürfe:"
 #: textpress/templates/admin/edit_post.html:26
+#: zine/templates/admin/edit_post.html:26
 msgid "Post"
 msgstr "Beitrag"
 #: textpress/templates/admin/edit_post.html:30
+#: zine/templates/admin/edit_post.html:30
 msgid "Post Status"
 msgstr "Status des Eintrages"
 #: textpress/templates/admin/edit_post.html:40
+#: zine/templates/admin/edit_post.html:40
 msgid "Intro"
 msgstr "Einleitung"
 #: textpress/templates/admin/edit_post.html:44
 #: textpress/templates/admin/show_posts.html:20
 #: textpress/templates/widgets/tagcloud.html:2 textpress/views/admin.py:86
+#: zine/templates/admin/edit_post.html:44
+#: zine/templates/admin/show_posts.html:20
+#: zine/templates/widgets/tagcloud.html:2 zine/views/admin.py:86
 msgid "Tags"
 msgstr "Markierungen"
 #: textpress/templates/admin/edit_post.html:46
+#: zine/templates/admin/edit_post.html:46
 msgid "Add"
 msgstr "Hinzufügen"
 #: textpress/templates/admin/edit_post.html:53
+#: zine/templates/admin/edit_post.html:53
 msgid "no tags created yet"
 msgstr "noch keine Markierungen vorhanden"
 #: textpress/templates/admin/edit_post.html:67
+#: zine/templates/admin/edit_post.html:67
 msgid "Discussion"
 msgstr "Diskussion"
 #: textpress/templates/admin/edit_post.html:70
+#: zine/templates/admin/edit_post.html:70
 msgid "Allow comments"
 msgstr "Kommentare erlauben"
 #: textpress/templates/admin/edit_post.html:72
+#: zine/templates/admin/edit_post.html:72
 msgid "Allow pings"
 msgstr "Pingbacks erlauben"
 #: textpress/templates/admin/edit_post.html:74
+#: zine/templates/admin/edit_post.html:74
 msgid "Ping all URLs in the text"
 msgstr "Alle URLs im Text pingen"
 #: textpress/templates/admin/edit_post.html:78
+#: zine/templates/admin/edit_post.html:78
 msgid "Publication Date"
 msgstr "Veröffentlichungsdatum"
 #: textpress/templates/admin/edit_post.html:82
+#: zine/templates/admin/edit_post.html:82
 msgid "Post Slug"
 msgstr "Eintrag URL-Bezeichner"
 #: textpress/templates/admin/edit_post.html:93
+#: zine/templates/admin/edit_post.html:93
 msgid "View Post"
 msgstr "Eintrag anzeigen"
 #: textpress/templates/admin/edit_post.html:100
 #: textpress/templates/admin/edit_user.html:67
+#: zine/templates/admin/edit_post.html:100
+#: zine/templates/admin/edit_user.html:67
 msgid "Save and continue editing"
 msgstr "Speichern und bearbeiten forsetzen"
+#: textpress/templates/admin/edit_tag.html:2
+#: textpress/templates/admin/edit_tag.html:4
+#: zine/templates/admin/edit_tag.html:2 zine/templates/admin/edit_tag.html:4
 msgid "Edit Tag"
 msgstr "Tag bearbeiten"
+#: textpress/templates/admin/edit_tag.html:7
+#: textpress/templates/admin/show_tags.html:8
+#: zine/templates/admin/edit_tag.html:7 zine/templates/admin/show_tags.html:8
 msgid "Slug"
 msgstr "URL-Bezeichner"
+#: textpress/templates/admin/edit_tag.html:11
+#: textpress/templates/admin/information.html:80
+#: textpress/templates/admin/show_tags.html:9
+#: zine/templates/admin/edit_tag.html:11 zine/templates/admin/show_tags.html:9
 msgid "Name"
 msgstr "Name"
+#: textpress/templates/admin/edit_tag.html:15
+#: textpress/templates/admin/edit_user.html:50
+#: textpress/templates/admin/inspect_import.html:18
+#: textpress/templates/admin/plugins.html:17
+#: zine/templates/admin/edit_tag.html:15 zine/templates/admin/edit_user.html:50
+#: zine/templates/admin/inspect_import.html:18
+#: zine/templates/admin/plugins.html:17
 msgid "Description"
 msgstr "Beschreibung"
 #: textpress/templates/admin/edit_user.html:2 textpress/views/admin.py:114
+#: zine/templates/admin/edit_user.html:2 zine/views/admin.py:114
 msgid "Edit User"
 msgstr "Benutzer bearbeiten"
 #: textpress/templates/admin/edit_user.html:2
 #: textpress/templates/admin/show_users.html:26
+#: zine/templates/admin/edit_user.html:2
+#: zine/templates/admin/show_users.html:26
 msgid "New User"
 msgstr "Neuer Benutzer"
 #: textpress/templates/admin/edit_user.html:7
+#: zine/templates/admin/edit_user.html:7
 msgid "User created successfully"
 msgstr "Benutzer wurde automatisch erstellt"
 #: textpress/templates/admin/edit_user.html:8
+#: zine/templates/admin/edit_user.html:8
 #, python-format
 msgid ""
 …
 msgstr "Der Benutzer %(username)s wurde erfolgreich erstellt."
 #: textpress/templates/admin/edit_user.html:10
+#: zine/templates/admin/edit_user.html:10
 msgid "Hide message"
 msgstr "Nachricht verstecken"
+#: textpress/templates/admin/edit_user.html:15
+#: textpress/templates/admin/login.html:19
+#: textpress/templates/admin/show_users.html:8
+#: textpress/websetup/templates/admin_account.html:10
+#: zine/templates/admin/edit_user.html:15 zine/templates/admin/login.html:19
+#: zine/templates/admin/show_users.html:8
+#: zine/websetup/templates/admin_account.html:10
 msgid "Username"
 msgstr "Benutzername"
+#: textpress/templates/admin/edit_user.html:19
+#: textpress/templates/admin/login.html:21
+#: textpress/websetup/templates/admin_account.html:12
+#: zine/templates/admin/edit_user.html:19 zine/templates/admin/login.html:21
+#: zine/websetup/templates/admin_account.html:12
 msgid "Password"
 msgstr "Passwort"
 #: textpress/templates/admin/edit_user.html:31
+#: zine/templates/admin/edit_user.html:31
 msgid "First Name"
 msgstr "Vorname"
 #: textpress/templates/admin/edit_user.html:35
+#: zine/templates/admin/edit_user.html:35
 msgid "Last Name"
 msgstr "Nachname"
 #: textpress/templates/admin/edit_user.html:40
+#: zine/templates/admin/edit_user.html:40
 msgid "Display Name"
 msgstr "Anzeigename"
 #: textpress/templates/admin/edit_user.html:55
 #: textpress/templates/admin/show_users.html:11
+#: zine/templates/admin/edit_user.html:55
+#: zine/templates/admin/show_users.html:11
 msgid "Role"
 msgstr "Rolle"
+#: textpress/templates/admin/export.html:2
+#: textpress/templates/admin/export.html:4
+#: textpress/templates/admin/export.html:17 textpress/views/admin.py:139
+#: zine/templates/admin/export.html:2 zine/templates/admin/export.html:4
+#: zine/templates/admin/export.html:17 zine/views/admin.py:138
 msgid "Export"
 msgstr "Exportieren"
+#: textpress/templates/admin/export.html:5
+msgid ""
+"\n"
+"    Here you can dump your TextPress database information into an "
+"standardized\n"
+"    format (Atom) with TextPress extensions which we call “TextPress "
+"eXtended\n"
+"    Atom” (TPXA).  You can use this file to import your posts into "
+#: zine/templates/admin/export.html:5
+msgid ""
+"\n"
+"    Here you can dump your Zine database information into an standardized"
+"\n"
+"    format (Atom) with Zine extensions which we call “Zine eXtended\n"
+"    Atom” (ZineXA).  You can use this file to import your posts into "
 "another\n"
 "    weblog software that supports Atom.  You should not use this file for"
 "\n"
+"    TextPress migrations as this file will not include attachments, the "
+"blog\n"
+"    Zine migrations as this file will not include attachments, the blog\n"
 "    configuration and probably data stored by plugins.\n"
 "  "
 msgstr ""
 "\n"
 "    Von hier aus kannst du deine TextPress Datenbank in ein "
+"    Von hier aus kannst du deine Zine Datenbank in ein "
 "standardisiertes\n"
+"    Format (Atom) mit TextPress Erweiterungen exportieren.  Diese "
+"TextPress\n"
+"    eXtended Atom (TPXA) Dateien kannst du nutzen um die Daten an andere\n"
+"    Format (Atom) mit Zine Erweiterungen exportieren.  Diese Zine\n"
+"    eXtended Atom (ZineXA) Dateien kannst du nutzen um die Daten an andere\n"
 "    Weblog Anwendungen zu importieren.  Du solltest diese Datei nicht "
 "nutzen\n"
 …
 "  "
 #: textpress/templates/admin/help.html:8
+#: zine/templates/admin/help.html:8
 msgid "Table Of Contents"
 msgstr "Inhaltsverzeichnis"
+#: textpress/templates/admin/import.html:2
+#: textpress/templates/admin/import.html:4
+#: textpress/templates/admin/import_blogger.html:41
+#: textpress/templates/admin/import_wordpress.html:22
+#: textpress/views/admin.py:138
+#: zine/templates/admin/import.html:2 zine/templates/admin/import.html:4
+#: zine/templates/admin/import_blogger.html:41
+#: zine/templates/admin/import_wordpress.html:22 zine/views/admin.py:137
 msgid "Import"
 msgstr "Importieren"
 #: textpress/templates/admin/import.html:5
 msgid ""
 "\n"
 "    If you have posts or comments in another system, TextPress can import"
 " those\n"
+#: zine/templates/admin/import.html:5
+msgid ""
+"\n"
+"    If you have posts or comments in another system, Zine can import "
+"those\n"
 "    into this blog.  The data imported doesn't directly end up in the "
 "blog but a\n"
 …
 msgstr ""
 "\n"
 "   Wenn du posts oder Kommentare in anderen Systemen hast kann TextPress\n"
+"   Wenn du posts oder Kommentare in anderen Systemen hast kann Zine\n"
 "   diese in dein Blog importieren.  Die importierten Daten werden nicht\n"
 "   direkt in das Blog importiert, sondern in eine separate Datei von wo\n"
 …
 "  "
 #: textpress/templates/admin/import.html:17
+#: zine/templates/admin/import.html:17
 msgid ""
 "\n"
 …
 "  "
 #: textpress/templates/admin/import.html:26
+#: zine/templates/admin/import.html:26
 msgid "Importer Used"
 msgstr "Benutzter Importer"
 #: textpress/templates/admin/import_blogger.html:14
 #: textpress/templates/admin/import_blogger.html:16
+#: zine/templates/admin/import_blogger.html:14
+#: zine/templates/admin/import_blogger.html:16
 msgid "Import from Blogger.com"
 msgstr "Von Blogger.com importieren"
 #: textpress/templates/admin/import_blogger.html:17
+#: zine/templates/admin/import_blogger.html:17
 msgid ""
 "\n"
 …
 "  "
 #: textpress/templates/admin/import_blogger.html:24
+#: zine/templates/admin/import_blogger.html:24
 #, python-format
 msgid ""
 …
 "  "
 #: textpress/templates/admin/import_blogger.html:30
+#: zine/templates/admin/import_blogger.html:30
 msgid "Select Blog To Import"
 msgstr "Wähle das Blog zum Importieren aus"
 #: textpress/templates/admin/import_blogger.html:42
+#: zine/templates/admin/import_blogger.html:42
 msgid "Log out of Google"
 msgstr "Bei Google Ausloggen"
 #: textpress/templates/admin/import_blogger.html:50
+#: zine/templates/admin/import_blogger.html:50
 #, python-format
 msgid ""
 …
 "  Seite führen.\n"
 #: textpress/templates/admin/import_blogger.html:57
+#: zine/templates/admin/import_blogger.html:57
 #, python-format
 msgid ""
 …
 "  "
 #: textpress/templates/admin/import_wordpress.html:2
 #: textpress/templates/admin/import_wordpress.html:4
+#: zine/templates/admin/import_wordpress.html:2
+#: zine/templates/admin/import_wordpress.html:4
 msgid "Import from WordPress"
 msgstr "Von WordPress importieren"
 #: textpress/templates/admin/import_wordpress.html:5
+#: zine/templates/admin/import_wordpress.html:5
 msgid ""
 "\n"
 "    This importer allows you to import posts and comments from your "
 "WordPress\n"
+"    blog into your new TextPress blog.  Either upload your WordPress "
+"eXtended\n"
+"    blog into your new Zine blog.  Either upload your WordPress eXtended\n"
 "    RSS (WXR) file created in the WordPress admin panel or give the "
 "importer\n"
 …
 msgstr ""
 "\n"
+"   Dieser Importer erlaubt es dir Einträge und Kommentare von deinem\n"
+"   WordPress blog zu importieren.  Entweder kannst du eine WordPress    "
+"eXtended RSS (WXR) Datei hochladen oder den Speicherort zu so einer\n"
+"   Datei als URL angeben.  WXR Dateien können im WordPress Admin Panel\n"
+"   erstellt werden.\n"
+"  "
+#: textpress/templates/admin/import_wordpress.html:14
+"    Dieser Importer erlaubt es dir Posts und Kommentare von einem WordPress\n"
+"    Blog in dieses Blog zu importieren.  Du kannst entweder eine WordPress\n"
+"    eXtended RSS (WXR) Datei hochladen oder die URL zu einer angeben."
+"  "
+#: zine/templates/admin/import_wordpress.html:14
 msgid "Dump Download URL"
 msgstr "Dump Download URL"
 #: textpress/templates/admin/import_wordpress.html:16
+#: zine/templates/admin/import_wordpress.html:16
 msgid "Upload Dump"
 msgstr "Dump Hochladen"
 #: textpress/templates/admin/import_wordpress.html:29
+#: zine/templates/admin/import_wordpress.html:29
 msgid "Finishing upload, performing import..."
 msgstr "Upload fertiggestellt, Import wird durchgeführt..."
 #: textpress/templates/admin/index.html:2
 #: textpress/templates/admin/index.html:5 textpress/views/admin.py:82
+#: zine/templates/admin/index.html:2 zine/templates/admin/index.html:5
+#: zine/views/admin.py:82
 msgid "Dashboard"
 msgstr "Dashboard"
 #: textpress/templates/admin/index.html:8
 #, python-format
 msgid "Howdy.  Welcome to the TextPress administration interface %(user)s."
 msgstr "Servus.  Willkommen im TextPress Administrationsbereich %(user)s."
 #: textpress/templates/admin/index.html:11
+#: zine/templates/admin/index.html:8
+#, python-format
+msgid "Howdy.  Welcome to the Zine administration interface %(user)s."
+msgstr "Servus.  Willkommen im Zine Administrationsbereich %(user)s."
+#: zine/templates/admin/index.html:11
 #, python-format
 msgid "You have written <strong>%(your_posts)s</strong> post so far."
 …
 msgstr[1] "Du hast bis jetzt <strong>%(your_posts)s</strong> Einträge geschrieben."
 #: textpress/templates/admin/index.html:17
+#: zine/templates/admin/index.html:17
 msgid "Quickstart"
 msgstr "Schnellstart"
+#: textpress/templates/admin/index.html:19
+#: textpress/templates/admin/show_posts.html:44
+#: zine/templates/admin/index.html:19 zine/templates/admin/show_posts.html:44
 msgid "New Post"
 msgstr "Neuer Eintrag"
 #: textpress/templates/admin/index.html:20
+#: zine/templates/admin/index.html:20
 msgid "Moderate Comments"
 msgstr "Kommentare moderieren"
+#: textpress/templates/admin/index.html:21
+#: textpress/templates/admin/show_posts.html:2
+#: textpress/templates/admin/show_posts.html:4
+#: zine/templates/admin/index.html:21 zine/templates/admin/show_posts.html:2
+#: zine/templates/admin/show_posts.html:4
 msgid "Manage Posts"
 msgstr "Einträge verwalten"
 #: textpress/templates/admin/index.html:22
 msgid "Configure TextPress"
 msgstr "TextPress konfigurieren"
 #: textpress/templates/admin/index.html:23
+#: zine/templates/admin/index.html:22
+msgid "Configure Zine"
+msgstr "Zine Konfigurieren"
+#: zine/templates/admin/index.html:23
 msgid "Manage Plugins"
 msgstr "Plugins verwalten"
+#: textpress/templates/admin/index.html:24
+#: textpress/templates/admin/show_users.html:2
+#: textpress/templates/admin/show_users.html:4
+#: zine/templates/admin/index.html:24 zine/templates/admin/show_users.html:2
+#: zine/templates/admin/show_users.html:4
 msgid "Manage Users"
 msgstr "Benutzer verwalten"
 #: textpress/templates/admin/index.html:25
+#: zine/templates/admin/index.html:25
 msgid "Get Help"
 msgstr "Hilfe ansehen"
 #: textpress/templates/admin/index.html:27
+#: zine/templates/admin/index.html:27
 #, python-format
 msgid ""
 …
 "        find answers in the <a href=\"%(support)s\">support section</a> "
 "of the\n"
 "        <a href=\"%(website)s\">TextPress website</a>.\n"
+"        <a href=\"%(website)s\">Zine website</a>.\n"
 "      "
 msgstr ""
 …
 " löst\n"
 "    findest du Antworten in der <a href=\"%(support)s\">Support "
 "Sektion</a>     der <a href=\"%(website)s\">TextPress Webseite</a>.\n"
+"Sektion</a>     der <a href=\"%(website)s\">Zine Webseite</a>.\n"
 "   "
 #: textpress/templates/admin/index.html:37
+#: zine/templates/admin/index.html:37
 msgid "Drafts"
 msgstr "Entwürfe"
 #: textpress/templates/admin/index.html:46
+#: zine/templates/admin/index.html:46
 msgid "Comments Awaiting Approval"
 msgstr "Nicht-bestätigte Kommentare"
 #: textpress/templates/admin/index.html:65
+#: zine/templates/admin/index.html:65
 msgid "Last Posts"
 msgstr "Letzte Einträge"
 #: textpress/templates/admin/index.html:75
 msgid "Planet TextPress"
 msgstr "Planet-TextPress"
 #: textpress/templates/admin/information.html:2
 #: textpress/templates/admin/information.html:4
+#: zine/templates/admin/index.html:75
+msgid "Planet Zine"
+msgstr "Planet Zine"
+#: zine/templates/admin/information.html:2
+#: zine/templates/admin/information.html:4
 msgid "About The System"
 msgstr "Über das System"
 #: textpress/templates/admin/information.html:5
 msgid "TextPress Environment"
 msgstr "TextPress Umgebung"
 #: textpress/templates/admin/information.html:7
 msgid "TextPress Version"
 msgstr "TextPress Version"
 #: textpress/templates/admin/information.html:9
+#: zine/templates/admin/information.html:5
+msgid "Zine Environment"
+msgstr "Zine Umgebung"
+#: zine/templates/admin/information.html:7
+msgid "Zine Version"
+msgstr "Zine Version"
+#: zine/templates/admin/information.html:9
 msgid "Distribution Mode"
 msgstr "Distributionsmodus"
 #: textpress/templates/admin/information.html:11
+#: zine/templates/admin/information.html:11
 msgid "Package Location"
 msgstr "Pfad zum Package"
 #: textpress/templates/admin/information.html:13
+#: zine/templates/admin/information.html:13
 msgid "Shared Data"
 msgstr "Geteilte Daten"
 #: textpress/templates/admin/information.html:15
+#: zine/templates/admin/information.html:15
 msgid "Builtin Templates"
 msgstr "Mitgelieferte Vorlagen"
 #: textpress/templates/admin/information.html:17
+#: zine/templates/admin/information.html:17
 msgid "Builtin Plugins"
 msgstr "Mitgelieferte Plugins"
 #: textpress/templates/admin/information.html:19
+#: zine/templates/admin/information.html:19
 msgid "Path to Instance"
 msgstr "Pfad zur Instanz"
 #: textpress/templates/admin/information.html:21
+#: zine/templates/admin/information.html:21
 msgid "Database URI"
 msgstr "Datenbank URI"
 #: textpress/templates/admin/information.html:24
+#: zine/templates/admin/information.html:24
 msgid "Hosting Environment"
 msgstr "Hosting Umgebung"
 #: textpress/templates/admin/information.html:26
+#: zine/templates/admin/information.html:26
 msgid "Python Version"
 msgstr "Python Version"
 #: textpress/templates/admin/information.html:28
+#: zine/templates/admin/information.html:28
 msgid "Persistent Environment"
 msgstr "Persistente Umgebung"
+#: textpress/templates/admin/information.html:29
+#: textpress/templates/admin/information.html:39
+#: textpress/templates/admin/information.html:89
+#: zine/templates/admin/information.html:29
+#: zine/templates/admin/information.html:39
 msgid "yes"
 msgstr "ja"
+#: textpress/templates/admin/information.html:29
+#: textpress/templates/admin/information.html:35
+#: textpress/templates/admin/information.html:39
+#: textpress/templates/admin/information.html:89
+#: zine/templates/admin/information.html:29
+#: zine/templates/admin/information.html:35
+#: zine/templates/admin/information.html:39
 msgid "no"
 msgstr "nein"
 #: textpress/templates/admin/information.html:30
+#: zine/templates/admin/information.html:30
 msgid "Multithreaded"
 msgstr "Mehrere Threads"
 #: textpress/templates/admin/information.html:33
+#: zine/templates/admin/information.html:33
 #, python-format
 msgid "yes (%(count)s active threads)"
 msgstr "ja (%(count)s aktive Threads)"
 #: textpress/templates/admin/information.html:38
+#: zine/templates/admin/information.html:38
 msgid "Multiprocess"
 msgstr "Mehrere Prozesse"
 #: textpress/templates/admin/information.html:40
+#: zine/templates/admin/information.html:40
 msgid "WSGI Version"
 msgstr "WSGI Version"
 #: textpress/templates/admin/information.html:43
+#: zine/templates/admin/information.html:43
 msgid "URL Endpoints"
 msgstr "URL Endpunkte"
 #: textpress/templates/admin/information.html:44
+#: zine/templates/admin/information.html:44
 #, python-format
 msgid ""
 …
 "  "
 #: textpress/templates/admin/information.html:52
+#: zine/templates/admin/information.html:52
 msgid "Services"
 msgstr "Services"
 #: textpress/templates/admin/information.html:53
+#: zine/templates/admin/information.html:53
 msgid ""
 "\n"
 …
 "    "
 #: textpress/templates/admin/information.html:62
+#: zine/templates/admin/information.html:62
 msgid "Installed APIs"
 msgstr "Installierte APIs"
 #: textpress/templates/admin/information.html:63
+#: zine/templates/admin/information.html:63
 msgid ""
 "\n"
 …
 "  "
 #: textpress/templates/admin/information.html:76 textpress/views/admin.py:122
+#: zine/templates/admin/information.html:76 zine/views/admin.py:122
 msgid "Plugins"
 msgstr "Plugins"
+#: textpress/templates/admin/information.html:84
+#: zine/templates/admin/information.html:80
+msgid "UID"
+msgstr "UID"
+#: zine/templates/admin/information.html:84
 msgid "Location"
 msgstr "Stelle"
+#: textpress/templates/admin/information.html:86
+msgid "UID"
+msgstr "UID"
+#: textpress/templates/admin/information.html:88
+msgid "Active"
+msgstr "Aktiv"
+#: textpress/templates/admin/information.html:93
+#: zine/templates/admin/information.html:89
 msgid "Configuration Variables"
 msgstr "Konfigurationsvariablen"
 #: textpress/templates/admin/information.html:96
 #: textpress/templates/admin/show_pages.html:8
 #: textpress/templates/admin/write_page.html:11
+#: zine/templates/admin/information.html:92
+#: zine/templates/admin/show_pages.html:8
+#: zine/templates/admin/write_page.html:11
 msgid "Key"
 msgstr "Schlüssel"
 #: textpress/templates/admin/information.html:97
+#: zine/templates/admin/information.html:93
 msgid "Value"
 msgstr "Wert"
 #: textpress/templates/admin/information.html:98
+#: zine/templates/admin/information.html:94
 msgid "Default"
 msgstr "Standard"
 #: textpress/templates/admin/information.html:108
+#: zine/templates/admin/information.html:104
 msgid "Template Globals"
 msgstr "Template Globale"
 #: textpress/templates/admin/information.html:114
+#: zine/templates/admin/information.html:110
 msgid "Template Filters"
 msgstr "Template Filter"
 #: textpress/templates/admin/inspect_import.html:2
 #: textpress/templates/admin/inspect_import.html:4
+#: zine/templates/admin/inspect_import.html:2
+#: zine/templates/admin/inspect_import.html:4
 msgid "Inspect Import"
 msgstr "Import durchsuchen"
 #: textpress/templates/admin/inspect_import.html:5
+#: zine/templates/admin/inspect_import.html:5
 msgid ""
 "\n"
 …
 "  "
 #: textpress/templates/admin/inspect_import.html:14
+#: zine/templates/admin/inspect_import.html:14
 msgid "Blog Details"
 msgstr "Blog Details"
 #: textpress/templates/admin/inspect_import.html:22
+#: zine/templates/admin/inspect_import.html:22
 msgid "Dump ID"
 msgstr "Dump ID"
 #: textpress/templates/admin/inspect_import.html:24
+#: zine/templates/admin/inspect_import.html:24
 msgid ""
 "If you have a special installation and want to rewrite the import "
 …
 "Script bearbeiten.  Dafür benötigst du diesen Bezeichner."
 #: textpress/templates/admin/inspect_import.html:29
+#: zine/templates/admin/inspect_import.html:29
 msgid ""
 "\n"
 …
 "    "
 #: textpress/templates/admin/inspect_import.html:38
+#: zine/templates/admin/inspect_import.html:38
 msgid "Create New User"
 msgstr "Neuen Benutzer erstellen"
 #: textpress/templates/admin/inspect_import.html:45
+#: zine/templates/admin/inspect_import.html:45
 msgid "no author information"
 msgstr "Keine Benutzerinformationen"
 #: textpress/templates/admin/inspect_import.html:48
+#: zine/templates/admin/inspect_import.html:48
 msgid ""
 "\n"
 …
 "    "
 #: textpress/templates/admin/inspect_import.html:53 textpress/views/admin.py:83
+#: zine/templates/admin/inspect_import.html:53 zine/views/admin.py:83
 msgid "Posts"
 msgstr "Einträge"
 #: textpress/templates/admin/inspect_import.html:54
+#: zine/templates/admin/inspect_import.html:54
 msgid ""
 "\n"
 …
 "    "
 #: textpress/templates/admin/inspect_import.html:83
+#: zine/templates/admin/inspect_import.html:83
 msgid "Import into Blog"
 msgstr "In Blog importieren"
 #: textpress/templates/admin/layout.html:14
+#: zine/templates/admin/layout.html:14
 msgid "View Blog"
 msgstr "Blog anzeigen"
+#: textpress/templates/admin/layout.html:45
+#, python-format
+msgid "Powered by %(textpress)s %(version)s."
+msgstr "%(textpress)s %(version)s unter der Haube."
+#: textpress/templates/admin/login.html:5
+#: textpress/templates/admin/login.html:11
+#: textpress/templates/admin/login.html:33
+#: zine/templates/admin/layout.html:45
+#, python-format
+msgid "Powered by %(zine)s %(version)s."
+msgstr "%(zine)s %(version)s unter der Haube."
+#: zine/templates/admin/login.html:5 zine/templates/admin/login.html:11
+#: zine/templates/admin/login.html:33
 msgid "Login"
 msgstr "Anmelden"
 #: textpress/templates/admin/login.html:13
+#: zine/templates/admin/login.html:13
 msgid "Successfully logged out"
 msgstr "Erfolgreich abgemeldet"
 #: textpress/templates/admin/login.html:26
+#: zine/templates/admin/login.html:26
 msgid "Remember me"
 msgstr "Erinnere dich an mich"
 #: textpress/templates/admin/maintenance.html:2
 #: textpress/templates/admin/maintenance.html:4 textpress/views/admin.py:137
+#: zine/templates/admin/maintenance.html:2
+#: zine/templates/admin/maintenance.html:4 zine/views/admin.py:136
 msgid "Maintenance"
 msgstr "Wartung"
 #: textpress/templates/admin/maintenance.html:5
+#: zine/templates/admin/maintenance.html:5
 msgid ""
 "\n"
 …
 "  "
 #: textpress/templates/admin/maintenance.html:16
+#: zine/templates/admin/maintenance.html:16
 msgid "Disable maintenance mode"
 msgstr "Wartungsmodus deaktivieren"
 #: textpress/templates/admin/maintenance.html:17
+#: zine/templates/admin/maintenance.html:17
 msgid "Enable maintenance mode"
 msgstr "Wartungsmodus aktivieren"
 #: textpress/templates/admin/pages_config.html:2
 #: textpress/templates/admin/pages_config.html:4
+#: zine/templates/admin/pages_config.html:2
+#: zine/templates/admin/pages_config.html:4
 msgid "Pages Configuration"
 msgstr "Seitenkonfiguration"
 #: textpress/templates/admin/pages_config.html:5
+#: zine/templates/admin/pages_config.html:5
 msgid ""
 "\n"
 …
 "  "
 #: textpress/templates/admin/pages_config.html:10
+#: zine/templates/admin/pages_config.html:10
 msgid "Show page title"
 msgstr "Seitentitel anzeigen"
 #: textpress/templates/admin/pages_config.html:13
+#: zine/templates/admin/pages_config.html:13
 msgid "Show the title of the page on top of the page body"
 msgstr "Zeige den Titel der Seite oberhalb des Seiteninhalts"
 #: textpress/templates/admin/pages_config.html:16
+#: zine/templates/admin/pages_config.html:16
 msgid "Show children"
 msgstr "Kinder anzeigen"
 #: textpress/templates/admin/pages_config.html:19
+#: zine/templates/admin/pages_config.html:19
 msgid "Show the child-pages on the bottom of the page body"
 msgstr "Zeige Kinderseiten unterhalb des Seiteninhalts"
 #: textpress/templates/admin/perform_import.html:5
+#: zine/templates/admin/perform_import.html:5
 msgid ""
 "\n"
 "    The importer converts now all the collected and selected data for\n"
+"    TextPress and inserts it into the database.  This can take some time."
+"\n"
+"    Zine and inserts it into the database.  This can take some time.\n"
 "    <strong>Don't hit cancel!</strong>\n"
 "  "
 …
 "\n"
 "    Der Importer konvertiert all die gesammelten und ausgewählten\n"
 "    Daten für TextPress und fügt sie in die Datenbank ein.  Das kann\n"
+"    Daten für Zine und fügt sie in die Datenbank ein.  Das kann\n"
 "    einige Zeit benötigen.\n"
 "  <strong>Drücke nicht auf Abbrechen</strong>\n"
 "  "
 #: textpress/templates/admin/perform_import.html:11
+#: zine/templates/admin/perform_import.html:11
 msgid ""
 "\n"
 …
 "  "
+#: textpress/templates/admin/plugins.html:2
+#: textpress/templates/admin/plugins.html:4
+#: zine/templates/admin/plugins.html:2 zine/templates/admin/plugins.html:4
 msgid "Plugin Management"
 msgstr "Plugin Verwaltung"
+#: textpress/templates/admin/plugins.html:6
+msgid ""
+"\n"
+"      Plugins extend the functionality of the TextPress system. Because "
+"of\n"
+#: zine/templates/admin/plugins.html:6
+msgid ""
+"\n"
+"      Plugins extend the functionality of the Zine system. Because of\n"
 "      security and convinience reasons you have to enable plugins by "
 "hand.\n"
 …
 msgstr ""
 "\n"
 "    Plugins können die Funktionalität von TextPress erweitern.  Plugins\n"
+"    Plugins können die Funktionalität von Zine erweitern.  Plugins\n"
 "    müssen von Hand aktiviert werden.  Einige Plugins arbeiten "
 "möglicherweise\n"
 …
 "   "
 #: textpress/templates/admin/plugins.html:15
+#: zine/templates/admin/plugins.html:15
 msgid "Plugin"
 msgstr "Plugin"
 #: textpress/templates/admin/plugins.html:16
+#: zine/templates/admin/plugins.html:16
 msgid "Version"
 msgstr "Version"
 #: textpress/templates/admin/plugins.html:18
+#: zine/templates/admin/plugins.html:18
 msgid "Activate"
 msgstr "Aktivieren"
 #: textpress/templates/admin/plugins.html:26
+#: zine/templates/admin/plugins.html:26
 #, python-format
 msgid ""
 …
 "          "
 #: textpress/templates/admin/plugins.html:30
+#: zine/templates/admin/plugins.html:30
 #, python-format
 msgid ""
 …
 "          "
 #: textpress/templates/admin/plugins.html:37
+#: zine/templates/admin/plugins.html:37
 msgid "Remove plugin"
 msgstr "Plugin entfernen"
 #: textpress/templates/admin/plugins.html:45
+#: zine/templates/admin/plugins.html:45
 msgid "Add New Plugin"
 msgstr "Neues Plugin hinzufügen"
 #: textpress/templates/admin/plugins.html:46
 msgid ""
 "\n"
 "      If you have a plugin as TextPress <tt>.plugin</tt> file you can "
 "upload it\n"
 "      to your TextPress instance using the following form. Plugins added "
 "this way\n"
+#: zine/templates/admin/plugins.html:46
+msgid ""
+"\n"
+"      If you have a plugin as Zine <tt>.plugin</tt> file you can upload "
+"it\n"
+"      to your Zine instance using the following form. Plugins added this "
+"way\n"
 "      can also be completely removed.\n"
 "    "
 msgstr ""
 "\n"
 "     Wenn du ein plugin als TextPress <tt>.plugin</tt> Datei hast, kannst"
 "\n"
 "     du es in deine TextPress Instanz importieren in dem du es hier\n"
+"     Wenn du ein plugin als Zine <tt>.plugin</tt> Datei hast, kannst"
+"\n"
+"     du es in deine Zine Instanz importieren in dem du es hier\n"
 "     hochlädst.  Plugins die auf diese Weise hinzugefügt werden können\n"
 "     auch so wieder entfernt werden.\n"
 "    "
 #: textpress/templates/admin/plugins.html:54
+#: zine/templates/admin/plugins.html:54
 msgid "Update"
 msgstr "Aktualisieren"
 #: textpress/templates/admin/plugins.html:56
+#: zine/templates/admin/plugins.html:56
 msgid "Disable Plugin Guard"
 msgstr "Plugin-Wache deaktivieren"
 #: textpress/templates/admin/plugins.html:58
+#: zine/templates/admin/plugins.html:58
 msgid "Enable Plugin Guard"
 msgstr "Plugin-Wache aktivieren"
 #: textpress/templates/admin/remove_plugin.html:2
 #: textpress/templates/admin/remove_plugin.html:4
+#: zine/templates/admin/remove_plugin.html:2
+#: zine/templates/admin/remove_plugin.html:4
 msgid "Remove Plugin"
 msgstr "Plugin entfernen"
 #: textpress/templates/admin/remove_plugin.html:7
+#: zine/templates/admin/remove_plugin.html:7
 #, python-format
 msgid ""
 …
 "    "
 #: textpress/templates/admin/show_comments.html:16
+#: zine/templates/admin/show_comments.html:16
 msgid "No comments."
 msgstr "Keine Kommentare."
 #: textpress/templates/admin/show_comments.html:26
+#: zine/templates/admin/show_comments.html:26
 msgid "Select All"
 msgstr "Alle markieren"
 #: textpress/templates/admin/show_pages.html:2
 #: textpress/templates/admin/show_pages.html:4 textpress/views/admin.py:107
 #: textpress/views/admin.py:120
+#: zine/templates/admin/show_pages.html:2
+#: zine/templates/admin/show_pages.html:4 zine/views/admin.py:107
+#: zine/views/admin.py:120
 msgid "Pages"
 msgstr "Seiten"
+#: textpress/templates/admin/show_pages.html:7
+#: textpress/templates/admin/show_posts.html:17
+#: textpress/templates/admin/show_tags.html:7
+#: textpress/templates/admin/show_users.html:7
+#: zine/templates/admin/show_pages.html:7
+#: zine/templates/admin/show_posts.html:17
+#: zine/templates/admin/show_tags.html:7 zine/templates/admin/show_users.html:7
 msgid "ID"
 msgstr "ID"
 #: textpress/templates/admin/show_pages.html:10
+#: zine/templates/admin/show_pages.html:10
 msgid "Navigation Position"
 msgstr "Navigationsposition"
 #: textpress/templates/admin/show_pages.html:17
+#: zine/templates/admin/show_pages.html:17
 msgid "No position given"
 msgstr "Keine Position angegeben"
 #: textpress/templates/admin/show_pages.html:20
+#: zine/templates/admin/show_pages.html:20
 msgid "No pages."
 msgstr "Keine Seiten."
 #: textpress/templates/admin/show_pages.html:25
 #: textpress/templates/admin/write_page.html:2
 #: textpress/templates/admin/write_page.html:4
+#: zine/templates/admin/show_pages.html:25
+#: zine/templates/admin/write_page.html:2
+#: zine/templates/admin/write_page.html:4
 msgid "New Page"
 msgstr "Neue Seite"
 #: textpress/templates/admin/show_posts.html:33
+#: zine/templates/admin/show_posts.html:33
 msgid "untagged"
 msgstr "unmarkiert"
 #: textpress/templates/admin/show_posts.html:39
+#: zine/templates/admin/show_posts.html:39
 msgid "No posts."
 msgstr "Keine Einträge."
+#: textpress/templates/admin/show_tags.html:2
+#: textpress/templates/admin/show_tags.html:4
+#: zine/templates/admin/show_tags.html:2 zine/templates/admin/show_tags.html:4
 msgid "Manage Tags"
 msgstr "Einträge verwalten"
 #: textpress/templates/admin/show_tags.html:10
+#: zine/templates/admin/show_tags.html:10
 msgid "Tagged Posts"
 msgstr "Markierte Einträge"
 #: textpress/templates/admin/show_tags.html:21
+#: zine/templates/admin/show_tags.html:21
 msgid "No tags."
 msgstr "Keine Markierungen"
 #: textpress/templates/admin/show_tags.html:26
+#: zine/templates/admin/show_tags.html:26
 msgid "New Tag"
 msgstr "Neue Markierung"
 #: textpress/templates/admin/show_users.html:9
+#: zine/templates/admin/show_users.html:9
 msgid "Realname"
 msgstr "Voller Name"
 #: textpress/templates/admin/show_users.html:10
+#: zine/templates/admin/show_users.html:10
 msgid "Mail"
 msgstr "E-Mail"
+#: textpress/templates/admin/theme.html:2
+#: textpress/templates/admin/theme.html:4
+#: zine/templates/admin/theme.html:2 zine/templates/admin/theme.html:4
 msgid "Theme Manager"
 msgstr "Themaverwaltung"
 #: textpress/templates/admin/theme.html:17
+#: zine/templates/admin/theme.html:17
 #, python-format
 msgid "by %(author)s"
 msgstr "von %(author)s"
 #: textpress/templates/admin/theme.html:28
+#: zine/templates/admin/theme.html:28
 msgid "Configure Theme"
 msgstr "Thema konfigurieren"
 #: textpress/templates/admin/unblock_comment.html:2
 #: textpress/templates/admin/unblock_comment.html:4
+#: zine/templates/admin/unblock_comment.html:2
+#: zine/templates/admin/unblock_comment.html:4
 msgid "Unblock Comment"
 msgstr "Kommentar nicht mehr blockieren"
 #: textpress/templates/admin/unblock_comment.html:7
+#: zine/templates/admin/unblock_comment.html:7
 #, python-format
 msgid ""
 …
 "    "
 #: textpress/templates/admin/url_options.html:2
 #: textpress/templates/admin/url_options.html:4
 #: textpress/templates/admin/urls.html:2 textpress/templates/admin/urls.html:4
+#: zine/templates/admin/url_options.html:2
+#: zine/templates/admin/url_options.html:4 zine/templates/admin/urls.html:2
+#: zine/templates/admin/urls.html:4
 msgid "URL Options"
 msgstr "URL Einstellungen"
 #: textpress/templates/admin/url_options.html:5
+#: zine/templates/admin/url_options.html:5
 msgid ""
 "\n"
 …
 "  "
+#: textpress/templates/admin/url_options.html:14
+#: textpress/templates/admin/urls.html:14
+#: zine/templates/admin/url_options.html:14 zine/templates/admin/urls.html:14
 msgid "Blog URL Prefix"
 msgstr "Blog URL Präfix"
+#: textpress/templates/admin/url_options.html:16
+#: textpress/templates/admin/urls.html:16
+#: zine/templates/admin/url_options.html:16 zine/templates/admin/urls.html:16
 msgid "Admin URL Prefix"
 msgstr "Admin URL Präfix"
+#: textpress/templates/admin/url_options.html:18
+#: textpress/templates/admin/urls.html:18
+#: zine/templates/admin/url_options.html:18 zine/templates/admin/urls.html:18
 msgid "Tags URL Prefix"
 msgstr "URL Präfix für Markierungen"
+#: textpress/templates/admin/url_options.html:20
+#: textpress/templates/admin/urls.html:20
+#: zine/templates/admin/url_options.html:20 zine/templates/admin/urls.html:20
 msgid "Author Profiles URL Prefix"
 msgstr "URL Präfix für Autoren"
 #: textpress/templates/admin/urls.html:5
+#: zine/templates/admin/urls.html:5
 msgid ""
 "\n"
 …
 "  "
 #: textpress/templates/admin/write_page.html:13
+#: zine/templates/admin/write_page.html:13
 msgid ""
 "\n"
 …
 "       "
 #: textpress/templates/admin/write_page.html:18
+#: zine/templates/admin/write_page.html:18
 msgid "Content"
 msgstr "Inhalt"
 #: textpress/templates/admin/write_page.html:29
+#: zine/templates/admin/write_page.html:29
 msgid "Parent Page"
 msgstr "Elternseite"
 #: textpress/templates/admin/write_page.html:40
+#: zine/templates/admin/write_page.html:40
 msgid "Position"
 msgstr "Position"
 #: textpress/templates/admin/write_page.html:46
+#: zine/templates/admin/write_page.html:46
 msgid "View Page"
 msgstr "Seite anzeigen"
 #: textpress/templates/admin/file_uploads/browse.html:2
 #: textpress/templates/admin/file_uploads/browse.html:4
+#: zine/templates/admin/file_uploads/browse.html:2
+#: zine/templates/admin/file_uploads/browse.html:4
 msgid "Browse Uploads"
 msgstr "Hochgeladene Dateien durchsuchen"
 #: textpress/templates/admin/file_uploads/browse.html:7
+#: zine/templates/admin/file_uploads/browse.html:7
 msgid "Filename"
 msgstr "Dateiname"
 #: textpress/templates/admin/file_uploads/browse.html:8
+#: zine/templates/admin/file_uploads/browse.html:8
 msgid "Size"
 msgstr "Größe"
 #: textpress/templates/admin/file_uploads/browse.html:9
+#: zine/templates/admin/file_uploads/browse.html:9
 msgid "Mimetype"
 msgstr "Mimetype"
 #: textpress/templates/admin/file_uploads/browse.html:10
+#: zine/templates/admin/file_uploads/browse.html:10
 msgid "Actions"
 msgstr "Aktionen"
 #: textpress/templates/admin/file_uploads/browse.html:23
+#: zine/templates/admin/file_uploads/browse.html:23
 msgid "No files uploaded so far."
 msgstr "Es wuren noch keine Dateien hochgeladen."
 #: textpress/templates/admin/file_uploads/browse.html:29
+#: zine/templates/admin/file_uploads/browse.html:29
 msgid "Upload New File"
 msgstr "Neue Datei hochladen"
 #: textpress/templates/admin/file_uploads/config.html:2
 #: textpress/templates/admin/file_uploads/config.html:4
+#: zine/templates/admin/file_uploads/config.html:2
+#: zine/templates/admin/file_uploads/config.html:4
 msgid "Configure Uploads"
 msgstr "Hochgeladene Dateien Konfigurieren"
 #: textpress/templates/admin/file_uploads/config.html:6
+#: zine/templates/admin/file_uploads/config.html:6
 msgid ""
 "\n"
 …
 "    "
 #: textpress/templates/admin/file_uploads/config.html:9
+#: zine/templates/admin/file_uploads/config.html:9
 msgid ""
 "\n"
 …
 "    "
 #: textpress/templates/admin/file_uploads/config.html:15
+#: zine/templates/admin/file_uploads/config.html:15
 msgid ""
 "\n"
 …
 "    "
 #: textpress/templates/admin/file_uploads/config.html:23
+#: zine/templates/admin/file_uploads/config.html:23
 msgid ""
 "\n"
 …
 "    "
 #: textpress/templates/admin/file_uploads/config.html:33
+#: zine/templates/admin/file_uploads/config.html:33
 msgid "Upload files to"
 msgstr "hochladen nach"
 #: textpress/templates/admin/file_uploads/config.html:35
+#: zine/templates/admin/file_uploads/config.html:35
 msgid "Mimetype Mapping"
 msgstr "Mimetype-Zuordnung"
 #: textpress/templates/admin/file_uploads/config.html:37
+#: zine/templates/admin/file_uploads/config.html:37
 msgid "Path to ImageMagick"
 msgstr "Pfad zu ImageMagick"
 #: textpress/templates/admin/file_uploads/config.html:42
+#: zine/templates/admin/file_uploads/config.html:42
 msgid "Cannot find ImageMagick"
 msgstr "Kann ImageMagick nicht finden"
 #: textpress/templates/admin/file_uploads/delete.html:2
 #: textpress/templates/admin/file_uploads/delete.html:4
+#: zine/templates/admin/file_uploads/delete.html:2
+#: zine/templates/admin/file_uploads/delete.html:4
 msgid "Delete File"
 msgstr "Datei löschen"
 #: textpress/templates/admin/file_uploads/delete.html:7
+#: zine/templates/admin/file_uploads/delete.html:7
 #, python-format
 msgid ""
 …
 "    "
+#: textpress/templates/admin/file_uploads/thumbnailer.html:2
+#: textpress/templates/admin/file_uploads/thumbnailer.html:4
+#: textpress/views/admin.py:100
+#: zine/templates/admin/file_uploads/thumbnailer.html:2
+#: zine/templates/admin/file_uploads/thumbnailer.html:4 zine/views/admin.py:100
 msgid "Create Thumbnails"
 msgstr "Vorschaubilder erstellen"
 #: textpress/templates/admin/file_uploads/thumbnailer.html:5
+#: zine/templates/admin/file_uploads/thumbnailer.html:5
 msgid ""
 "\n"
 …
 "  "
 #: textpress/templates/admin/file_uploads/thumbnailer.html:11
+#: zine/templates/admin/file_uploads/thumbnailer.html:11
 msgid "Create Thumbnail For"
 msgstr "Vorschaubild erstellen für"
 #: textpress/templates/admin/file_uploads/thumbnailer.html:18
+#: zine/templates/admin/file_uploads/thumbnailer.html:18
 msgid "Width"
 msgstr "Breite"
 #: textpress/templates/admin/file_uploads/thumbnailer.html:20
+#: zine/templates/admin/file_uploads/thumbnailer.html:20
 msgid "Height"
 msgstr "Höhe"
 #: textpress/templates/admin/file_uploads/thumbnailer.html:22
+#: zine/templates/admin/file_uploads/thumbnailer.html:22
 msgid "Keep Aspect Ratio"
 msgstr "Bildverhältig beibehalten"
 #: textpress/templates/admin/file_uploads/thumbnailer.html:24
+#: zine/templates/admin/file_uploads/thumbnailer.html:24
 msgid "Thumbnail Filename"
 msgstr "Dateiname für Vorschaubild"
 #: textpress/templates/admin/file_uploads/thumbnailer.html:29
+#: zine/templates/admin/file_uploads/thumbnailer.html:29
 msgid "Create Thumbnail"
 msgstr "Vorschaubild erstellen"
 #: textpress/templates/admin/file_uploads/thumbnailer.html:60
+#: zine/templates/admin/file_uploads/thumbnailer.html:60
 msgid "You haven't uploaded any images yet."
 msgstr "Du hast noch keine Bilder hochgeladen."
 #: textpress/templates/admin/file_uploads/upload.html:2
 #: textpress/templates/admin/file_uploads/upload.html:4
+#: zine/templates/admin/file_uploads/upload.html:2
+#: zine/templates/admin/file_uploads/upload.html:4
 msgid "Upload File"
 msgstr "Datei hochladen"
 #: textpress/templates/admin/file_uploads/upload.html:5
+#: zine/templates/admin/file_uploads/upload.html:5
 msgid ""
 "\n"
 …
 "  "
 #: textpress/templates/admin/file_uploads/upload.html:10
+#: zine/templates/admin/file_uploads/upload.html:10
 msgid "File to upload"
 msgstr "Hochzuladene Datei"
 #: textpress/templates/admin/file_uploads/upload.html:12
+#: zine/templates/admin/file_uploads/upload.html:12
 msgid "Rename to"
 msgstr "Umbenennen nach"
 #: textpress/templates/admin/file_uploads/upload.html:14
+#: zine/templates/admin/file_uploads/upload.html:14
 msgid "Overwrite"
 msgstr "Überschreiben"
 #: textpress/templates/admin/file_uploads/upload.html:18
+#: zine/templates/admin/file_uploads/upload.html:18
 msgid "Overwrite an already uploaded file with the same name."
 msgstr "Überschreibe bereits hochgeladene Datei mit selben Namen."
+#: textpress/templates/admin/file_uploads/upload.html:25
+#: textpress/views/admin.py:98
+#: zine/templates/admin/file_uploads/upload.html:25 zine/views/admin.py:98
 msgid "Upload"
 msgstr "Hochladen"
 #: textpress/templates/admin/widgets/latest_comments.html:4
 #: textpress/templates/admin/widgets/latest_posts.html:4
 #: textpress/templates/admin/widgets/post_archive_summary.html:15
+#: zine/templates/admin/widgets/latest_comments.html:4
+#: zine/templates/admin/widgets/latest_posts.html:4
+#: zine/templates/admin/widgets/post_archive_summary.html:15
 msgid "Limit"
 msgstr "Limit"
 #: textpress/templates/admin/widgets/latest_comments.html:8
+#: zine/templates/admin/widgets/latest_comments.html:8
 msgid "Ignore Blocked Comments"
 msgstr "Geblockte Kommentare ignorieren"
 #: textpress/templates/admin/widgets/post_archive_summary.html:4
+#: zine/templates/admin/widgets/post_archive_summary.html:4
 msgid "Detail"
 msgstr "Details"
 #: textpress/templates/admin/widgets/post_archive_summary.html:7
+#: zine/templates/admin/widgets/post_archive_summary.html:7
 msgid "Days"
 msgstr "Tage"
 #: textpress/templates/admin/widgets/post_archive_summary.html:8
+#: zine/templates/admin/widgets/post_archive_summary.html:8
 msgid "Months"
 msgstr "Monate"
 #: textpress/templates/admin/widgets/post_archive_summary.html:9
+#: zine/templates/admin/widgets/post_archive_summary.html:9
 msgid "Years"
 msgstr "Jahre"
 #: textpress/templates/admin/widgets/tagcloud.html:4
+#: zine/templates/admin/widgets/tagcloud.html:4
 msgid "Maximum Tags"
 msgstr "Maximale Anzahl an Tags"
 #: textpress/templates/widgets/pages_navigation.html:2
+#: zine/templates/widgets/pages_navigation.html:2
 msgid "Navigation"
 msgstr "Navigation"
 #: textpress/templates/widgets/post_archive_summary.html:11
+#: zine/templates/widgets/post_archive_summary.html:11
 msgid "Complete archive"
 msgstr "Vollständiges Archiv"
 #: textpress/utils/admin.py:43
+#: zine/utils/admin.py:43
 msgid "Error"
 msgstr "Fehler"
 #: textpress/utils/admin.py:129
+#: zine/utils/admin.py:129
 msgid "The configuration file could not be written."
 msgstr "Die Konfigurationsdatei konnte nicht geschrieben werden."
 #: textpress/utils/mail.py:90
+#: zine/utils/mail.py:90
 msgid "TLS enabled but server does not support TLS"
 msgstr "TLS wurde aktiviert aber der Server unterstützt kein TLS"
 #: textpress/views/admin.py:84 textpress/views/admin.py:89
 #: textpress/views/admin.py:108 textpress/views/admin.py:113
+#: zine/views/admin.py:84 zine/views/admin.py:89 zine/views/admin.py:108
+#: zine/views/admin.py:113
 msgid "Overview"
 msgstr "Übersicht"
 #: textpress/views/admin.py:91
+#: zine/views/admin.py:91
 #, python-format
 msgid "Awaiting Moderation (%d)"
 msgstr "Unmoderiert (%d)"
 #: textpress/views/admin.py:94
+#: zine/views/admin.py:94
 #, python-format
 msgid "Spam (%d)"
 msgstr "Spam (%d)"
 #: textpress/views/admin.py:96 textpress/views/admin.py:121
+#: zine/views/admin.py:96 zine/views/admin.py:121
 msgid "Uploads"
 msgstr "Dateien"
 #: textpress/views/admin.py:97
+#: zine/views/admin.py:97
 msgid "Browse"
 msgstr "Durchsuchen"
 #: textpress/views/admin.py:109
+#: zine/views/admin.py:109
 msgid "Write Page"
 msgstr "Seite schreiben"
 #: textpress/views/admin.py:112
+#: zine/views/admin.py:112
 msgid "Users"
 msgstr "Benutzer"
 #: textpress/views/admin.py:116
+#: zine/views/admin.py:116
 msgid "Options"
 msgstr "Optionen"
 #: textpress/views/admin.py:117
+#: zine/views/admin.py:117
 msgid "Basic"
 msgstr "Einfach"
 #: textpress/views/admin.py:118
+#: zine/views/admin.py:118
 msgid "URLs"
 msgstr "URLs"
 #: textpress/views/admin.py:123
+#: zine/views/admin.py:123
 msgid "Cache"
 msgstr "Cache"
 #: textpress/views/admin.py:131
+#: zine/views/admin.py:129
 msgid "Information"
 msgstr "Information"
 #: textpress/views/admin.py:132
+#: zine/views/admin.py:130
 msgid "Help"
 msgstr "Hilfe"
 #: textpress/views/admin.py:133
+#: zine/views/admin.py:131
 msgid "About"
 msgstr "Über"
 #: textpress/views/admin.py:141
+#: zine/views/admin.py:143
 msgid "System"
 msgstr "System"
 #: textpress/views/admin.py:164
 #, python-format
 msgid ""
 "TextPress is in maintenance mode. Don't forget to <a href=\"%s\">turn it "
 "off again</a> once you finish your changes."
 msgstr ""
 "TextPress ist im Wartungsmodus.  Vergiss nicht ihn <a href=\"%s\">wieder "
+#: zine/views/admin.py:166
+#, python-format
+msgid ""
+"Zine is in maintenance mode. Don't forget to <a href=\"%s\">turn it off "
+"again</a> once you finish your changes."
+msgstr ""
+"Zine ist im Wartungsmodus.  Vergiss nicht ihn <a href=\"%s\">wieder "
 "zu deaktivieren</a> wenn du fertig bist."
 #: textpress/views/admin.py:175
+#: zine/views/admin.py:177
 #, python-format
 msgid "Could not activate plugin “%(name)s”: %(error)s"
 msgstr "Konnte das Plugin \"%(name)s\" nicht aktivieren: %(error)s"
 #: textpress/views/admin.py:180
+#: zine/views/admin.py:182
 #, python-format
 msgid ""
 …
 "Pluginwache."
 #: textpress/views/admin.py:188
+#: zine/views/admin.py:190
 msgid "unknown file"
 msgstr "Unbekannte Datei"
 #: textpress/views/admin.py:256
+#: zine/views/admin.py:258
 msgid "Text here..."
 msgstr "Text hier..."
 #: textpress/views/admin.py:258
+#: zine/views/admin.py:260
 msgid "Untitled Page"
 msgstr "Seite schreiben"
 #: textpress/views/admin.py:356
+#: zine/views/admin.py:358
 msgid "You have to provide a title."
 msgstr "Du musst einen Titel angeben."
 #: textpress/views/admin.py:358
+#: zine/views/admin.py:360
 msgid "Your title is too long."
 msgstr "Der Titel ist zu lang."
 #: textpress/views/admin.py:361
+#: zine/views/admin.py:363
 msgid "You have to provide a body."
 msgstr "Du musst einen Text angeben."
 #: textpress/views/admin.py:368
+#: zine/views/admin.py:370
 msgid "Invalid post status"
 msgstr "Ungültiger Status"
 #: textpress/views/admin.py:375
+#: zine/views/admin.py:377
 msgid ""
 "You cannot change the text of a post which parser does not exist any "
 …
 " existiert."
 #: textpress/views/admin.py:380 textpress/views/admin.py:708
+#: zine/views/admin.py:382 zine/views/admin.py:710
 #, python-format
 msgid "Unknown parser “%s”."
 msgstr "Unbekannter parser \"%s\"."
 #: textpress/views/admin.py:384
+#: zine/views/admin.py:386
 msgid "Invalid publication date."
 msgstr "Ungültiges Datum der Veröffentlichung"
 #: textpress/views/admin.py:393
+#: zine/views/admin.py:395
 #, python-format
 msgid "Unknown author “%s”."
 msgstr "Unbekannter Author \"%s\"."
 #: textpress/views/admin.py:398
+#: zine/views/admin.py:400
 msgid "A slug cannot contain a slash."
 msgstr "Ein URL Bezeichner darf keinen Schrägstrich beinhalten."
 #: textpress/views/admin.py:400
+#: zine/views/admin.py:402
 msgid "Your slug is too long"
 msgstr "Der URL Bezeichner ist zu lang."
 #: textpress/views/admin.py:409
+#: zine/views/admin.py:411
 #, python-format
 msgid "Unknown tag “%s”."
 msgstr "Unbekannte Markierung \"%s\"."
 #: textpress/views/admin.py:460
+#: zine/views/admin.py:462
 msgid "No URLs pinged so far because the post is not publicly available"
 msgstr ""
 …
 "erreichbar ist"
 #: textpress/views/admin.py:463
+#: zine/views/admin.py:465
 msgid ""
 "Could not ping URLs because the parser for the post is not available any "
 …
 "länger verfügbar ist."
 #: textpress/views/admin.py:477
+#: zine/views/admin.py:479
 #, python-format
 msgid "Could not ping %(url)s: %(error)s"
 msgstr "Konnte %(url)s nicht pingen: %(error)s"
 #: textpress/views/admin.py:482
+#: zine/views/admin.py:484
 #, python-format
 msgid "%s was pinged successfully."
 msgstr "%s wurde erfolgreich gepingt."
 #: textpress/views/admin.py:486
+#: zine/views/admin.py:488
 #, python-format
 msgid "The post %s was created successfully."
 msgstr "Der Eintrag %s wurde erfolgreich erstellt."
 #: textpress/views/admin.py:489
+#: zine/views/admin.py:491
 #, python-format
 msgid "The post %s was updated successfully."
 msgstr "Der Eintrag %s wurde erfolgreich erstellt."
 #: textpress/views/admin.py:502 textpress/views/admin.py:752
+#: zine/views/admin.py:504 zine/views/admin.py:754
 #, python-format
 msgid "Missing Parser “%s”"
 msgstr "Parser \"%s\" fehlt."
 #: textpress/views/admin.py:504
+#: zine/views/admin.py:506
 #, python-format
 msgid ""
 "This post was created with the parser “%(parser)s” that is not installed "
 "any longer.  Because of that TextPress doesn't allow modifcations on the "
 "text until you either change the parser or reinstall/activate the plugin "
 "that provided that parser."
+"any longer.  Because of that Zine doesn't allow modifcations on the text "
+"until you either change the parser or reinstall/activate the plugin that "
+"provided that parser."
 msgstr ""
 "Der Eintrag wurde mit dem Parser \"%(parser)s\" erstellt, der nicht mehr "
 "installiert ist.  Aus diesem Grund erlaubt TextPress keine Veränderungen "
+"installiert ist.  Aus diesem Grund erlaubt Zine keine Veränderungen "
 "am Text bis entweder der Parser für diesen Text geändert wurder oder der "
 "Parser neu installiert wurde."
 #: textpress/views/admin.py:519
+#: zine/views/admin.py:521
 msgid "Published"
 msgstr "Veröffentlicht"
 #: textpress/views/admin.py:520
+#: zine/views/admin.py:522
 msgid "Draft"
 msgstr "Entwurf"
 #: textpress/views/admin.py:521
+#: zine/views/admin.py:523
 msgid "Private"
 msgstr "Privat"
 #: textpress/views/admin.py:555
+#: zine/views/admin.py:557
 #, python-format
 msgid "The post %s was deleted successfully."
 msgstr "Der Eintrag %s wurde erfolgreich gelöscht."
 #: textpress/views/admin.py:597
+#: zine/views/admin.py:599
 msgid "Approved all the selected comments."
 msgstr "Alle markierten Kommentare wurden bestätigt."
 #: textpress/views/admin.py:618
+#: zine/views/admin.py:620
 msgid "All Comments"
 msgstr "Alle Kommentare"
 #: textpress/views/admin.py:625
+#: zine/views/admin.py:627
 msgid "Comments Awaiting Moderation"
 msgstr "Unmoderierte Kommentare"
 #: textpress/views/admin.py:632
+#: zine/views/admin.py:634
 msgid "Spam"
 msgstr "Spam"
 #: textpress/views/admin.py:645
+#: zine/views/admin.py:647
 #, python-format
 msgid "Comments for “%s”"
 msgstr "Kommentare für \"%s\""
 #: textpress/views/admin.py:693
+#: zine/views/admin.py:695
 msgid "You have to give the comment an author."
 msgstr "Du musst dem Kommentar einen Author geben."
 #: textpress/views/admin.py:696
+#: zine/views/admin.py:698
 msgid "You have to provide a valid mail address for the author."
 msgstr "Du musst eine gültige E-Mail Adresse für den Autor angeben."
 #: textpress/views/admin.py:703
+#: zine/views/admin.py:705
 msgid "You cannot change the text of a comment if the parser is missing."
 msgstr "Du kannst den Text eines Kommentars nicht ändern wenn der Parser fehlt."
 #: textpress/views/admin.py:710
+#: zine/views/admin.py:712
 msgid "Need a text for this comment."
 msgstr "Es muss ein Text für dieses Kommentar angegeben werden."
 #: textpress/views/admin.py:712
+#: zine/views/admin.py:714
 msgid "You have to ommitt the url or provide a valid one."
 msgstr "Du musst die URL leer lassen oder eine gültige angeben."
 #: textpress/views/admin.py:718
+#: zine/views/admin.py:720
 msgid "Invalid date for comment."
 msgstr "Ungültiges Datum für Kommentar."
 #: textpress/views/admin.py:739 textpress/views/admin.py:855
+#: zine/views/admin.py:741 zine/views/admin.py:857
 #, python-format
 msgid "blocked by %s"
 msgstr "geblockt von %s"
 #: textpress/views/admin.py:743
+#: zine/views/admin.py:745
 #, python-format
 msgid "Comment by %s moderated successfully."
 msgstr "Kommentar von %s wurde erfolgreich moderiert."
 #: textpress/views/admin.py:754
+#: zine/views/admin.py:756
 #, python-format
 msgid ""
 "This comment was submitted when the parser “%(parser)s” was the comment "
 "parser. Because it is not available any longer TextPress doesn't allow "
+"parser. Because it is not available any longer Zine doesn't allow "
 "modifcations on the text until you reinstall/activate the plugin that "
 "provided that parser."
 …
 "Das Kommentar wurde abgesendet als der Parser \"%(parser)s\" der Parser "
 "für Kommentare war.  Weil dieser nicht mehr länger verfügbar ist erlaubt "
 "TextPress keine Veränderungen am Text bis der Parser wieder installiert "
+"Zine keine Veränderungen am Text bis der Parser wieder installiert "
 "wurde."
 #: textpress/views/admin.py:799
+#: zine/views/admin.py:801
 #, python-format
 msgid "Comment by %s deleted successfully."
 msgstr "Kommentar von %s wurde erfolgreich gelöscht."
 #: textpress/views/admin.py:828
+#: zine/views/admin.py:830
 #, python-format
 msgid "Comment by %s approved successfully."
 msgstr "Kommentar von %s wurde erfolgreich bestätigt.."
 #: textpress/views/admin.py:860
+#: zine/views/admin.py:862
 #, python-format
 msgid "Comment by %s blocked successfully."
 msgstr "Kommentar von %s wurde erfolgreich geblockt."
 #: textpress/views/admin.py:924
+#: zine/views/admin.py:926
 msgid "You have to give the tag a name."
 msgstr "Du musst der Markierung einen Namen geben."
 #: textpress/views/admin.py:926
+#: zine/views/admin.py:928
 #, python-format
 msgid "The slug \"%s\" is not unique."
 msgstr "Der Bezeichner \"%s\" ist nicht eindeutig."
 #: textpress/views/admin.py:931
+#: zine/views/admin.py:933
 #, python-format
 msgid "Tag %s created successfully."
 msgstr "Markierung %s wurde erfolgreich erstellt."
 #: textpress/views/admin.py:938
+#: zine/views/admin.py:940
 #, python-format
 msgid "Tag %s updated successfully."
 msgstr "Markierung %s wurde erfolgreich verändert."
 #: textpress/views/admin.py:979
+#: zine/views/admin.py:981
 #, python-format
 msgid "Tag %s deleted successfully."
 msgstr "Markierung %s wurde erfolgreich gelöscht."
 #: textpress/views/admin.py:1040
+#: zine/views/admin.py:1042
 msgid "Username is required."
 msgstr "Der Benutzername ist verpflichtend."
 #: textpress/views/admin.py:1043
+#: zine/views/admin.py:1045
 #, python-format
 msgid "Username “%s” is taken."
 msgstr "Der Benutzername \"%s\" ist bereits in Verwendung."
 #: textpress/views/admin.py:1046
+#: zine/views/admin.py:1048
 msgid "You have to provide a password."
 msgstr "Du musst ein Passwort angeben."
 #: textpress/views/admin.py:1053
+#: zine/views/admin.py:1055
 msgid "The user needs a valid mail address."
 msgstr "Der Benutzer benötigt eine gültige E-Mail Adresse."
 #: textpress/views/admin.py:1060
+#: zine/views/admin.py:1062
 msgid "Invalid user role."
 msgstr "Ungültige Rolle für Benutzer."
 #: textpress/views/admin.py:1067
+#: zine/views/admin.py:1069
 #, python-format
 msgid "User %s created successfully."
 msgstr "Benutzer %s erfolgreich erstellt"
 #: textpress/views/admin.py:1080
+#: zine/views/admin.py:1082
 #, python-format
 msgid "User %s edited successfully."
 msgstr "Benutzer %s wurde erfolgreich bearbeitet."
 #: textpress/views/admin.py:1141
+#: zine/views/admin.py:1143
 msgid "You cannot delete yourself."
 msgstr "Du kannst dich selbst nicht löschen."
 #: textpress/views/admin.py:1170
+#: zine/views/admin.py:1172
 #, python-format
 msgid "User %s deleted successfully."
 msgstr "Benutzer %s wurde erfolgreich gelöscht."
 #: textpress/views/admin.py:1197
+#: zine/views/admin.py:1199
 msgid "Configuration altered successfully."
 msgstr "Konfiguration wurde erfolgreich verändert."
 #: textpress/views/admin.py:1223
+#: zine/views/admin.py:1225
 msgid "You have to provide a blog title"
 msgstr "Du musst einen Titel für das Blog angeben."
 #: textpress/views/admin.py:1227
+#: zine/views/admin.py:1229
 msgid "You have to provide a valid e-mail address for the blog e-mail field."
 msgstr "Du musst eine E-Mail Adresse für das Blog E-Mail Feld angeben."
 #: textpress/views/admin.py:1248 textpress/views/admin.py:1252
+#: zine/views/admin.py:1250 zine/views/admin.py:1254
 #, python-format
 msgid "Unknown parser %s."
 msgstr "Unbekannter Parser %s."
 #: textpress/views/admin.py:1257
+#: zine/views/admin.py:1259
 msgid "Posts per page must be at least 1"
 msgstr "Die Anzahl der Beiträge pro Seite muss zumindest 1 sein"
 #: textpress/views/admin.py:1259
+#: zine/views/admin.py:1261
 msgid "Posts per page must be a valid integer"
 msgstr "Die Anzahl der Beiträge pro Seite muss eine Zahl sein"
 #: textpress/views/admin.py:1326
+#: zine/views/admin.py:1328
 msgid "URL prefix may not contain greater than or smaller than signs."
 msgstr "Der URL Präfix darf nicht ein größer oder kleiner als Zeichen beinhalten."
 #: textpress/views/admin.py:1329
+#: zine/views/admin.py:1331
 msgid "URL prefixes have to start with a slash."
 msgstr "URL Präfixe müssen mit einem Slash beginnen."
 #: textpress/views/admin.py:1331
+#: zine/views/admin.py:1333
 msgid "URL prefixes may not end with a slash."
 msgstr "ein URL Präfix darf nicht mit einem Slash enden."
 #: textpress/views/admin.py:1340
+#: zine/views/admin.py:1342
 msgid "URL configuration could not be changed."
 msgstr "Die URL Konfiguration konnte nicht geändert werden."
 #: textpress/views/admin.py:1343
+#: zine/views/admin.py:1345
 msgid "URL configuration changed."
 msgstr "Die URL Konfiguration wurde geändert."
 #: textpress/views/admin.py:1367
+#: zine/views/admin.py:1369
 msgid "Theme changed successfully."
 msgstr "Das Thema wurde erfolgreich geändert."
 #: textpress/views/admin.py:1369
+#: zine/views/admin.py:1371
 msgid "Theme could not be changed."
 msgstr "Das Thema konnte nicht geändert werden."
 #: textpress/views/admin.py:1383
+#: zine/views/admin.py:1385
 msgid "This theme is not configurable"
 msgstr "Dieses Thema kann nicht konfiguriert werden"
 #: textpress/views/admin.py:1397
+#: zine/views/admin.py:1399
 msgid ""
 "Plugin guard enabled successfully. Errors occuring in plugins during "
 …
 "werden nun abgefangen."
 #: textpress/views/admin.py:1400
+#: zine/views/admin.py:1402
 msgid "Plugin guard could not be enabled."
 msgstr "Die Pluginwache konnte nicht aktiviert werden."
 #: textpress/views/admin.py:1403
+#: zine/views/admin.py:1405
 msgid "Plugin guard disabled successfully."
 msgstr "Die Pluginwache wurde erfolgreich aktiviert."
 #: textpress/views/admin.py:1405
+#: zine/views/admin.py:1407
 msgid "Plugin guard could not be disabled."
 msgstr "Die Pluginwache konnte nicht deaktiviert werden."
 #: textpress/views/admin.py:1414
+#: zine/views/admin.py:1416
 #, python-format
 msgid ""
 …
 "\"%(plugin)s\" geladen."
 #: textpress/views/admin.py:1418
+#: zine/views/admin.py:1420
 #, python-format
 msgid "Plugin “%s” activated."
 msgstr "Plugin \"%s\" aktiviert."
 #: textpress/views/admin.py:1423
+#: zine/views/admin.py:1425
 #, python-format
 msgid ""
 …
 "installiere %(dependency)s."
 #: textpress/views/admin.py:1428
+#: zine/views/admin.py:1430
 #, python-format
 msgid "Plugin “%s” could not be loaded"
 msgstr "Plugin \"%s\" konnte nicht geladen werden"
 #: textpress/views/admin.py:1433
+#: zine/views/admin.py:1435
 #, python-format
 msgid "Plugin “%s” deactivated."
 msgstr "Plugin \"%s\" wurde deaktiviert."
 #: textpress/views/admin.py:1444
+#: zine/views/admin.py:1446
 msgid ""
 "Could not install the plugin because the file uploaded is not a valid "
 …
 "Plugin Datei ist."
 #: textpress/views/admin.py:1448
 msgid ""
 "The plugin uploaded has a newer package version than this TextPress "
+#: zine/views/admin.py:1450
+msgid ""
+"The plugin uploaded has a newer package version than this Zine "
 "installation can handle."
 msgstr ""
 "Das hochgeladene Plugin hat eine neuere Package Version als diese "
 "TextPress installation verarbeiten kann."
 #: textpress/views/admin.py:1452
+"Zine installation verarbeiten kann."
+#: zine/views/admin.py:1454
 msgid "A plugin with the same UID is already installed. Aborted."
 msgstr "Ein plugin mit der gleichen UID wurde bereits installiert. Abbruch."
 #: textpress/views/admin.py:1455
+#: zine/views/admin.py:1457
 msgid ""
 "Could not install the package because the installer wasn't able to write "
 …
 "Informationen nicht schreiben konnte.  Falsche Zugriffsrechte?"
 #: textpress/views/admin.py:1459
+#: zine/views/admin.py:1461
 msgid "An unknown error occoured"
 msgstr "Ein unbekannter Fehler ist aufgetreten"
 #: textpress/views/admin.py:1461
+#: zine/views/admin.py:1463
 #, python-format
 msgid "Plugin “%s” added succesfully. You can now enable it in the plugin list."
 …
 "aktivieren."
 #: textpress/views/admin.py:1491
+#: zine/views/admin.py:1493
 #, python-format
 msgid ""
 …
 "  Falsche Zugriffsrechte?"
 #: textpress/views/admin.py:1494
+#: zine/views/admin.py:1496
 #, python-format
 msgid "The plugin “%s” was removed from the instance successfully."
 msgstr "Das Plugin \"%s\" wurde erfolgreich entfernt."
 #: textpress/views/admin.py:1523
+#: zine/views/admin.py:1525
 msgid "The cache was cleared successfully."
 msgstr "Der cache wurde erfolgreich geleert."
 #: textpress/views/admin.py:1529
+#: zine/views/admin.py:1531
 msgid "Invalid cache system selected."
 msgstr "Ungültiges Cache System ausgewählt."
 #: textpress/views/admin.py:1533
+#: zine/views/admin.py:1535
 msgid "Cache timeout must be positive integer."
 msgstr "Cache-Timeout muss eine positive Ganzzahl sein."
 #: textpress/views/admin.py:1537
+#: zine/views/admin.py:1539
 msgid "Cache timeout must be greater than 10 seconds."
 msgstr "Cache-Timeout muss größer als 10 Sekunden sein."
 #: textpress/views/admin.py:1559
+#: zine/views/admin.py:1561
 msgid "Updated cache settings."
 msgstr "Cache Einstellungen aktualisiert."
 #: textpress/views/admin.py:1567
+#: zine/views/admin.py:1569
 msgid "Simple Cache"
 msgstr "Einfacher Cache"
 #: textpress/views/admin.py:1568
+#: zine/views/admin.py:1570
 msgid "memcached"
 msgstr "memcached"
 #: textpress/views/admin.py:1569
+#: zine/views/admin.py:1571
 msgid "Filesystem"
 msgstr "Dateisystem"
 #: textpress/views/admin.py:1570
+#: zine/views/admin.py:1572
 msgid "No Cache"
 msgstr "Kein Cache"
 #: textpress/views/admin.py:1628
+#: zine/views/admin.py:1630
 msgid "Maintenance mode disabled.  The blog is now publicly available."
 msgstr "Wartungsmodus deaktiviert.  Das Blog ist nun öffentlich verfügbar."
 #: textpress/views/admin.py:1707
+#: zine/views/admin.py:1709
 #, python-format
 msgid "The imported dump “%s” was deleted successfully."
 msgstr "Der Import \"%s\" wurde erfolgreich gelöscht."
 #: textpress/views/admin.py:1807
+#: zine/views/admin.py:1809
 msgid "You have to enter your old password."
 msgstr "Du musst das alte Passwort eingeben."
 #: textpress/views/admin.py:1809
+#: zine/views/admin.py:1811
 msgid "Your old password is wrong."
 msgstr "Das alte Passwort ist falsch."
 #: textpress/views/admin.py:1812
+#: zine/views/admin.py:1814
 msgid "Your new password cannot be empty."
 msgstr "Das neue Passwort darf nicht leer sein."
 #: textpress/views/admin.py:1815
+#: zine/views/admin.py:1817
 msgid "The passwords do not match."
 msgstr "Die Passwörter stimmen nicht überein."
 #: textpress/views/admin.py:1819
+#: zine/views/admin.py:1821
 msgid "Password changed successfully."
 msgstr "Das Passwort wurde erfolgreich geändert."
 #: textpress/views/admin.py:1920
+#: zine/views/admin.py:1922
 msgid "You have to provide a title"
 msgstr "Du musst einen Titel angeben"
 #: textpress/views/admin.py:1927
+#: zine/views/admin.py:1929
 msgid "You have to provide a key"
 msgstr "Du musst einen Schlüssel angeben"
 #: textpress/views/admin.py:1934
+#: zine/views/admin.py:1936
 msgid "You have to provide some content"
 msgstr "Du musst einen Inhalt angeben"
 #: textpress/views/admin.py:1944
+#: zine/views/admin.py:1946
 msgid "This key is already in use"
 msgstr "Dieser Schlüssel wird bereits verwendet"
 #: textpress/views/admin.py:2009
+#: zine/views/admin.py:2011
 #, python-format
 msgid "The page %s was deleted successfully."
 msgstr "Die Seite %s wurde erfolgreich gelöscht."
 #: textpress/views/admin.py:2030
+#: zine/views/admin.py:2032
 #, python-format
 msgid "Could not create upload target folder %s."
 msgstr "Konnte den Ordner %s für hochgeladene Dateien nicht erstellen."
 #: textpress/views/admin.py:2037
+#: zine/views/admin.py:2039
 msgid "No file uploaded."
 msgstr "Keine Datei hochgeladen"
 #: textpress/views/admin.py:2039
+#: zine/views/admin.py:2041
 msgid "Invalid filename requested."
 msgstr "Ungültiger Dateinamen angefordert."
 #: textpress/views/admin.py:2041
+#: zine/views/admin.py:2043
 #, python-format
 msgid "A file with the filename %s exists already."
 msgstr "Eine Datei mit den Namen %s existiert bereits."
 #: textpress/views/admin.py:2049
+#: zine/views/admin.py:2051
 #, python-format
 msgid "File %s uploaded successfully."
 msgstr "Datei %s wurde erfolgreich hochgeladen."
 #: textpress/views/admin.py:2055 textpress/views/admin.py:2133
+#: zine/views/admin.py:2057 zine/views/admin.py:2135
 #, python-format
 msgid "Could not write file %s."
 msgstr "Konnte Datei %s nicht schreiben."
 #: textpress/views/admin.py:2081
+#: zine/views/admin.py:2083
 #, python-format
 msgid ""
 …
 " in der <a href=\"%(config)s\">Konfiguration</a> angeben."
 #: textpress/views/admin.py:2085
+#: zine/views/admin.py:2087
 #, python-format
 msgid ""
 …
 "href\"%(config)s\">überprüfe die Konfiguration</a>)"
 #: textpress/views/admin.py:2088
+#: zine/views/admin.py:2090
 #, python-format
 msgid "Cannot find <a href=\"%(im)s\">ImageMagick</a>."
 msgstr "Konnte <a href=\"%(im)s\">ImageMagick</a> nicht finden."
 #: textpress/views/admin.py:2099
+#: zine/views/admin.py:2101
 msgid "You have to specify a source image"
 msgstr "Du musst ein Quellbild angeben"
 #: textpress/views/admin.py:2104
+#: zine/views/admin.py:2106
 #, python-format
 msgid "The image %s does not exist."
 msgstr "Das Bild %s existiert nicht."
 #: textpress/views/admin.py:2109
+#: zine/views/admin.py:2111
 msgid "You have to define at least the width of the thumbnail."
 msgstr "Du musst zumindest die Breite des Vorschaubilds angeben."
 #: textpress/views/admin.py:2113
+#: zine/views/admin.py:2115
 msgid "Thumbnail dimensions must be integers."
 msgstr "Die Abmessungen des Vorschaubildes müssen Zahlen sein."
 #: textpress/views/admin.py:2119
+#: zine/views/admin.py:2121
 msgid "You have to specify a filename for the thumbnail."
 msgstr "Du musst einen Dateinamen für das Vorschaubild angeben."
 #: textpress/views/admin.py:2122
+#: zine/views/admin.py:2124
 msgid "Invalid filename for thumbnail."
 msgstr "Ungültiger Dateiname für Vorschaubild."
 #: textpress/views/admin.py:2124
+#: zine/views/admin.py:2126
 msgid "An file with this name exists already."
 msgstr "Eine Datei mit diesem Namen existiert bereits."
 #: textpress/views/admin.py:2142
+#: zine/views/admin.py:2144
 #, python-format
 msgid "Thumbnail %s was created successfully."
 msgstr "Das Vorschaubild %s wurde erfolgreich erstellt."
 #: textpress/views/admin.py:2184
+#: zine/views/admin.py:2186
 msgid "Upload folder changed successfully."
 msgstr "Der Ordner für Hochgeladene Dateien wurde erfolgreich erstellt."
 #: textpress/views/admin.py:2186
+#: zine/views/admin.py:2188
 msgid "Upload folder could not be changed."
 msgstr "Der Ordner für Hochgeladene Dateien konnte nicht geändert werden."
 #: textpress/views/admin.py:2191
+#: zine/views/admin.py:2193
 msgid "Changed path to ImageMagick"
 msgstr "Pfad zu ImageMagick wurde geändert"
 #: textpress/views/admin.py:2193
+#: zine/views/admin.py:2195
 msgid "ImageMagick is searched on the system path now."
 msgstr "ImageMagick wird nun systemweit gesucht."
 #: textpress/views/admin.py:2195
+#: zine/views/admin.py:2197
 msgid "Path to ImageMagick could not be changed."
 msgstr "Der Pfad zu ImageMagick konnte nicht geändert werden."
 #: textpress/views/admin.py:2200
+#: zine/views/admin.py:2202
 msgid "Upload mimetype mapping altered successfully."
 msgstr "Mimetype-Verknüpfungen für hochgeladene Dateien wurde geändert."
 #: textpress/views/admin.py:2202
+#: zine/views/admin.py:2204
 msgid "Upload mimetype mapping could not be altered."
 msgstr "Mimetype-Verknüpfungen konnte nicht geändert werden."
 #: textpress/views/admin.py:2228
+#: zine/views/admin.py:2230
 #, python-format
 msgid "Could not delete file %s."
 msgstr "Konnte Datei %s nicht löschen."
 #: textpress/views/admin.py:2231
+#: zine/views/admin.py:2233
 #, python-format
 msgid "File %s deleted successfully."
 msgstr "Datei %s wurde erfolgreich gelöscht."
 #: textpress/views/admin.py:2278
+#: zine/views/admin.py:2280
 #, python-format
 msgid "User %s does not exist."
 msgstr "Benutzer %s existiert nicht."
 #: textpress/views/admin.py:2283
+#: zine/views/admin.py:2285
 msgid "Incorrect password."
 msgstr "Falsches Passwort"
 #: textpress/views/admin.py:2285
+#: zine/views/admin.py:2287
 msgid "You have to enter a username."
 msgstr "Du musst einen Benutzernamen angeben."
 #: textpress/views/blog.py:49 textpress/views/blog.py:83
+#: zine/views/blog.py:49 zine/views/blog.py:83
 msgid "Recent Posts Feed"
 msgstr "Feed für Letze Einträge"
 #: textpress/views/blog.py:116
+#: zine/views/blog.py:116
 #, python-format
 msgid "All posts tagged %s"
 msgstr "Alle Einträge markiert mit %s"
 #: textpress/views/blog.py:165
+#: zine/views/blog.py:165
 #, python-format
 msgid "All posts written by %s"
 msgstr "Alle Einträge geschrieben von %s"
 #: textpress/views/blog.py:241
+#: zine/views/blog.py:241
 msgid "You have to enter your name."
 msgstr "Du musst einen Namen eingeben."
 #: textpress/views/blog.py:243
+#: zine/views/blog.py:243
 msgid "Your name is too long."
 msgstr "Dein Name ist zu lang."
 #: textpress/views/blog.py:246
+#: zine/views/blog.py:246
 msgid "You have to enter a valid mail address."
 msgstr "Du musst eine gültige E-Mail Adresse angeben."
 #: textpress/views/blog.py:248
+#: zine/views/blog.py:248
 msgid "Your E-Mail address is too long."
 msgstr "Deine E-Mail Adresse ist zu lang."
 #: textpress/views/blog.py:251
+#: zine/views/blog.py:251
 msgid "You have to enter a valid URL or omit the field."
 msgstr "Du musst eine gültige URL eingeben oder das Feld leer lassen."
 #: textpress/views/blog.py:253
+#: zine/views/blog.py:253
 msgid "The URL is too long."
 msgstr "Die URL ist zu lang."
 #: textpress/views/blog.py:259
+#: zine/views/blog.py:259
 msgid "Your comment is too short."
 msgstr "Dein Kommentar ist zu kurz."
 #: textpress/views/blog.py:261
+#: zine/views/blog.py:261
 msgid "Your comment is too long."
 msgstr "Dein Kommentar ist zu lang."
 #: textpress/views/blog.py:294
+#: zine/views/blog.py:294
 msgid "Comment waiting for approval"
 msgstr "Kommentar muss erst von einem Administrator bestätigt werden."
 #: textpress/views/blog.py:309
+#: zine/views/blog.py:309
 msgid "Comments Feed"
 msgstr "Kommentar-Feed"
 #: textpress/views/blog.py:418
+#: zine/views/blog.py:418
 #, python-format
 msgid "Comment %(num)d on %(post)s"
 msgstr "Kommentar %(num)d von %(post)s"
 #: textpress/websetup/__init__.py:94
+#: zine/websetup/__init__.py:94
 #, python-format
 msgid ""
 …
 " bevor das Setup fortfahren kann."
 #: textpress/websetup/__init__.py:116
+#: zine/websetup/__init__.py:116
 msgid "You have to provide a username."
 msgstr "Du musst einen Benutzernamen angeben."
 #: textpress/websetup/__init__.py:119
+#: zine/websetup/__init__.py:119
 msgid "You have to enter a mail address."
 msgstr "Du musst eine gültige E-Mail Adresse angeben."
 #: textpress/websetup/__init__.py:121
+#: zine/websetup/__init__.py:121
 msgid "The mail address is not valid."
 msgstr "Deine E-Mail Adresse ist nicht gültig."
 #: textpress/websetup/__init__.py:124
+#: zine/websetup/__init__.py:124
 msgid "You have to enter a password."
 msgstr "Du musst ein Passwort eingeben."
 #: textpress/websetup/__init__.py:126
+#: zine/websetup/__init__.py:126
 msgid "The two passwords do not match."
 msgstr "Die Passwörter stimmen nicht überein."
 #: textpress/websetup/__init__.py:185
+#: zine/websetup/__init__.py:185
 #, python-format
 msgid ""
 …
 "Bitte passe die Zugriffsrechte an und probiere nochmal."
 #: textpress/websetup/templates/admin_account.html:3
+#: zine/websetup/templates/admin_account.html:3
 msgid "Administrator Account"
 msgstr "Administratorzugang"
+#: textpress/websetup/templates/admin_account.html:4
+msgid ""
+"\n"
+"    In order to log into your TextPress installation you have to provide "
+"a\n"
+#: zine/websetup/templates/admin_account.html:4
+msgid ""
+"\n"
+"    In order to log into your Zine installation you have to provide a\n"
 "    login name for the administration user. You can later rename or "
 "delete\n"
 …
 "  "
 #: textpress/websetup/templates/admin_account.html:14
+#: zine/websetup/templates/admin_account.html:14
 msgid "Password (repeat)"
 msgstr "Passwort (wiederholen)"
 #: textpress/websetup/templates/database.html:3
+#: zine/websetup/templates/database.html:3
 msgid "Database"
 msgstr "Datenbank"
+#: textpress/websetup/templates/database.html:4
+msgid ""
+"\n"
+"    TextPress uses a database to store blog posts and other information. "
+"The\n"
+#: zine/websetup/templates/database.html:4
+msgid ""
+"\n"
+"    Zine uses a database to store blog posts and other information. The\n"
 "    only information it requires therefore is a database URI. Depending "
 "on your\n"
 …
 msgstr ""
 "\n"
+"    TextPress verwendet eine Datenbank um Blog Einträge und andere "
+"Informationen\n"
+"    zu speichern.  Die einzige Information die es dazu benötigt ist die "
+"Datenbank\n"
+"    URI.  Abhängig von der Datenbank sieht diese URI anders aus.  Die "
+"folgende\n"
+"    Tabelle führt einige Beispiel URIs auf.\n"
+"  "
+#: textpress/websetup/templates/database.html:11
+"    Zine benutzt eine Datenbank um die Einträge und andere Informationen\n"
+"    zu speicher.  Dazu musst du die URI für die Datenbank angeben.  Abhängig\n"
+"    vom Datenbanksystem ist diese etwas unterschiedlich.\n"
+"  "
+#: zine/websetup/templates/database.html:11
 msgid "SQLite"
 msgstr "SQLite"
 #: textpress/websetup/templates/database.html:12
+#: zine/websetup/templates/database.html:12
 msgid "sqlite:///database.db"
 msgstr "sqlite:///datenbank.db"
 #: textpress/websetup/templates/database.html:13
+#: zine/websetup/templates/database.html:13
 msgid ""
 "\n"
 …
 "      "
 #: textpress/websetup/templates/database.html:20
+#: zine/websetup/templates/database.html:20
 msgid "MySQL"
 msgstr "MySQL"
 #: textpress/websetup/templates/database.html:21
+#: zine/websetup/templates/database.html:21
 msgid "mysql://username:password@host/database_name"
 msgstr "mysql://benutzername:passwort@server/datenbank_name"
 #: textpress/websetup/templates/database.html:22
+#: zine/websetup/templates/database.html:22
 msgid "Postgres"
 msgstr "Postgres"
 #: textpress/websetup/templates/database.html:23
+#: zine/websetup/templates/database.html:23
 msgid "postgres://username:password@host/database_name"
 msgstr "postgres://benutzername:passwort@server/datenbank_name"
 #: textpress/websetup/templates/error.html:3
+#: zine/websetup/templates/error.html:3
 msgid "Setup Failed"
 msgstr "Setup Fehlgeschlagen"
+#: textpress/websetup/templates/error.html:4
+msgid ""
+"The websetup was not able to finish the TextPress installation "
+"successfully."
+#: zine/websetup/templates/error.html:4
+msgid "The websetup was not able to finish the Zine installation successfully."
 msgstr "Das Websetup konnte die Installation nicht erfolgreich beenden."
 #: textpress/websetup/templates/error.html:5
 msgid ""
 "\n"
 "    If you need help for setting up TextPress have a look at the support\n"
+#: zine/websetup/templates/error.html:5
+msgid ""
+"\n"
+"    If you need help for setting up Zine have a look at the support\n"
 "    wepage that will be there once a beta is available :-)\n"
 "  "
 msgstr ""
 "\n"
 "    Wenn du Hilfe benötigst TextPress zu installieren schau auf die\n"
+"    Wenn du Hilfe benötigst um Zine zu installieren schau auf die\n"
 "    Support Webseite sobald die Beta erhältlich ist :-)\n"
 "  "
 #: textpress/websetup/templates/finished.html:3
+#: zine/websetup/templates/finished.html:3
 msgid "Setup Finished"
 msgstr "Setup Fertiggstellt"
 #: textpress/websetup/templates/finished.html:4
+#: zine/websetup/templates/finished.html:4
 msgid ""
 "\n"
 …
 "  "
 #: textpress/websetup/templates/layout.html:5
 #: textpress/websetup/templates/layout.html:159
 msgid "TextPress Setup"
 msgstr "TextPress Installation"
 #: textpress/websetup/templates/layout.html:168
+#: zine/websetup/templates/layout.html:5
+#: zine/websetup/templates/layout.html:159
+msgid "Zine Setup"
+msgstr "Zine Setup"
+#: zine/websetup/templates/layout.html:168
 msgid "An Error Occoured"
 msgstr "Ein Fehler ist aufgetreten"
 #: textpress/websetup/templates/layout.html:174
+#: zine/websetup/templates/layout.html:174
 msgid "Next"
 msgstr "Weiter"
 #: textpress/websetup/templates/layout.html:174
+#: zine/websetup/templates/layout.html:174
 msgid "Install"
 msgstr "Installieren"
 #: textpress/websetup/templates/layout.html:175
+#: zine/websetup/templates/layout.html:175
 msgid "Back"
 msgstr "Zurück"
 #: textpress/websetup/templates/start.html:3
 msgid "Welcome To The TextPress Setup"
 msgstr "Willkommen zum TextPress Setup"
 #: textpress/websetup/templates/start.html:4
 msgid ""
 "\n"
 "    Welcome to the TextPress Setup. This Wizard will ask you some\n"
 "    basic questions and setup TextPress for you.\n"
 "  "
 msgstr ""
 "\n"
 "    Willkommen zur TextPress Installation.  Dieser Assistent wird\n"
+#: zine/websetup/templates/start.html:3
+msgid "Welcome To The Zine Setup"
+msgstr "Willkommen zum Zine Setup"
+#: zine/websetup/templates/start.html:4
+msgid ""
+"\n"
+"    Welcome to the Zine Setup. This Wizard will ask you some\n"
+"    basic questions and setup Zine for you.\n"
+"  "
+msgstr ""
+"\n"
+"    Willkommen zur Zine Installation.  Dieser Assistent wird\n"
 "    dir ein paar einfache Fragen stellen und TextPress für dich\n"
 "    konfigurieren.\n"
 "  "
 #: textpress/websetup/templates/start.html:8
+#: zine/websetup/templates/start.html:8
 msgid ""
 "\n"
 …
 "  "
 #: textpress/websetup/templates/summary.html:3
+#: zine/websetup/templates/summary.html:3
 msgid "Setup Starting"
 msgstr "Installation Starten"
+#: textpress/websetup/templates/summary.html:4
+msgid ""
+"\n"
+"    TextPress knows now about all the information it needs to setup your\n"
+"    instance. After you click on the install button TextPress will create"
+"\n"
+#: zine/websetup/templates/summary.html:4
+msgid ""
+"\n"
+"    Zine knows now about all the information it needs to setup your\n"
+"    instance. After you click on the install button Zine will create\n"
 "    the database tables and insert the default information. Right after "
 "that\n"
+"    TextPress will be online in maintenance mode which means that it's "
+"only\n"
+"    Zine will be online in maintenance mode which means that it's only\n"
 "    visible to the administrator, all other users will get a message that"
 "\n"
 …
 msgstr ""
 "\n"
+"    TextPress kennt nun alle Informationen die es benötigt.  Wenn du\n"
+"    auf den \"Installieren\" Knopf drückst wird TextPress die\n"
+"    Datenbank-Tabellen und die Konfiguration erstellen.  Danach ist\n"
+"    TextPress im Wartungsmodus online.\n"
+"  "
+"    Zine kennt jetzt alle Informationen die es benötigt um dein Blog\n"
+"    anzulegen.  Nach der Installation wird Zine im Wartungsmodus online sein.\n"
+"    Solange dieser aktiviert ist kannst nur du das Blog betrachten."
+"  "

zine/importers/init.py

-                      r395
+                      r465
 # -*- coding: utf-8 -*-
 """
     textpress.importers
     ~~~~~~~~~~~~~~~~~~~
+    zine.importers
+    ~~~~~~~~~~~~~~
     Package for all kinds of importers.  This implements the basic import
 …
 from pickle import dump, load, HIGHEST_PROTOCOL
 from datetime import datetime
 from textpress.api import _, require_role
 from textpress.database import db, posts
 from textpress.utils.xml import escape, get_etree
 from textpress.models import ROLE_ADMIN, ROLE_AUTHOR, COMMENT_MODERATED
+from zine.api import _, require_role
+from zine.database import db, posts
+from zine.utils.xml import escape, get_etree
+from zine.models import ROLE_ADMIN, ROLE_AUTHOR, COMMENT_MODERATED
 …
     # import models here because they have the same names as our
     # importer objects this module exports
     from textpress.models import User, Tag, Post, Comment
+    from zine.models import User, Tag, Post, Comment
     author_mapping = {}
     label_mapping = {}
 …
     the changes are written back to the filesystem as new dump.
     `app` can either be a `TextPress` object that is also bound to the active
+    `app` can either be a `Zine` object that is also bound to the active
     thread or a string with the path to the instance folder.  The latter is
     useful for simple scripts that should rewrite imports.
 …
     close = False
     if isinstance(app, basestring):
         from textpress import make_textpress
         app = make_textpress(app, bind_to_thread=True)
+        from zine import make_zine
+        app = make_zine(app, bind_to_thread=True)
         close = True
 …
     def render_admin_page(self, template_name, **context):
         """Shortcut for rendering an page for the admin."""
         from textpress.views.admin import render_admin_response
+        from zine.views.admin import render_admin_response
         return render_admin_response(template_name, 'maintenance.import',
                                      **context)
 …
 from textpress.importers.wordpress import WordPressImporter
 from textpress.importers.blogger import BloggerImporter
+from zine.importers.wordpress import WordPressImporter
+from zine.importers.blogger import BloggerImporter
 all_importers = [WordPressImporter, BloggerImporter]

zine/importers/blogger.py

-                      r348
+                      r465
 # -*- coding: utf-8 -*-
 """
     textpress.importers.blogger
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    zine.importers.blogger
+    ~~~~~~~~~~~~~~~~~~~~~~
     Implements an importer for Blogger.com using the GData blogger API.
 …
 . Data dumping
     The textpress importer framework takes over once the dump is "enqueued"
+    The zine importer framework takes over once the dump is "enqueued"
     Authentication
 …
         * Posts
         * Comments
         * Categories (called labels in TextPress)
+        * Categories (called labels in Zine)
     The blogger client uses atom feeds to retrieve the data. Each component
 …
     ------------
     This is the process by which the blogger data is dumped into the TextPress
     import system. Essentially it involves creating a textpress.importers.Blog
     instance with the necessary data. Instances of textpress.importers.Post,
     testpress.importers.Author, textpress.importers.Comment and
     textpress.importers.Label are created.
+    This is the process by which the blogger data is dumped into the Zine
+    import system. Essentially it involves creating a zine.importers.Blog
+    instance with the necessary data. Instances of zine.importers.Post,
+    testpress.importers.Author, zine.importers.Comment and
+    zine.importers.Label are created.
     Construction of these objects is a simple matter of passing the correct
 …
     Once the blog object is created, it is enqueued into the import system
     (which then allows the user to select which posts/authors/metadata they
     would like imported. At this point TextPress takes over.
+    would like imported. At this point Zine takes over.
 …
     service = None
 from textpress.application import redirect, url_for
 from textpress.importers import Importer, Blog, Label, Author, Post, Comment
 from textpress.api import _
 from textpress.utils.admin import flash
 from textpress.utils.dates import parse_iso8601
+from zine.application import redirect, url_for
+from zine.importers import Importer, Blog, Label, Author, Post, Comment
+from zine.api import _
+from zine.utils.admin import flash
+from zine.utils.dates import parse_iso8601
 …
 def _create_blogger_service():
     blogger_service = service.GDataService()
     blogger_service.source = 'TextPress_BloggerImporter-1.0'
+    blogger_service.source = 'Zine_BloggerImporter-1.0'
     blogger_service.service = 'blogger'
     blogger_service.server = 'www.blogger.com'

zine/importers/wordpress.py

-                      r335
+                      r465
 # -*- coding: utf-8 -*-
 """
     textpress.importers.wordpress
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    zine.importers.wordpress
+    ~~~~~~~~~~~~~~~~~~~~~~~~
     Implements an importer for WordPress extended RSS feeds.
 …
 from time import strptime
 from datetime import datetime
 from textpress.api import *
 from textpress.importers import Importer, Blog, Label, Author, Post, Comment
 from textpress.utils.admin import flash
 from textpress.utils.xml import _html_entities, get_etree, escape
 from textpress.utils.xxx import CSRFProtector, StreamReporter, \
+from zine.api import *
+from zine.importers import Importer, Blog, Label, Author, Post, Comment
+from zine.utils.admin import flash
+from zine.utils.xml import _html_entities, get_etree, escape
+from zine.utils.xxx import CSRFProtector, StreamReporter, \
      make_hidden_fields
 from textpress.models import COMMENT_UNMODERATED, COMMENT_MODERATED
+from zine.models import COMMENT_UNMODERATED, COMMENT_MODERATED

zine/models.py

-                      r461
+                      r465
 # -*- coding: utf-8 -*-
 """
     textpress.models
     ~~~~~~~~~~~~~~~~
+    zine.models
+    ~~~~~~~~~~~
     The core models and query helper functions.
 …
 from datetime import date, datetime, timedelta
 from textpress.database import users, tags, posts, post_links, post_tags, \
+from zine.database import users, tags, posts, post_links, post_tags, \
      comments, db, pages
 from textpress.utils import build_tag_uri
 from textpress.utils.admin import Pagination, gen_slug
 from textpress.utils.crypto import gen_pwhash
 from textpress.utils.validators import check_pwhash
 from textpress.application import get_application, get_request, url_for
+from zine.utils import build_tag_uri
+from zine.utils.admin import Pagination, gen_slug
+from zine.utils.crypto import gen_pwhash
+from zine.utils.validators import check_pwhash
+from zine.application import get_application, get_request, url_for
 …
     If you change something on this model, even default values, keep in mind
     that the websetup does not use this model to create the admin account
     because at that time the TextPress system is not yet ready. Also update
     the code in `textpress.websetup.WebSetup.start_setup`.
+    because at that time the Zine system is not yet ready. Also update
+    the code in `zine.websetup.WebSetup.start_setup`.
     """
 …
     def role_as_string(self):
         """Human readable version of the role id."""
         from textpress.api import _
+        from zine.api import _
         if self.role == ROLE_ADMIN:
             return _('Administrator')
 …
     def _set_raw_intro(self, value):
         from textpress.parsers import parse
         from textpress.fragment import dump_tree
+        from zine.parsers import parse
+        from zine.fragment import dump_tree
         tree = parse(value, self.parser, 'post-intro')
         self._raw_intro = value
 …
     def _get_intro(self):
         if not hasattr(self, '_intro_cache'):
             from textpress.fragment import load_tree
+            from zine.fragment import load_tree
             self._intro_cache = load_tree(self.parser_data['intro'])
         return self._intro_cache
     def _set_intro(self, value):
         from textpress.fragment import Fragment, dump_tree
+        from zine.fragment import Fragment, dump_tree
         if not isinstance(value, Fragment):
             raise TypeError('fragment required, otherwise use raw_intro')
 …
     def _set_raw_body(self, value):
         from textpress.parsers import parse
         from textpress.fragment import dump_tree
+        from zine.parsers import parse
+        from zine.fragment import dump_tree
         tree = parse(value, self.parser, 'post-body')
         self._raw_body = value
 …
     def _get_body(self):
         if not hasattr(self, '_body_cache'):
             from textpress.fragment import load_tree
+            from zine.fragment import load_tree
             self._body_cache = load_tree(self.parser_data['body'])
         return self._body_cache
     def _set_body(self, value):
         from textpress.fragment import Fragment, dump_tree
+        from zine.fragment import Fragment, dump_tree
         if not isinstance(value, Fragment):
             raise TypeError('fragment required, otherwise use raw_body')
 …
         undefined.
         """
         from textpress.parsers import parse
+        from zine.parsers import parse
         found = set()
         for text in self.raw_intro, self.raw_body:
 …
     def _set_raw_body(self, value):
         from textpress.parsers import parse
         from textpress.fragment import dump_tree
+        from zine.parsers import parse
+        from zine.fragment import dump_tree
         tree = parse(value, self.parser, 'comment')
         self._raw_body = value
 …
     def _get_body(self):
         if not hasattr(self, '_body_cache'):
             from textpress.fragment import load_tree
+            from zine.fragment import load_tree
             self._body_cache = load_tree(self.parser_data['body'])
         return self._body_cache
     def _set_body(self, value):
         from textpress.fragment import Fragment, dump_tree
+        from zine.fragment import Fragment, dump_tree
         if not isinstance(value, Fragment):
             raise TypeError('fragment required, otherwise use raw_body')
 …
     def _set_raw_body(self, value):
         from textpress.parsers import parse
         from textpress.fragment import dump_tree
+        from zine.parsers import parse
+        from zine.fragment import dump_tree
         tree = parse(value, self.extra['parser'], 'page-body')
         self._raw_body = value
 …
     def _get_body(self):
         if not hasattr(self, '_body_cache'):
             from textpress.fragment import load_tree
+            from zine.fragment import load_tree
             self._body_cache = load_tree(self.extra['body'])
         return self._body_cache
     def _set_body(self, value):
         from textpress.fragment import Fragment, dump_tree
+        from zine.fragment import Fragment, dump_tree
         if not isinstance(value, Fragment):
             raise TypeError('fragment required, otherwise use raw_body')

zine/parsers/init.py

-                      r376
+                      r465
 # -*- coding: utf-8 -*-
 """
     textpress.parsers
     ~~~~~~~~~~~~~~~~~
+    zine.parsers
+    ~~~~~~~~~~~~
     This module holds the base parser informations and the dict of
 …
     :license: GNU GPL, see LICENSE for more details.
 """
 from textpress.application import iter_listeners, get_application
+from zine.application import iter_listeners, get_application
 …
 from textpress.parsers.simplehtml import HTMLParser, SimpleHTMLParser, \
+from zine.parsers.simplehtml import HTMLParser, SimpleHTMLParser, \
      AutoParagraphHTMLParser
 from textpress.parsers.comments import CommentParser
+from zine.parsers.comments import CommentParser
 all_parsers = {

zine/parsers/comments.py

-                      r335
+                      r465
 # -*- coding: utf-8 -*-
 """
     textpress.parsers.markup
     ~~~~~~~~~~~~~~~~~~~~~~~~
+    zine.parsers.markup
+    ~~~~~~~~~~~~~~~~~~~
     This module implements a simple text formatting markup used for post
 …
 """
 import re
 from textpress.fragment import Fragment, Node, TextNode
 from textpress.utils.validators import is_valid_url
 from textpress.parsers import BaseParser
+from zine.fragment import Fragment, Node, TextNode
+from zine.utils.validators import is_valid_url
+from zine.parsers import BaseParser
 …
     @staticmethod
     def get_name():
         from textpress.api import _
+        from zine.api import _
         return _('Emphasized Text')

zine/parsers/simplehtml.py

-                      r168
+                      r465
 # -*- coding: utf-8 -*-
 """
     textpress.parsers.simplehtml
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    zine.parsers.simplehtml
+    ~~~~~~~~~~~~~~~~~~~~~~~
     HTML alike syntax.
 …
 """
 import re
 from textpress.application import emit_event
 from textpress.parsers import BaseParser
 from textpress.fragment import Node, TextNode, Fragment
 from textpress._ext import beautifulsoup as bt
+from zine.application import emit_event
+from zine.parsers import BaseParser
+from zine.fragment import Node, TextNode, Fragment
+from zine._ext import beautifulsoup as bt
 …
     @staticmethod
     def get_name():
         from textpress.api import _
+        from zine.api import _
         return _('Raw HTML')
 …
     @staticmethod
     def get_name():
         from textpress.api import _
+        from zine.api import _
         return _('Simplified HTML')
 …
     @staticmethod
     def get_name():
         from textpress.api import _
+        from zine.api import _
         return _('Automatic Paragraphs')

zine/pingback.py

-                      r335
+                      r465
 # -*- coding: utf-8 -*-
 """
     textpress.pingback
     ~~~~~~~~~~~~~~~~~~
+    zine.pingback
+    ~~~~~~~~~~~~~
     This module implements the pingback API and a function to emit pingbacks
 …
     .. _Pingback 1.0: http://www.hixie.ch/specs/pingback/pingback-1.0
     Note that pingback support is implemented in the `TextPress` core and
+    Note that pingback support is implemented in the `Zine` core and
     can't be removed.  You can however disable it in the configuration if
     you want.  Plugins can hook into the pingback system by registering
 …
     Due to a broken design for trackback we will *never* support trackbacks
     in the `TextPress` core.  Neither do we handle incoming trackbacks, nor
+    in the `Zine` core.  Neither do we handle incoming trackbacks, nor
     do we emit trackbacks.
 …
 from werkzeug.routing import RequestRedirect, NotFound
 from werkzeug import escape, unescape
 from textpress.api import get_request, get_application, url_for, db, _
 from textpress.models import Post, Comment
 from textpress.utils.xml import XMLRPC, strip_tags
+from zine.api import get_request, get_application, url_for, db, _
+from zine.models import Post, Comment
+from zine.utils.xml import XMLRPC, strip_tags
 …
 def pingback_post(url_info, target_uri, year, month, day, slug):
     """This is the pingback handler for `textpress.views.blog.show_post`."""
+    """This is the pingback handler for `zine.views.blog.show_post`."""
     post = Post.objects.get_by_timestamp_and_slug(year, month, day, slug)
     if post is None or not post.pings_enabled:

zine/plugins/akismet_spam_filter/init.py

-                      r386
+                      r465
 # -*- coding: utf-8 -*-
 """
     textpress.plugins.akismet_spam_filter
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    zine.plugins.akismet_spam_filter
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     Do spam checking via Akismet of comments.
 …
     :license: GNU GPL.
 """
 import textpress
+import zine
 from os.path import dirname, join
 from textpress.api import *
 from textpress.widgets import Widget
 from textpress.views.admin import flash, render_admin_response
 from textpress.models import ROLE_ADMIN, COMMENT_BLOCKED_SPAM, Comment
 from textpress.utils import RequestLocal
 from textpress.utils.xxx import CSRFProtector
+from zine.api import *
+from zine.widgets import Widget
+from zine.views.admin import flash, render_admin_response
+from zine.models import ROLE_ADMIN, COMMENT_BLOCKED_SPAM, Comment
+from zine.utils import RequestLocal
+from zine.utils.xxx import CSRFProtector
 from urllib import urlopen
 from werkzeug import escape, url_encode
 USER_AGENT = 'TextPress /%s | Akismet/1.11' % textpress.__version__
+USER_AGENT = 'Zine /%s | Akismet/1.11' % zine.__version__
 AKISMET_URL_BASE = 'rest.akismet.com'
 AKISMET_VERSION = '1.1'

zine/plugins/akismet_spam_filter/templates/admin/akismet_widget.html

r297	r465
8	8	</dl>
9	9	</form>
10

zine/plugins/creole_parser/init.py

-                      r142
+                      r465
 # -*- coding: utf-8 -*-
 """
     textpress.plugins.creole_parser
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    zine.plugins.creole_parser
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~
     Use Markdown for your blg posts.
 …
     :license: GNU GPL.
 """
 from textpress.api import *
 from textpress.parsers import BaseParser
 from textpress.fragment import Node, TextNode, Fragment
+from zine.api import *
+from zine.parsers import BaseParser
+from zine.fragment import Node, TextNode, Fragment
 from creoleparser import Parser, Creole10
 from genshi.core import END, START, TEXT

zine/plugins/eric_the_fish/init.py

-                      r378
+                      r465
 # -*- coding: utf-8 -*-
 """
     textpress.plugins.eric_the_fish
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    zine.plugins.eric_the_fish
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~
     Annoying fish for the admin panel.  This is somewhat of an demonstration
 …
 # api module just acts as an collection module which is save to star import.
 # the objects' implementations are in different modules.
 from textpress.api import *
+from zine.api import *
 # because we want to add an admin panel page for our fish we need the
 …
 # function, but it assembles a navigation bar for the admin layout template
 # and emits the `modify-admin-navigation-bar` event also use here.
 from textpress.views.admin import render_admin_response
+from zine.views.admin import render_admin_response
 # the following method is used to show notifications in the admin panel.
 from textpress.utils.admin import flash
+from zine.utils.admin import flash
 # Because our fish uses JSON and JavaScript we use the dump_json function
 # from the utils module. We also use the CSRFProtector which helps us to
 # avoid CSRF attacks.
 from textpress.utils import dump_json
 from textpress.utils.xxx import CSRFProtector
+from zine.utils import dump_json
+from zine.utils.xxx import CSRFProtector
 # we only want the admin to be able to configure eric. so we need the
 # admin role
 from textpress.models import ROLE_ADMIN
+from zine.models import ROLE_ADMIN
 # the last thing is importing the FORTUNES list from the fortunes.py file
 # from the same folder. It's just a long list with quotes.
 from textpress.plugins.eric_the_fish.fortunes import FORTUNES
+from zine.plugins.eric_the_fish.fortunes import FORTUNES
 # because we have an admin panel page we need to store the templates
 …
 def setup(app, plugin):
     """This function is called by TextPress in the application initialization
+    """This function is called by Zine in the application initialization
     phase. Here we connect to the events and register our template paths,
     url rules, views etc.
 …
     # Whenever we click on the fish we want a quote to appear. Because the
     # quotes are stored on the server we add a servicepoint that sends one
     # quote back. TextPress provides JSON and XML export for this servicepoint
+    # quote back. Zine provides JSON and XML export for this servicepoint
     # automatically, plugins may add more export formats.
     app.add_servicepoint('eric_the_fish/get_fortune', get_fortune)
 …
                      view=show_eric_options)
     # add our templates to the searchpath so that TextPress can find the
+    # add our templates to the searchpath so that Zine can find the
     # admin panel template for the fish config panel.
     app.add_template_searchpath(TEMPLATES)

zine/plugins/eric_the_fish/fortunes.py

r15	r465
1	1	# -- coding: utf-8 --
2	2	"""
3		~~textpress~~.plugins.eric_the_fish.fortunes
	3	zine.plugins.eric_the_fish.fortunes
4	4	~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
5	5

zine/plugins/eric_the_fish/shared/fish.js

-                      r29
+                      r465
     /* if the fish is not visible get one quote from the server */
     if (bubble.css('display') == 'none') {
       /* textpress provides a function called `callJSONService` that
+      /* zine provides a function called `callJSONService` that
          is used to call the json endpoint of a service point and return
          the value parsed. */
       TextPress.callJSONService('eric_the_fish/get_fortune', {}, function(q) {
+      Zine.callJSONService('eric_the_fish/get_fortune', {}, function(q) {
         /* when the data comes back add the text to the bubble data */
         bubble_data.text(q.fortune);

zine/plugins/markdown_parser/init.py

-                      r158
+                      r465
 # -*- coding: utf-8 -*-
 """
     textpress.plugins.markdown_parser
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    zine.plugins.markdown_parser
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     Use Markdown for your blog posts.
 …
     :license: GNU GPL.
 """
 from textpress.api import *
 from textpress.parsers import BaseParser
 from textpress.parsers.simplehtml import HTMLParser
 from textpress.plugins.markdown_parser import markdown as md
+from zine.api import *
+from zine.parsers import BaseParser
+from zine.parsers.simplehtml import HTMLParser
+from zine.plugins.markdown_parser import markdown as md

zine/plugins/miniblog_theme/init.py

-                      r216
+                      r465
 # -*- coding: utf-8 -*-
 """
     textpress.plugins.miniblog_theme
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    zine.plugins.miniblog_theme
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~
     Very simple textpress theme.
+    Very simple zine theme.
     :copyright: 2008 by Armin Ronacher.

zine/plugins/miniblog_theme/templates/layout.html

-                      r426
+                      r465
     </div>
     <div class="footer">
       <p>{% trans textpress='<a href="http://textpress.pocoo.org/">TextPress</a>'
         %}Proudly powered by {{ textpress }}.{% endtrans %}</p>
+      <p>{% trans zine='<a href="http://zine.pocoo.org/">Zine</a>'
+        %}Proudly powered by {{ zine }}.{% endtrans %}</p>
     </div>
   </div>

zine/plugins/myrtle_theme/init.py

-                      r11
+                      r465
 # -*- coding: utf-8 -*-
 """
     textpress.plugins.myrtle_theme
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    zine.plugins.myrtle_theme
+    ~~~~~~~~~~~~~~~~~~~~~~~~~
     The current default theme for TextPress.
+    The current default theme for Zine.
     :copyright: 2007 by Armin Ronacher.

zine/plugins/myrtle_theme/templates/layout.html

-                      r426
+                      r465
     <div class="footer">
       {#- be kind and don't remove that message. but of course we can't hinder you :) #}
       <p>{% trans textpress='<a href="http://textpress.pocoo.org/">TextPress</a>',
         theme='<a href="http://textpress.pocoo.org/plugins/myrtle_theme/">Myrtle theme</a>',
+      <p>{% trans zine='<a href="http://zine.pocoo.org/">Zine</a>',
+        theme='<a href="http://zine.pocoo.org/plugins/myrtle_theme/">Myrtle theme</a>',
         author='<a href="http://lucumr.pocoo.org/">Armin Ronacher</a>'
         %}Proudly powered by {{ textpress }}, {{ theme }} designed by {{ author }}.{% endtrans %}
+        %}Proudly powered by {{ zine }}, {{ theme }} designed by {{ author }}.{% endtrans %}
         {%- if request.user.is_manager %}
           | <a href="{{ url_for('admin/index')|e }}">{{ _('Admin Panel') }}</a>

zine/plugins/pygments_support/init.py

-                      r378
+                      r465
 # -*- coding: utf-8 -*-
 """
     textpress.plugins.pygments_support
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    zine.plugins.pygments_support
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     Adds support for pygments to pre code blocks.
 …
 from os.path import join, dirname
 from time import time, asctime, gmtime
 from textpress.api import *
 from textpress.utils.xxx import CSRFProtector
 from textpress.views.admin import render_admin_response, flash
 from textpress.models import ROLE_ADMIN
 from textpress.fragment import DataNode
+from zine.api import *
+from zine.utils.xxx import CSRFProtector
+from zine.views.admin import render_admin_response, flash
+from zine.models import ROLE_ADMIN
+from zine.fragment import DataNode
 from werkzeug import escape
 from werkzeug.exceptions import NotFound

zine/plugins/typography/init.py

-                      r357
+                      r465
 # -*- coding: utf-8 -*-
 """
     textpress.plugins.typography
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    zine.plugins.typography
+    ~~~~~~~~~~~~~~~~~~~~~~~
     This plugin adds automatic typography support to TextPress.  This probably
+    This plugin adds automatic typography support to Zine.  This probably
     only works with English or German texts, maybe some other languages too.
     I don't think that it's necessary to localize that plugin some more, there
 …
 import re
 from os.path import dirname, join
 from textpress.api import *
 from textpress.models import ROLE_ADMIN
 from textpress.views.admin import require_role, render_admin_response, \
+from zine.api import *
+from zine.models import ROLE_ADMIN
+from zine.views.admin import require_role, render_admin_response, \
      flash
 from textpress.utils.xxx import CSRFProtector
+from zine.utils.xxx import CSRFProtector

zine/plugins/vessel_theme/init.py

-                      r443
+                      r465
 # -*- coding: utf-8 -*-
 """
     textpress.plugins.vessel_theme
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    zine.plugins.vessel_theme
+    ~~~~~~~~~~~~~~~~~~~~~~~~~
     Very simple textpress theme.
+    Very simple zine theme.
     :copyright: 2008 by Armin Ronacher.
 …
 """
 from os.path import join, dirname
 from textpress.api import redirect, url_for, lazy_gettext, _
 from textpress.views.admin import render_admin_response
 from textpress.utils.admin import flash
 from textpress.utils.xxx import CSRFProtector
+from zine.api import redirect, url_for, lazy_gettext, _
+from zine.views.admin import render_admin_response
+from zine.utils.admin import flash
+from zine.utils.xxx import CSRFProtector

zine/plugins/vessel_theme/templates/layout.html

-                      r441
+                      r465
     </div>
     <div class="footer">
       <p>{% trans textpress='<a href="http://textpress.pocoo.org/">TextPress</a>'
         %}Proudly powered by {{ textpress }}.{% endtrans %}</p>
+      <p>{% trans zine='<a href="http://zine.pocoo.org/">Zine</a>'
+        %}Proudly powered by {{ zine }}.{% endtrans %}</p>
     </div>
   </div>

zine/plugins/xapian_search/init.py

-                      r461
+                      r465
 # -*- coding: utf-8 -*-
 """
     textpress.plugins.xapian_search
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    zine.plugins.xapian_search
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~
     Provides a full featured and fast search for Textpress using
 …
 from time import mktime, strptime
 from datetime import datetime
 from textpress.api import *
 from textpress.views.admin import render_admin_response
 from textpress.utils.admin import flash
 from textpress.utils.xxx import CSRFProtector
 from textpress.widgets import Widget
 from textpress.models import Post, ROLE_ADMIN
+from zine.api import *
+from zine.views.admin import render_admin_response
+from zine.utils.admin import flash
+from zine.utils.xxx import CSRFProtector
+from zine.widgets import Widget
+from zine.models import Post, ROLE_ADMIN
 # TODO: add a indexing script for all posts
 …
 def setup(app, plugin):
     """Register the plugin in textpress."""
+    """Register the plugin in zine."""
     app.add_template_searchpath(TEMPLATE_FILES)
     app.add_widget(QuickSearchWidget)

zine/plugins/xapian_search/metadata.txt

r464	r465
6	6	Version: 0.1
7	7	License: GPL
8		Description: Provides a full featured and fast search for ~~TextPress~~ using the popular xapian engine as back end.
9		Description[de]: Stellt eine Suche für ~~TextPress~~ auf Basis von Xapian zur Verfügung.
	8	Description: Provides a full featured and fast search for Zine using the popular xapian engine as back end.
	9	Description[de]: Stellt eine Suche für Zine auf Basis von Xapian zur Verfügung.

zine/pluginsystem.py

-                      r452
+                      r465
 # -*- coding: utf-8 -*-
 """
     textpress.pluginsystem
     ~~~~~~~~~~~~~~~~~~~~~~
+    zine.pluginsystem
+    ~~~~~~~~~~~~~~~~~
     This module implements the plugin system.
 …
     ---------------
     To identify a plugin metadata are used. TextPress requires a file
+    To identify a plugin metadata are used. Zine requires a file
     named `metadata.txt` to load some information about the plugin.
     TextPress currently supports the following metadata information:
+    Zine currently supports the following metadata information:
     :Name:
 …
     ------------------------------
     TextPress separates multiple instances in the interpreter as good as it
+    Zine separates multiple instances in the interpreter as good as it
     can.  That you can still interact with different instances is the nature
     of Python.  But just because you can you shouldn't do that.  Actually you
     are not allowed to do that because TextPress supports reloading of plugins
+    are not allowed to do that because Zine supports reloading of plugins
     at runtime which requires that a plugin can shut down without leaving
     traces behind.  Additionally plugin must never do monkey patching because
     that cannot be undone savely again.
     There is no callback that is called on plugin unloading, what TextPress
+    There is no callback that is called on plugin unloading, what Zine
     does, is dropping all references it has to the plugins and waits for
     Python to deallocate the memory.  As plugin developer you have no chance
 …
 from werkzeug import cached_property, escape
 import textpress
 from textpress.application import get_application
 from textpress.utils.mail import split_email, is_valid_email
 from textpress.i18n import Translations
+import zine
+from zine.application import get_application
+from zine.utils.mail import split_email, is_valid_email
+from zine.i18n import Translations
 …
 def textpress_import(name, *args):
     """Redirect imports for textpress.plugins to the module space."""
     if name == 'textpress.plugins' or name.startswith('textpress.plugins.'):
+def zine_import(name, *args):
+    """Redirect imports for zine.plugins to the module space."""
+    if name == 'zine.plugins' or name.startswith('zine.plugins.'):
         app = get_application()
         if app is not None:
             name = 'textpress._space.%s%s' % (app.iid, name[17:])
+            name = 'zine._space.%s%s' % (app.iid, name[12:])
     return _py_import(name, *args)
 …
 def register_application(app):
     """Register the application on the plugin space."""
     module = ModuleType('textpress._space.%s' % app.iid)
+    module = ModuleType('zine._space.%s' % app.iid)
     module.__path__ = app.plugin_searchpath
     sys.modules[module.__name__] = module
 …
 def unregister_application(app):
     """Unregister the application on the plugin space."""
     prefix = 'textpress._space.%s' % app.iid
+    prefix = 'zine._space.%s' % app.iid
     for module in sys.modules.keys():
         if module.startswith(prefix):
 …
     # get the package version
     try:
         package_version = int(f.read('TEXTPRESS_PACKAGE'))
         plugin_name = f.read('TEXTPRESS_PLUGIN')
+        package_version = int(f.read('ZINE_PACKAGE'))
+        plugin_name = f.read('ZINE_PLUGIN')
     except (KeyError, ValueError), e:
         raise InstallationError('invalid')
 …
     # get the package version and name
     try:
         package_version = int(f.read('TEXTPRESS_PACKAGE'))
         plugin_name = f.read('TEXTPRESS_PLUGIN')
+        package_version = int(f.read('ZINE_PACKAGE'))
+        plugin_name = f.read('ZINE_PLUGIN')
     except (KeyError, ValueError), e:
         raise ValueError('not a valid package')
 …
         # add the package information files
         for name, data in [('TEXTPRESS_PLUGIN', self.name),
                            ('TEXTPRESS_PACKAGE', PACKAGE_VERSION)]:
+        for name, data in [('ZINE_PLUGIN', self.name),
+                           ('ZINE_PACKAGE', PACKAGE_VERSION)]:
             zinfo = ZipInfo(name, localtime(time()))
             zinfo.compress_type = f.compression
 …
         """
         try:
             # we directly import from the textpress module space
             return __import__('textpress._space.%s.%s' %
+            # we directly import from the zine module space
+            return __import__('zine._space.%s.%s' %
                               (self.app.iid, self.name), None, None,
                               ['setup'])
 …
 import textpress
 __builtin__.__import__ = textpress_import
 plugin_space = ModuleType('textpress._space')
 sys.modules['textpress._space'] = plugin_space
+import zine
+__builtin__.__import__ = zine_import
+plugin_space = ModuleType('zine._space')
+sys.modules['zine._space'] = plugin_space

zine/services.py

-                      r335
+                      r465
 # -*- coding: utf-8 -*-
 """
     textpress.services
     ~~~~~~~~~~~~~~~~~~
+    zine.services
+    ~~~~~~~~~~~~~
     The builtin (JSON) services.
     :copyright: 2007 by Armin Ronacher.
+    :copyright: 2007-2008 by Armin Ronacher.
     :license: GNU GPL.
 """
 from textpress.api import *
 from textpress.models import Comment, ROLE_AUTHOR
 from textpress.utils.xxx import StreamReporter
+from zine.api import *
+from zine.models import Comment, ROLE_AUTHOR
+from zine.utils.xxx import StreamReporter

zine/shared/js/Admin.js

-                      r416
+                      r465
 /**
  * TextPress Administration Tools
+ * Zine Administration Tools
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ *
  * Part of the TextPress core framework. Provides default script
+ * Part of the Zine core framework. Provides default script
  * functions for the administration interface.
+ *
 …
       return;
     var
       bookmarkletURL = TextPress.ADMIN_URL + '/_bookmarklet',
+      bookmarkletURL = Zine.ADMIN_URL + '/_bookmarklet',
       bookmarklet = 'document.location.href="' + bookmarkletURL +
       '?mode=newpost&text="+encodeURI(getSelection?getSelection()' +
 …
     window.setTimeout(function updateStatus() {
       data = {upload_id: self.transportID};
       TextPress.callJSONService('get_upload_info', data, function(u) {
+      Zine.callJSONService('get_upload_info', data, function(u) {
         // it could happen that the server clears the status before we
         // can pull it. so we have a test for percentages of over 95%

zine/shared/js/TextPress.js

-                      r421
+                      r465
 /**
  * Default TextPress JavaScript Driver File
+ * Default Zine JavaScript Driver File
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ *
  * Part of the TextPress core framework. Provides default script
+ * Part of the Zine core framework. Provides default script
  * functions for the base templates.
+ *
 …
  */
 var TextPress = {
+var Zine = {
   TRANSLATIONS : {},
   PLURAL_EXPR : function(n) { return n == 1 ? 0 : 1; },
 …
           .text(_('(Create as top level comment)'))
           .click(function() {
             TextPress.replyToNothing();
+            Zine.replyToNothing();
             return false;
           }))
 …
   gettext : function(string) {
     var translated = TextPress.TRANSLATIONS[string];
+    var translated = Zine.TRANSLATIONS[string];
     if (typeof translated == 'undefined')
       return string;
 …
   ngettext: function(singular, plural, n) {
     var translated = TextPress.TRANSLATIONS[singular];
+    var translated = Zine.TRANSLATIONS[singular];
     if (typeof translated == 'undefined')
       return (n == 1) ? singular : plural;
     return translated[TextPress.PLURALEXPR(n)];
+    return translated[Zine.PLURALEXPR(n)];
   },
 …
 // quick alias for translations
 _ = TextPress.gettext;
+_ = Zine.gettext;

zine/shared/js/WidgetManager.js

-                      r145
+                      r465
+ *
  * This provides the JavaScript interface to the widget manager from the
  * TextPress admin panel.
+ * Zine admin panel.
+ *
  * :copyright: 2007 by Armin Ronacher.
 …
     var widget = widget_map[widget_id];
     var submit_url = TextPress.BLOG_URL + '/admin/options/widgets';
+    var submit_url = Zine.BLOG_URL + '/admin/options/widgets';
     var url_args = {
       configure:  widget[0],

zine/templates/_comment.html

r319	r465
11	11	<a href="#comment-{{ comment.comment_id }}">#</a>
12	12	{%- if add_reply_link %}
13		- <a href="javascript:~~TextPress~~.replyToComment({{ comment.comment_id
	13	- <a href="javascript:Zine.replyToComment({{ comment.comment_id
14	14	}})" title="{{ _('reply to this comment') }}">re</a>
15	15	{% endif -%}

zine/templates/admin/about_zine.html

-                      r426
+                      r465
 {% extends "admin/layout.html" %}
 {% block title %}{{ _("About TextPress") }}{% endblock %}
+{% block title %}{{ _("About Zine") }}{% endblock %}
 {% block contents %}
   <h1>{{ _("About TextPress") }}</h1>
+  <h1>{{ _("About Zine") }}</h1>
   <div class="text">
     <p>{% trans %}
       TextPress is an open source content publishing platform emphasizing ease
+      Zine is an open source content publishing platform emphasizing ease
       of use and extensibility. It provides an powerful internal infrastructure,
       an simple and an intuitive userinterface.
     {% endtrans %}</p>
     <p>{% trans %}
       TextPress is distributed under the GNU GPL 2 or any later version. The
+      Zine is distributed under the GNU GPL 2 or any later version. The
       complete text of the license can be found online as well as in the LICENSE
       file included in the distribution.

zine/templates/admin/cache.html

-                      r439
+                      r465
   <h1>{{ _("Cache Options") }}</h1>
   <p>{% trans %}
     TextPress comes with a cache system that allows you to survive a sudden
+    Zine comes with a cache system that allows you to survive a sudden
     storm of visitors.  The caching system has different backends you can
     chose from and also different settings that you should set depending on
 …
   <form action="" method="post">
     <h2>{{ _("Cache System") }}</h2>
     <p>{{ _("Current TextPress supports three caching systems:") }}</p>
+    <p>{{ _("Current Zine supports three caching systems:") }}</p>
     <ul>
       <li>{% trans %}<strong>Simple Cache</strong>: The simple cache is a very
 …
       <h2>{{ _("Filesystem Options") }}</h2>
       <p>{% trans %}
         When using the filesystem cache you can control where TextPress puts
         all the cache data.  This path is relative to your TextPress instance
         folder and will be created automatically by TextPress.  Keep in mind
+        When using the filesystem cache you can control where Zine puts
+        all the cache data.  This path is relative to your Zine instance
+        folder and will be created automatically by Zine.  Keep in mind
         that if you change that path and old cache data is left in the old
         folder, TextPress won't clean up the data left for you.
+        folder, Zine won't clean up the data left for you.
       {% endtrans %}</p>
       <p>{% trans %}
         One thing you have to keep in mind is that the cache path <em>must</em>
         be a directory that only TextPress uses for file management.  The
         TextPress code cleans up there from time to time and it could delete
         files that are otherwise not tracked by TextPress.  This is especially
+        be a directory that only Zine uses for file management.  The
+        Zine code cleans up there from time to time and it could delete
+        files that are otherwise not tracked by Zine.  This is especially
         the case if you try to cache into <code>/tmp</code> or a similar
         folder where all kinds of applications put temporary files in.

zine/templates/admin/export.html

-                      r379
+                      r465
   <h1>{{ _("Export") }}</h1>
   <p>{% trans %}
     Here you can dump your TextPress database information into an standardized
     format (Atom) with TextPress extensions which we call “TextPress eXtended
     Atom” (TPXA).  You can use this file to import your posts into another
+    Here you can dump your Zine database information into an standardized
+    format (Atom) with Zine extensions which we call “Zine eXtended
+    Atom” (ZineXA).  You can use this file to import your posts into another
     weblog software that supports Atom.  You should not use this file for
     TextPress migrations as this file will not include attachments, the blog
+    Zine migrations as this file will not include attachments, the blog
     configuration and probably data stored by plugins.
   {% endtrans %}</p>
 …
     <div class="actions">
       {{ hidden_form_data }}
       <input type="hidden" name="format" value="tpxa">
+      <input type="hidden" name="format" value="zxa">
       <input type="submit" value="{{ _('Export') }}">
     </div>

zine/templates/admin/file_uploads/config.html

-                      r423
+                      r465
       If you set the upload destination to a relative path it's
       expanded for the instance folder. If the folder does not
       exist TextPress will create a new one the first time you
+      exist Zine will create a new one the first time you
       upload something into that folder.
     {% endtrans %}</p>
     <p>{% trans %}
       The mimetype mapping is useful if you want to upload files
       that have extensions that are unknown to the system TextPress
+      that have extensions that are unknown to the system Zine
       is running on. The format for a rule is <code>pattern:mimetype</code>,
       each rule must be on it's own line or separated by semicolons.
       Patterns might use the asterisk for variable parts. Example:
       <code>*.plugin:application/x-textpress-plugin</code>.
+      <code>*.plugin:application/x-zine-plugin</code>.
     {% endtrans %}</p>
     <p>{% trans %}
       If you want to create thumbnails you have to have ImageMagick
       installed. Per default TextPress checks for ImageMagick on the
+      installed. Per default Zine checks for ImageMagick on the
       system searchpath. If you don't have it installed there (for
       example if you are on a Windows Server) you have to defined the

zine/templates/admin/import.html

r379	r465
4	4	<h1>{{ _("Import") }}</h1>
5	5	<p>{% trans %}
6		If you have posts or comments in another system, ~~TextPress~~ can import those
	6	If you have posts or comments in another system, Zine can import those
7	7	into this blog. The data imported doesn't directly end up in the blog but a
8	8	queue so that you can pickl which data you want to import. To get started,

zine/templates/admin/import_wordpress.html

r379	r465
5	5	<p>{% trans %}
6	6	This importer allows you to import posts and comments from your WordPress
7		blog into your new ~~TextPress~~ blog. Either upload your WordPress eXtended
	7	blog into your new Zine blog. Either upload your WordPress eXtended
8	8	RSS (WXR) file created in the WordPress admin panel or give the importer
9	9	the location of such a file on an external URL and it will import the posts,

zine/templates/admin/index.html

-                      r403
+                      r465
       <div class="text">
         <p>{% trans user=(request.user.first_name or request.user.username)|e -%}
           Howdy.  Welcome to the TextPress administration interface {{ user }}.
+          Howdy.  Welcome to the Zine administration interface {{ user }}.
         {%- endtrans %}
         {% trans -%}
 …
         <li><a href="{{ url_for('admin/show_comments')|e }}">{{ _("Moderate Comments") }}</a>
         <li><a href="{{ url_for('admin/show_posts')|e }}">{{ _("Manage Posts") }}</a>
         <li><a href="{{ url_for('admin/options')|e }}">{{ _("Configure TextPress") }}</a>
+        <li><a href="{{ url_for('admin/options')|e }}">{{ _("Configure Zine") }}</a>
         <li><a href="{{ url_for('admin/plugins')|e }}">{{ _("Manage Plugins") }}</a>
         <li><a href="{{ url_for('admin/show_users')|e }}">{{ _("Manage Users") }}</a>
         <li><a href="{{ url_for('admin/help')|e }}">{{ _("Get Help") }}</a>
       </ul>
       <p>{% trans help=url_for('admin/help'), support='http://textpress.pocoo.org/support/',
             website='http://textpress.pocoo.org/' %}
+      <p>{% trans help=url_for('admin/help'), support='http://zine.pocoo.org/support/',
+            website='http://zine.pocoo.org/' %}
         If you need help, have a look at the <a href="{{ help
           }}">documentation</a>.  If that doesn't solve your problems you might
         find answers in the <a href="{{ support }}">support section</a> of the
         <a href="{{ website }}">TextPress website</a>.
+        <a href="{{ website }}">Zine website</a>.
       {% endtrans %}
     </div>
 …
     </div>
     <div class="planet">
       <h2>{{ _('Planet TextPress') }}</h2>
+      <h2>{{ _('Planet Zine') }}</h2>
       <script type="text/javascript">
         $('div.planet').append($('<div>').load('?load=planet'));

zine/templates/admin/information.html

-                      r464
+                      r465
 {% block contents %}
   <h1>{{ _("About The System") }}</h1>
   <h2>{{ _('TextPress Environment') }}</h2>
+  <h2>{{ _('Zine Environment') }}</h2>
   <dl>
     <dt>{{ _('TextPress Version') }}</dt>
     <dd>{{ textpress_version|e }}</dd>
+    <dt>{{ _('Zine Version') }}</dt>
+    <dd>{{ zine_version|e }}</dd>
     <dt>{{ _('Distribution Mode') }}</dt>
     <dd>{{ textpress_env.MODE }}</dd>
+    <dd>{{ zine_env.MODE }}</dd>
     <dt>{{ _('Package Location') }}</dt>
     <dd>{{ textpress_env.PACKAGE_LOCATION|e }}</dd>
+    <dd>{{ zine_env.PACKAGE_LOCATION|e }}</dd>
     <dt>{{ _('Shared Data') }}</dt>
     <dd>{{ textpress_env.SHARED_DATA|e }}</dd>
+    <dd>{{ zine_env.SHARED_DATA|e }}</dd>
     <dt>{{ _('Builtin Templates') }}</dt>
     <dd>{{ textpress_env.BUILTIN_TEMPLATE_PATH|e }}</dd>
+    <dd>{{ zine_env.BUILTIN_TEMPLATE_PATH|e }}</dd>
     <dt>{{ _('Builtin Plugins') }}</dt>
     <dd>{{ textpress_env.BUILTIN_PLUGIN_FOLDER|e }}</dd>
+    <dd>{{ zine_env.BUILTIN_PLUGIN_FOLDER|e }}</dd>
     <dt>{{ _('Path to Instance') }}</dt>
     <dd>{{ instance_path|e }}</dd>

zine/templates/admin/layout.html

-                      r426
+                      r465
   </div>
   <div class="footer">
     <p>{% trans textpress='<a href="http://textpress.pocoo.org/">TextPress</a>',
       version=textpress.version -%}Powered by {{ textpress }} {{ version }}.{% endtrans %} |
       &copy; {{ textpress.copyright|e }}</p>
+    <p>{% trans zine='<a href="http://zine.pocoo.org/">Zine</a>',
+      version=zine.version -%}Powered by {{ zine }} {{ version }}.{% endtrans %} |
+      &copy; {{ zine.copyright|e }}</p>
   </div>
 </body>

zine/templates/admin/perform_import.html

r379	r465
5	5	<p>{% trans %}
6	6	The importer converts now all the collected and selected data for
7		~~TextPress~~ and inserts it into the database. This can take some time.
	7	Zine and inserts it into the database. This can take some time.
8	8	<strong>Don't hit cancel!</strong>
9	9	{% endtrans %}</p>

zine/templates/admin/plugins.html

-                      r390
+                      r465
   <form action="" method="post" enctype="multipart/form-data">
     <p>{% trans %}
       Plugins extend the functionality of the TextPress system. Because of
+      Plugins extend the functionality of the Zine system. Because of
       security and convinience reasons you have to enable plugins by hand.
       Some plugins could conflict with each other so it's up to you to
 …
     <h2>{{ _("Add New Plugin") }}</h2>
     <p>{% trans %}
       If you have a plugin as TextPress <tt>.plugin</tt> file you can upload it
       to your TextPress instance using the following form. Plugins added this way
+      If you have a plugin as Zine <tt>.plugin</tt> file you can upload it
+      to your Zine instance using the following form. Plugins added this way
       can also be completely removed.
     {% endtrans %}</p>

zine/templates/layout.html

-                      r426
+                      r465
     {{ emit_event('after-contents-rendered') }}
   </div>
   <div class="footer">{% trans textpress='<a href="http://textpress.pocoo.org/">TextPress</a>'
     %}Proudly powered by {{ textpress }}.{% endtrans %}</div>
+  <div class="footer">{% trans zine='<a href="http://zine.pocoo.org/">Zine</a>'
+    %}Proudly powered by {{ zine }}.{% endtrans %}</div>
   </div>
 </body>

zine/templates/maintenance.html

-                      r330
+                      r465
 <html>
 <head>
   <title>TextPress Maintenance Mode</title>
+  <title>Zine Maintenance Mode</title>
   <style type="text/css">
     body {
 …
     <h1>Maintenance Mode</h1>
     <p>
       This TextPress instance is in maintenance mode right now.
+      This Zine instance is in maintenance mode right now.
       Plase wait until the administrator reopens the blog.
     </p>

zine/urls.py

-                      r463
+                      r465
 # -*- coding: utf-8 -*-
 """
     textpress.urls
     ~~~~~~~~~~~~~~
+    zine.urls
+    ~~~~~~~~~
     This module implements a function that creates a list of urls for all
     the core components.
     :copyright: 2007-2008 by Armin Ronacher, Pedro Algarvio.
 …
 def make_urls(app):
     """Make the URLs for a new textpress application."""
+    """Make the URLs for a new zine application."""
     blog_urls = [
         Rule('/', defaults={'page': 1}, endpoint='blog/index'),
 …
         Rule('/system/import/<int:id>/delete', endpoint='admin/delete_import'),
         Rule('/system/export', endpoint='admin/export'),
         Rule('/system/about', endpoint='admin/about_textpress'),
+        Rule('/system/about', endpoint='admin/about_zine'),
         Rule('/system/help/', endpoint='admin/help'),
         Rule('/system/help/<path:page>', endpoint='admin/help'),

zine/utils/init.py

-                      r440
+                      r465
 """
     textpress.utils
     ~~~~~~~~~~~~~~~
+    zine.utils
+    ~~~~~~~~~~
     This package implements various functions used all over the code.
 …
 from werkzeug import url_quote, Local, LocalManager, ClosingIterator
 from textpress.i18n import _
+from zine.i18n import _
 # load dynamic constants
 from textpress._dynamic import *
+from zine._dynamic import *

zine/utils/admin.py

-                      r463
+                      r465
 # -*- coding: utf-8 -*-
 """
     textpress.utils.admin
     ~~~~~~~~~~~~~~~~~~~~~
+    zine.utils.admin
+    ~~~~~~~~~~~~~~~~
     This module implements various functions used by the admin interface.
 …
 import unicodedata
 from textpress.utils import _, local
+from zine.utils import _, local
 …
                  prev_link=False, next_link=False, gray_prev_link=True,
                  gray_next_link=True):
         from textpress.application import url_for
+        from zine.application import url_for
         was_ellipsis = False
         result = []

zine/utils/crypto.py

-                      r335
+                      r465
 """
     textpress.utils.crypto
     ~~~~~~~~~~~~~~~~~~~~~~
+    zine.utils.crypto
+    ~~~~~~~~~~~~~~~~~
     This module implements various cryptographic functions.

zine/utils/dates.py

-                      r335
+                      r465
 """
     textpress.utils.dates
     ~~~~~~~~~~~~~~~~~~~~~
+    zine.utils.dates
+    ~~~~~~~~~~~~~~~~
     This module implements date formatting and parsing functions.

zine/utils/mail.py

-                      r335
+                      r465
 """
     textpress.utils.mail
     ~~~~~~~~~~~~~~~~~~~~
+    zine.utils.mail
+    ~~~~~~~~~~~~~~~
     This module implements some email-related functions and classes.
 …
 from urlparse import urlparse
 from textpress.utils import _, local
 from textpress.utils.validators import is_valid_email
+from zine.utils import _, local
+from zine.utils.validators import is_valid_email

zine/utils/uploads.py

-                      r347
+                      r465
 # -*- coding: utf-8 -*-
 """
     textpress.utils.uploads
     ~~~~~~~~~~~~~~~~~~~~~~~
+    zine.utils.uploads
+    ~~~~~~~~~~~~~~~~~~
     Various utilitites for file uploading (thumbnailer etc)
 …
 from shutil import copyfileobj
 from mimetypes import guess_type
 from textpress.api import *
 from textpress.utils.admin import flash
+from zine.api import *
+from zine.utils.admin import flash

zine/utils/validators.py

-                      r367
+                      r465
 """
     textpress.utils
     ~~~~~~~~~~~~~~~
+    zine.utils
+    ~~~~~~~~~~
     This module implements various functions for validation of miscellaneous
 …
     >>> is_valid_url('http://pocoo.org/')
     True
     >>> is_valid_url('http://textpress.pocoo.org/archive')
+    >>> is_valid_url('http://zine.pocoo.org/archive')
     True
     >>> is_valid_url('textpress.pocoo.org/archive')
+    >>> is_valid_url('zine.pocoo.org/archive')
     False
     >>> is_valid_url('javascript:alert("TextPress rocks!");')
+    >>> is_valid_url('javascript:alert("Zine rocks!");')
     False
     """

zine/utils/xml.py

-                      r363
+                      r465
 """
     textpress.utils
     ~~~~~~~~~~~~~~~
+    zine.utils
+    ~~~~~~~~~~
     This module implements XML-related functions and classes.
 …
     """Get an etree implementation that is not lxml.  We love lxml but because
     lxml is an c (cython) extension we can't have it as another dependency.
     Because we need `ElementTree._write` for our tpxa module which is not
+    Because we need `ElementTree._write` for our zxa module which is not
     supported by lxml this is needed.
     """
 …
 def generate_rsd(app):
     """Generate the RSD definition for this application apis."""
     from textpress.application import url_for
+    from zine.application import url_for
     document = __import__('xml.dom.minidom', None, None, ['']).Document()
     root = document.appendChild(document.createElement('rsd'))
 …
     service = root.appendChild(document.createElement('service'))
     attributes = [('engineName', 'TextPress'),
                   ('engineLink', 'http://textpress.pocoo.org/'),
+    attributes = [('engineName', 'Zine'),
+                  ('engineLink', 'http://zine.pocoo.org/'),
                   ('homePageLink', url_for('blog/index', _external=True))]
 …
 class AtomFeed(BaseAtomFeed):
     """A helper class that creates Atom feeds."""
     import textpress
     default_generator = ('TextPress', textpress.__url__, textpress.__version__)
     del textpress
+    import zine
+    default_generator = ('Zine', zine.__url__, zine.__version__)
+    del zine

zine/utils/xxx.py

-                      r335
+                      r465
 """
     textpress.utils.xxx
     ~~~~~~~~~~~~~~~~~~~
+    zine.utils.xxx
+    ~~~~~~~~~~~~~~
     We don't know how to properly name this module, but that stuff in here
 …
 from werkzeug.contrib.reporterstream import BaseReporterStream
 from textpress.utils import local
+from zine.utils import local
 …
         situation the edit page would return a page not found.
         """
         from textpress.application import url_for
+        from zine.application import url_for
         self.invalid_targets.append(url_for(*args, **kwargs))
 …
     def __call__(self, *args, **kwargs):
         """Trigger the redirect."""
         from textpress.application import redirect, url_for
+        from zine.application import redirect, url_for
         target = self.get_redirect_target()
         if target is None:
 …
     during uploading.
     TextPress also provides a service called `get_upload_info` that returns
+    Zine also provides a service called `get_upload_info` that returns
     the information for AJAX scripts.
 …
         self.start_time = int(time())
         self._fp = NamedTemporaryFile(prefix='_textpress_upload_')
+        self._fp = NamedTemporaryFile(prefix='_zine_upload_')
         BaseReporterStream.__init__(self, request.environ, 1024 * 50)
         request.environ['wsgi.input'] = self
 …
     def _get_manager():
         app = local.application
         return os.path.join(gettempdir(), '_textpress_streams_' +
+        return os.path.join(gettempdir(), '_zine_streams_' +
                             sha.new(app.instance_folder).hexdigest()[2:10])

zine/views/init.py

-                      r463
+                      r465
 # -*- coding: utf-8 -*-
 """
     textpress.views
     ~~~~~~~~~~~~~~~
+    zine.views
+    ~~~~~~~~~~
     This module binds all the endpoints specified in `textpress.urls` to
+    This module binds all the endpoints specified in `zine.urls` to
     python functions in the view modules.
 …
     :license: GNU GPL.
 """
 from textpress.views import blog, admin
 from textpress import i18n
+from zine.views import blog, admin
+from zine import i18n
 …
     'admin/export':             admin.do_export,
     'admin/information':        admin.do_information,
     'admin/about_textpress':    admin.do_about_textpress,
+    'admin/about_zine':    admin.do_about_zine,
     'admin/change_password':    admin.do_change_password,
     'admin/help':               admin.do_help,

zine/views/admin.py

-                      r464
+                      r465
 # -*- coding: utf-8 -*-
 """
     textpress.views.admin
     ~~~~~~~~~~~~~~~~~~~~~
+    zine.views.admin
+    ~~~~~~~~~~~~~~~~
     This module implements the admin views. The admin interface is only
 …
 from os import remove, sep as pathsep
 from os.path import exists
 from textpress.api import *
 from textpress.models import User, Post, Tag, Comment, Page, ROLE_ADMIN, \
+from zine.api import *
+from zine.models import User, Post, Tag, Comment, Page, ROLE_ADMIN, \
      ROLE_EDITOR, ROLE_AUTHOR, ROLE_SUBSCRIBER, STATUS_PRIVATE, \
      STATUS_DRAFT, STATUS_PUBLISHED, COMMENT_MODERATED, COMMENT_UNMODERATED, \
      COMMENT_BLOCKED_USER, COMMENT_BLOCKED_SPAM
 from textpress.database import comments as comment_table, posts, \
+from zine.database import comments as comment_table, posts, \
      post_tags, post_links
 from textpress.utils import dump_json, load_json
 from textpress.utils.validators import is_valid_email, is_valid_url
 from textpress.utils.admin import Pagination, flash, gen_slug, \
+from zine.utils import dump_json, load_json
+from zine.utils.validators import is_valid_email, is_valid_url
+from zine.utils.admin import Pagination, flash, gen_slug, \
      commit_config_change
 from textpress.utils.xxx import make_hidden_fields, CSRFProtector, \
+from zine.utils.xxx import make_hidden_fields, CSRFProtector, \
      IntelligentRedirect, StreamReporter
 from textpress.utils.uploads import guess_mimetype, get_upload_folder, \
+from zine.utils.uploads import guess_mimetype, get_upload_folder, \
      list_files, list_images, get_im_version, get_im_path, \
      touch_upload_folder, upload_file, create_thumbnail, file_exists, \
      get_filename
 from textpress.i18n import parse_datetime, format_system_datetime, \
+from zine.i18n import parse_datetime, format_system_datetime, \
      list_timezones, has_timezone, list_languages, has_language
 from textpress.importers import list_import_queue, load_import_dump, \
+from zine.importers import list_import_queue, load_import_dump, \
      delete_import_dump, perform_import
 from textpress.pluginsystem import install_package, InstallationError, \
+from zine.pluginsystem import install_package, InstallationError, \
      SetupError
 from textpress.pingback import pingback, PingbackError
+from zine.pingback import pingback, PingbackError
 from urlparse import urlparse
 from werkzeug import escape
 …
         ('information', url_for('admin/information'), _('Information')),
         ('help', url_for('admin/help'), _('Help')),
         ('about', url_for('admin/about_textpress'), _('About'))
+        ('about', url_for('admin/about_zine'), _('About'))
+    ]
     if request.user.role == ROLE_ADMIN:
 …
     # on which page he is.
     if request.app.cfg['maintenance_mode']:
         flash(_('TextPress is in maintenance mode. Don\'t forget to '
+        flash(_('Zine is in maintenance mode. Don\'t forget to '
                 '<a href="%s">turn it off again</a> once you finish your '
                 'changes.') % url_for('admin/maintenance'))
 …
                            missing_parser))
         flash(_(u'This post was created with the parser “%(parser)s” that is '
                 u'not installed any longer.  Because of that TextPress '
+                u'not installed any longer.  Because of that Zine '
                 u'doesn\'t allow modifcations on the text until you either '
                 u'change the parser or reinstall/activate the plugin that '
 …
         flash(_(u'This comment was submitted when the parser “%(parser)s” was '
                 u'the comment parser. Because it is not available any longer '
                 u'TextPress doesn\'t allow modifcations on the text until you '
+                u'Zine doesn\'t allow modifcations on the text until you '
                 u'reinstall/activate the plugin that provided that parser.') %
               {'parser': escape(missing_parser)}, 'error')
 …
                 # we want to flash the message "configuration changed" in the
                 # new language rather than the old.  As a matter of fact we have
                 # to wait for TextPress to reload first which is why we do the
+                # to wait for Zine to reload first which is why we do the
                 # actual flashing after one reload.
                 return simple_redirect('admin/basic_options', altered='true')
 …
 @require_role(ROLE_ADMIN)
 def do_plugins(request):
     """Load and unload plugins and reload TextPress if required."""
+    """Load and unload plugins and reload Zine if required."""
     csrf_protector = CSRFProtector()
     if request.method == 'POST':
 …
                 elif e.code == 'version':
                     flash(_('The plugin uploaded has a newer package '
                             'version than this TextPress installation '
+                            'version than this Zine installation '
                             'can handle.'), 'error')
                 elif e.code == 'exists':
 …
     """Advanced configuration editor.  This is useful for development or if a
     plugin doesn't ship an editor for the configuration values.  Because all
     the values are not further checked it could easily be that TextPress is
+    the values are not further checked it could easily be that Zine is
     left in an unusable state if a variable is set to something bad.  Because
     of this the editor shows a warning and must be enabled by hand.
 …
     """Not yet implemented."""
     csrf_protector = CSRFProtector()
     if request.args.get('format') == 'tpxa':
         csrf_protector.assert_safe()
         from textpress.tpxa import export
+    if request.args.get('format') == 'zxa':
+        csrf_protector.assert_safe()
+        from zine.zxa import export
         response = export(request.app)
         response.headers['Content-Disposition'] = 'attachment; ' \
             'filename="%s.tpxa"' % '_'.join(request.app.cfg['blog_title'].split())
+            'filename="%s.zxa"' % '_'.join(request.app.cfg['blog_title'].split())
         return response
     return render_admin_response('admin/export.html', 'system.export',
 …
 @require_role(ROLE_AUTHOR)
 def do_information(request):
     """Shows some details about this TextPress installation.  It's useful for
     debugging and checking configurations.  If severe errors in a TextPress
+    """Shows some details about this Zine installation.  It's useful for
+    debugging and checking configurations.  If severe errors in a Zine
     installation occour it's a good idea to dump this page and attach it to
     a bug report mail.
 …
     from threading import activeCount
     from jinja2.defaults import DEFAULT_NAMESPACE, DEFAULT_FILTERS
     from textpress import environment, __version__ as textpress_version
+    from zine import environment, __version__ as zine_version
     thread_count = activeCount()
 …
         plugins=sorted(request.app.plugins.values(), key=lambda x: x.name),
         python_version='<br>'.join(map(escape, python_version.splitlines())),
         textpress_env=environment,
         textpress_version=textpress_version,
+        zine_env=environment,
+        zine_version=zine_version,
         template_globals=[name for name, obj in
                           sorted(request.app.template_env.globals.items())
 …
 @require_role(ROLE_AUTHOR)
 def do_about_textpress(request):
     """Just show the textpress license and some other legal stuff."""
     return render_admin_response('admin/about_textpress.html',
+def do_about_zine(request):
+    """Just show the zine license and some other legal stuff."""
+    return render_admin_response('admin/about_zine.html',
                                  'system.about')
 …
 def do_help(req, page=''):
     """Show help page."""
     from textpress.docs import load_page, get_resource
+    from zine.docs import load_page, get_resource
     rv = load_page(req.app, page)

zine/views/blog.py

-                      r461
+                      r465
 # -*- coding: utf-8 -*-
 """
     textpress.views.blog
     ~~~~~~~~~~~~~~~~~~~~
+    zine.views.blog
+    ~~~~~~~~~~~~~~~
     This module implements all the views (some people call that controller)
 …
 from datetime import date
 from textpress.api import *
 from textpress.models import Post, Tag, User, Comment, Page, ROLE_AUTHOR, \
+from zine.api import *
+from zine.models import Post, Tag, User, Comment, Page, ROLE_AUTHOR, \
     COMMENT_UNMODERATED
 from textpress.utils import dump_json, build_tag_uri, ClosingIterator
 from textpress.utils.uploads import get_filename, guess_mimetype
 from textpress.utils.validators import is_valid_email, is_valid_url
 from textpress.utils.xml import generate_rsd, dump_xml, AtomFeed
 from textpress import pingback
+from zine.utils import dump_json, build_tag_uri, ClosingIterator
+from zine.utils.uploads import get_filename, guess_mimetype
+from zine.utils.validators import is_valid_email, is_valid_url
+from zine.utils.xml import generate_rsd, dump_xml, AtomFeed
+from zine import pingback
 from werkzeug.exceptions import NotFound, Forbidden
 …
             used to send mail notifications and stuff like that.
     This view supports pingbacks via `textpress.pingback.pingback_post`
+    This view supports pingbacks via `zine.pingback.pingback_post`
     :Template name: ``show_post.html``

zine/websetup/init.py

-                      r451
+                      r465
 # -*- coding: utf-8 -*-
 """
     textpress.websetup
     ~~~~~~~~~~~~~~~~~~
     This module installs textpress automatically if the app is not ready.
     Because the whole TextPress infrastructure is not available during the
+    zine.websetup
+    ~~~~~~~~~~~~~
+    This module installs Zine automatically if the app is not ready.
+    Because the whole Zine infrastructure is not available during the
     setup this module brings it's own basic framework.
     Please also keep in mind that he CSS files are inlined because the very
     last request could not send any more requests to external files. Those
     would already be returned by the normal TextPress installation.
+    would already be returned by the normal Zine installation.
     :copyright: 2007-2008 by Armin Ronacher.
 …
 import sys
 from os import path
 from textpress.config import Configuration
 from textpress.api import db
 from textpress.models import User, ROLE_ADMIN
 from textpress.utils.crypto import gen_pwhash, gen_secret_key
 from textpress.utils.validators import is_valid_email
 from textpress.i18n import load_translations, has_language, list_languages
+from zine.config import Configuration
+from zine.api import db
+from zine.models import User, ROLE_ADMIN
+from zine.utils.crypto import gen_pwhash, gen_secret_key
+from zine.utils.validators import is_valid_email
+from zine.i18n import load_translations, has_language, list_languages
 from werkzeug import Request, Response, redirect
 from jinja2 import Environment, FileSystemLoader
 …
 class WebSetup(object):
     """Minimal WSGI application for installing textpress"""
+    """Minimal WSGI application for installing zine"""
     def __init__(self, instance_folder):
 …
         """
         This is called when all the form data is validated
         and TextPress is ready to install the data. In theory
+        and Zine is ready to install the data. In theory
         this can also be called if no form validation is done and
         someone faked the request. But because that's the fault of
 …
         try:
             from textpress.database import init_database
+            from zine.database import init_database
             # create database and all tables
 …
             error = str(e)
         else:
             from textpress.models import ROLE_ADMIN
             from textpress.database import users
+            from zine.models import ROLE_ADMIN
+            from zine.database import users
             # create admin account
 …
             # set up the initial config
             config_filename = path.join(self.instance_folder, 'textpress.ini')
+            config_filename = path.join(self.instance_folder, 'zine.ini')
             cfg = Configuration(config_filename)
             t = cfg.edit()
 …
         # use a local variable, the global render_response could
         # be None because we reloaded textpress and this module.
+        # be None because we reloaded zine and this module.
         return render_response(request, error and 'error.html' or 'finished.html', {
             'finished': True,

zine/websetup/templates/admin_account.html

r431	r465
3	3	<h2>{{ _('Administrator Account') }}</h2>
4	4	<p>{% trans %}
5		In order to log into your ~~TextPress~~ installation you have to provide a
	5	In order to log into your Zine installation you have to provide a
6	6	login name for the administration user. You can later rename or delete
7	7	that user if you want.

zine/websetup/templates/database.html

r426	r465
3	3	<h2>{{ _('Database') }}</h2>
4	4	<p>{% trans %}
5		~~TextPress~~ uses a database to store blog posts and other information. The
	5	Zine uses a database to store blog posts and other information. The
6	6	only information it requires therefore is a database URI. Depending on your
7	7	database this URI looks different. Have a look at the following table for

zine/websetup/templates/error.html

-                      r426
+                      r465
 {% block body %}
   <h2>{{ _('Setup Failed') }}</h2>
   <p>{{ _('The websetup was not able to finish the TextPress installation successfully.') }}
+  <p>{{ _('The websetup was not able to finish the Zine installation successfully.') }}
   <p>{% trans %}
     If you need help for setting up TextPress have a look at the support
+    If you need help for setting up Zine have a look at the support
     wepage that will be there once a beta is available :-)
   {% endtrans %}

zine/websetup/templates/layout.html

-                      r427
+                      r465
 <html>
 <head>
   <title>{{ _('TextPress Setup') }}</title>
+  <title>{{ _('Zine Setup') }}</title>
   <style type="text/css">
     body {
 …
   <div class="page">
     <div class="header">
       <h1>{{ _('TextPress Setup') }}</h1>
+      <h1>{{ _('Zine Setup') }}</h1>
     </div>
     <div class="contents">

zine/websetup/templates/start.html

-                      r454
+                      r465
 {% extends "layout.html" %}
 {% block body %}
   <h2>{{ _('Welcome To The TextPress Setup') }}</h2>
+  <h2>{{ _('Welcome To The Zine Setup') }}</h2>
   <p>{% trans %}
     Welcome to the TextPress Setup. This Wizard will ask you some
     basic questions and setup TextPress for you.
+    Welcome to the Zine Setup. This Wizard will ask you some
+    basic questions and setup Zine for you.
   {% endtrans %}</p>
   <p>{% trans %}

zine/websetup/templates/summary.html

-                      r426
+                      r465
   <h2>{{ _('Setup Starting') }}</h2>
   <p>{% trans %}
     TextPress knows now about all the information it needs to setup your
     instance. After you click on the install button TextPress will create
+    Zine knows now about all the information it needs to setup your
+    instance. After you click on the install button Zine will create
     the database tables and insert the default information. Right after that
     TextPress will be online in maintenance mode which means that it's only
+    Zine will be online in maintenance mode which means that it's only
     visible to the administrator, all other users will get a message that
     shows that the blog is in maintenance mode right now.

zine/widgets.py

-                      r404
+                      r465
 # -*- coding: utf-8 -*-
 """
     textpress.widgets
     ~~~~~~~~~~~~~~~~~
+    zine.widgets
+    ~~~~~~~~~~~~
     This module provides the core widgets and functionality to build your
     own.  Widgets are, in the context of TextPress, classes that have a
+    own.  Widgets are, in the context of Zine, classes that have a
     unicode conversion function that renders a template into a string but
     have all their attributes attached to themselves.  This gives template
 …
 import inspect
 from os import path
 from textpress.api import *
 from textpress.database import pages as pages_table
 from textpress.models import Post, Tag, Comment, Page
 from textpress.utils.xxx import CSRFProtector
+from zine.api import *
+from zine.database import pages as pages_table
+from zine.models import Post, Tag, Comment, Page
+from zine.utils.xxx import CSRFProtector
 from jinja2 import nodes

zine/zxa.py

-                      r443
+                      r465
 # -*- coding: utf-8 -*-
 """
     textpress.tpxa
     ~~~~~~~~~~~~~~
     TextPress eXtended Atom.  This module sounds like it has a ridiculous
+    zine.zxa
+    ~~~~~~~~
+    Zine eXtended Atom.  This module sounds like it has a ridiculous
     implementation but that's actually intention.  The main reason is that
     because this file can (and does) become incredible big for bigger blogs
 …
 from itertools import chain
 import textpress
 from textpress.api import *
 from textpress.models import Post, User
 from textpress.utils import build_tag_uri
 from textpress.utils.dates import format_iso8601
 from textpress.utils.xml import get_etree, escape
+import zine
+from zine.api import *
+from zine.models import Post, User
+from zine.utils import build_tag_uri
+from zine.utils.dates import format_iso8601
+from zine.utils.xml import get_etree, escape
 ATOM_NS = 'http://www.w3.org/2005/Atom'
 TEXTPRESS_NS = 'http://textpress.pocoo.org/'
+ZINE_NS = 'http://zine.pocoo.org/'
 XML_PREAMBLE = u'''\
 …
 <!--
     This is a TextPress eXtended Atom file.  It is a superset of the Atom
+    This is a Zine eXtended Atom file.  It is a superset of the Atom
     specification so every Atom-enabled application should be able to use at
     least the Atom subset of the exported data.  You can use this file to
 …
 -->
 <a:feed xmlns:a="%(atom_ns)s" xmlns:tp="%(textpress_ns)s">\
+<a:feed xmlns:a="%(atom_ns)s" xmlns:z="%(zine_ns)s">\
 <a:title>%(title)s</a:title>\
 <a:subtitle>%(subtitle)s</a:subtitle>\
 <a:id>%(id)s</a:id>\
 <a:generator uri="http://textpress.pocoo.org/"\
  version="%(version)s">TextPress TPXA Export</a:generator>\
+<a:generator uri="http://zine.pocoo.org/"\
+ version="%(version)s">ZineXA Export</a:generator>\
 <a:link href="%(blog_url)s"/>\
 <a:updated>%(updated)s</a:updated>'''
 …
 def export(app):
     """Dump all the application data into an TPXA response."""
+    """Dump all the application data into an ZXA response."""
     return Response(Writer(app)._generate(), mimetype='application/atom+xml')
 …
         self.etree = etree = get_etree()
         self.atom = _ElementHelper(etree, ATOM_NS)
         self.tp = _ElementHelper(etree, TEXTPRESS_NS)
+        self.z = _ElementHelper(etree, ZINE_NS)
         self._dependencies = {}
         self.users = {}
         self.participants = [x(self) for x in
                              emit_event('get-tpxa-participants') if x]
+                             emit_event('get-zxa-participants') if x]
     def _generate(self):
 …
             last_update = now
         feed_id = build_tag_uri(self.app, last_update, 'tpxa_export', 'full')
+        feed_id = build_tag_uri(self.app, last_update, 'zxa_export', 'full')
         yield (XML_PREAMBLE % {
             'version':      escape(textpress.__version__),
+            'version':      escape(zine.__version__),
             'title':        escape(self.app.cfg['blog_title']),
             'subtitle':     escape(self.app.cfg['blog_tagline']),
             'atom_ns':      ATOM_NS,
             'textpress_ns': TEXTPRESS_NS,
+            'zine_ns':      ZINE_NS,
             'id':           escape(feed_id),
             'blog_url':     escape(self.app.cfg['blog_url']),
 …
         }).encode('utf-8')
         ns_map = {ATOM_NS: 'a', TEXTPRESS_NS: 'tp'}
+        ns_map = {ATOM_NS: 'a', ZINE_NS: 'z'}
         out = _MinimalO()
         def dump_node(node):
 …
         # dump configuration
         cfg = self.tp('configuration')
+        cfg = self.z('configuration')
         for key, value in self.app.cfg.iteritems():
             self.tp('item', key=key, text=unicode(value), parent=cfg)
+            self.z('item', key=key, text=unicode(value), parent=cfg)
         yield dump_node(cfg)
 …
         # if we have dependencies (very likely) dump them now
         if self._dependencies:
             yield '<tp:dependencies>'
+            yield '<z:dependencies>'
             for node in self._dependencies.itervalues():
                 yield dump_node(node)
             yield '</tp:dependencies>'
+            yield '</z:dependencies>'
         yield XML_EPILOG.encode('utf-8')
 …
     def new_dependency(self, tag):
         id = '%x' % (len(self._dependencies) + 1)
         node = self.etree.Element(tag, {self.tp.dependency: id})
+        node = self.etree.Element(tag, {self.z.dependency: id})
         self._dependencies[id] = node
         return node
     def _register_user(self, user):
         rv = self.new_dependency(self.tp.user)
         self.tp('username', text=user.username, parent=rv)
         self.tp('role', text=str(user.role), parent=rv)
         self.tp('pw_hash', text=user.pw_hash.encode('base64'), parent=rv)
         self.tp('display_name', text=user._display_name, parent=rv)
         self.tp('first_name', text=user.first_name, parent=rv)
         self.tp('last_name', text=user.last_name, parent=rv)
         self.tp('description', text=user.description, parent=rv)
+        rv = self.new_dependency(self.z.user)
+        self.z('username', text=user.username, parent=rv)
+        self.z('role', text=str(user.role), parent=rv)
+        self.z('pw_hash', text=user.pw_hash.encode('base64'), parent=rv)
+        self.z('display_name', text=user._display_name, parent=rv)
+        self.z('first_name', text=user.first_name, parent=rv)
+        self.z('last_name', text=user.last_name, parent=rv)
+        self.z('description', text=user.description, parent=rv)
         for participant in self.participants:
             participant.process_user(rv, user)
 …
         author = self.atom('author', parent=entry)
         author.attrib[self.tp.dependency] = self.users[post.author.user_id] \
                                                 .attrib[self.tp.dependency]
+        author.attrib[self.z.dependency] = self.users[post.author.user_id] \
+                                                .attrib[self.z.dependency]
         self.atom('name', text=post.author.display_name, parent=author)
         self.atom('email', text=post.author.email, parent=author)
         self.tp('slug', text=post.slug, parent=entry)
         self.tp('id', text=str(post.post_id), parent=entry)
         self.tp('comments_enabled', text=post.comments_enabled
                 and 'yes' or 'no', parent=entry)
         self.tp('pings_enabled', text=post.pings_enabled
                 and 'yes' or 'no', parent=entry)
         self.tp('status', text=str(post.status), parent=entry)
+        self.z('slug', text=post.slug, parent=entry)
+        self.z('id', text=str(post.post_id), parent=entry)
+        self.z('comments_enabled', text=post.comments_enabled
+               and 'yes' or 'no', parent=entry)
+        self.z('pings_enabled', text=post.pings_enabled
+               and 'yes' or 'no', parent=entry)
+        self.z('status', text=str(post.status), parent=entry)
         self.atom('content', type='html', text=post.body.render(), parent=entry)
 …
             self.atom('summary', type='html', text=post.intro.render(),
                       parent=entry)
         self.tp('data', text=dumps({
+        self.z('data', text=dumps({
             'extra':        post.extra,
             'raw_body':     post.raw_body,
 …
         for c in post.comments:
             comment = self.tp('comment', parent=entry)
             self.tp('id', text=str(c.comment_id), parent=comment)
             author = self.tp('author', parent=comment)
             self.tp('name', text=c.author, parent=author)
             self.tp('email', text=c.email, parent=author)
             self.tp('uri', text=c.www, parent=author)
             self.tp('published', text=format_iso8601(c.pub_date),
                     parent=comment)
             self.tp('blocked', text=c.blocked and 'yes' or 'no',
                     parent=comment)
             self.tp('is_pingback', text=c.is_pingback and 'yes' or 'no',
                     parent=comment)
             self.tp('blocked_msg', text=str(c.blocked_msg or ''),
                     parent=comment)
             self.tp('parent', text=c.parent_id is not None and str(c.parent_id)
                     or '', parent=comment)
             self.tp('data', text=dumps({
+            comment = self.z('comment', parent=entry)
+            self.z('id', text=str(c.comment_id), parent=comment)
+            author = self.z('author', parent=comment)
+            self.z('name', text=c.author, parent=author)
+            self.z('email', text=c.email, parent=author)
+            self.z('uri', text=c.www, parent=author)
+            self.z('published', text=format_iso8601(c.pub_date),
+                   parent=comment)
+            self.z('blocked', text=c.blocked and 'yes' or 'no',
+                   parent=comment)
+            self.z('is_pingback', text=c.is_pingback and 'yes' or 'no',
+                   parent=comment)
+            self.z('blocked_msg', text=str(c.blocked_msg or ''),
+                   parent=comment)
+            self.z('parent', text=c.parent_id is not None and str(c.parent_id)
+                   or '', parent=comment)
+            self.z('data', text=dumps({
                 'raw_body':     c.raw_body,
                 'parser_data':  c.parser_data

Note: See TracChangeset for help on using the changeset viewer.

open source content publishing system

Changeset 465:e90af9681b03

Legend:

Download in other formats: