diff --git a/.woodpecker.yml b/.woodpecker.yml
index 645b671..c05aa75 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -9,7 +9,6 @@ pipeline:
       - pip install Lektor
       - rm -rf i18n
       - git clone https://lab.encryptionin.space/Queerscriptors/weblate-website.git i18n
-      - lektor plugin reinstall
       - lektor build --output-path public
       - lektor build --output-path public
       - lektor build --output-path public
diff --git a/packages/i18n/.gitignore b/packages/i18n/.gitignore
new file mode 100644
index 0000000..ba2b311
--- /dev/null
+++ b/packages/i18n/.gitignore
@@ -0,0 +1,61 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+env/
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*,cover
+.hypothesis/
+
+# Translations
+*.mo
+
+# Django stuff:
+*.log
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+#Ipython Notebook
+.ipynb_checkpoints
diff --git a/packages/i18n/LICENSE b/packages/i18n/LICENSE
new file mode 100644
index 0000000..9cecc1d
--- /dev/null
+++ b/packages/i18n/LICENSE
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    {one line to give the program's name and a brief idea of what it does.}
+    Copyright (C) {year}  {name of author}
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    {project}  Copyright (C) {year}  {fullname}
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/packages/i18n/README b/packages/i18n/README
new file mode 100644
index 0000000..9cc3102
--- /dev/null
+++ b/packages/i18n/README
@@ -0,0 +1,3 @@
+This plugin enables a smarter way to translate a Lektor static website using old-good PO files. So you can use your beloved translation processes and tools.
+
+See README.md
diff --git a/packages/i18n/README.md b/packages/i18n/README.md
new file mode 100644
index 0000000..e8a6fee
--- /dev/null
+++ b/packages/i18n/README.md
@@ -0,0 +1,166 @@
+# Lektor i18n plugin
+
+This plugin enables a smarter way to translate a [Lektor](http://getlektor.com) static website using old-good PO files. So you can use your beloved translation processes and tools.
+
+## Principles
+
+The idea of this plugin is to capture the **sentences** or **paragraphs** from your **content** and **templates**, and populate a standard *Gettext* [PO file](https://www.gnu.org/software/gettext/manual/html_node/PO-Files.html). Using usual tools, user can translate these files, very easily. Then the plugin will merge the translations into new [_alternative_](https://www.getlektor.com/docs/content/alts/) content files, providing a translated website.
+
+## Configuration
+
+### Configuration file
+
+#### `configs/i18n.ini`
+
+    content = en
+    translations = fr,es,it
+    i18npath = i18n
+    translate_paragraphwise = False
+
+Where :
+
+* `content` is the language used to write `contents.lr` files (default is `en`)
+* `translations` is the list of target languages (you want to translate into).
+* `i18npath` is the directory where translation files will be produced/stored (default is `i18n`). This directory needs to be relative to root path.
+* `translate_paragraphwise` specifies whether translation strings are created per line or per paragraph. The latter is helpful for documents wrapping texts at 80 character boundaries. It is set to `False` by default.
+
+#### `babel.cfg`
+
+If you plan to localise your templates as well, you can use
+`{{ _("some string") }}` in your templates. To make this work, pybabel should be installed (pip install pybabel; maybe pip3). A `babel.cfg` also has to exist in your project root with this content:
+
+    [jinja2: **/templates/**.html]
+    encoding = utf-8
+    extensions=jinja2.ext.autoescape,jinja2.ext.with_
+
+### Translatable fields
+
+In order for a field to be marked as translatable, an option has to be set in the field definition. Both blocks and flowblocks fields are subjects to translations.
+
+in `flowblocks/*.ini` and/or `models/*.ini`, mark a field as translatable with :
+
+    [model]
+    name = Page
+    label = {{ this.title }}
+
+    [fields.title]
+    label = Title
+    type = string
+    translate = True
+
+    [fields.body]
+    label = Body
+    type = markdown
+    translate = True
+
+Both `title` and `body` are now translatable. It means that during the parsing phase, all sentences from `title` or `body` fields from the `contents.lr` files with `Page` model will populate the collected PO file.
+
+Another flowblock example:
+
+    [block]
+    name = Section Block
+    button_label = Section
+
+    [fields.title]
+    label = Title
+    type = string
+    translate = True
+
+    [fields.body]
+    label = Body
+    type = markdown
+    translate = True
+
+    [fields.image]
+    label = Image
+    type = select
+    source = record.attachments.images
+
+    [fields.image_position]
+    label = Image Position
+    type = select
+    choices = left, right
+    choice_labels = Left, Right
+    default = right
+
+Here again, `body` and `title` will be translated. But `image` and `image_position` won't.
+
+### Non-english content
+
+Thanx to a limitation of msginit it's not so easy to translate a website with default language set to anything but english.
+
+So if your default content language is not english, you will have to edit the first `contents-en.po` file and remove the translations (by hand ?)...
+
+## Installation
+
+### Prerequisites
+
+#### Lektor
+
+This plugin has been tested with `Lektor 3..0.x`.
+
+#### GetText
+
+Both Gettext and Pybabel are required.  For a Debian/Ubuntu system, this means a simple :
+
+    sudo apt-get install gettext python3-babel
+
+On macOS, use a decent package manager, like MacPorts or Homebrew. With Homebrew:
+
+    brew install gettext
+
+and then pip to fetch pybabel:
+
+    pip install babel
+
+### Installation
+
+Very straightforward :
+
+    $ lektor plugins add lektor-i18n
+
+Verify installation with a simple :
+
+    $ lektor plugins list
+    ...
+    lektor-i18n (version 0.1)
+    ...
+
+## Usage
+
+The translation mechanism is hooked into the build system. So translating a website just means building the website.
+
+    $ lektor build
+
+On first call, a new `i18n` directory (can be changed in configuration file) will be created on top the lektor tree.
+
+This directory will be populated with a single `contents.pot` file, compiling all the sentences found by the plugin. The list of fields eligible to translation is configured in the models/flows definition with `translate=True` added to each field.
+
+For each translation language (still from the configuration file), a `content-<language>.po` file will be created/updated. These are the files that need to be translated with your prefered tool (like [POEdit](http://poedit.net) or [Transifex](http://transifex.com)).
+
+All translation files (`contents-*.po`) are then compiled and merged with the original `contents.lr` files to produce all the `contents-<language>.lr` files in their respective directories.
+
+Due to the way Lektor building system is designed, all these steps happen on every build. This means that sometime, after translating the `contents-*.po` files, it might be required to run the build system twice to see the translation appear in the final HTML files.
+
+### Project file
+
+It's still the user responsability to modify the project file in order to include the expected languages :
+
+    [alternatives.en]
+    name = English
+    primary = yes
+    locale = en_US
+
+    [alternatives.fr]
+    name = French
+    url_prefix = /fr/
+    locale = fr
+
+See [Lektor Documentation](https://www.getlektor.com/docs/content/alts/) for more information.
+
+## Support
+
+This plugin is provided as-is by [NumeriCube](http://numericube.com) a human-sized Paris-based company prodiving tailored services to smart customers.
+
+We will be happy to try to help you with this plugin if need. Just file an issue on our [GitHub account](https://gihub.com/numericube/lektor-i18n-plugin/).
+
diff --git a/packages/i18n/lektor_i18n.py b/packages/i18n/lektor_i18n.py
new file mode 100644
index 0000000..a0ac284
--- /dev/null
+++ b/packages/i18n/lektor_i18n.py
@@ -0,0 +1,472 @@
+# -*- coding: utf-8 -*-
+#pylint: disable=wrong-import-position
+import sys
+
+PY3 = sys.version_info > (3,)
+
+import collections
+import datetime
+import gettext
+import os
+from os.path import relpath, join, exists, dirname
+from pprint import PrettyPrinter
+import re
+import tempfile
+import time
+if PY3:
+    from urllib.parse import urljoin
+else:
+    from urlparse import urljoin
+
+from lektor.pluginsystem import Plugin
+from lektor.db import Page
+from lektor.metaformat import tokenize
+from lektor.reporter import reporter
+from lektor.types.flow import FlowType, process_flowblock_data
+from lektor.utils import portable_popen, locate_executable
+from lektor.environment import PRIMARY_ALT
+from lektor.filecontents import FileContents
+from lektor.context import get_ctx
+
+
+
+command_re = re.compile(r'([a-zA-Z0-9.-_]+):\s*(.*?)?\s*$')
+# derived from lektor.types.flow but allows more dash signs
+block2re = re.compile(r'^###(#+)\s*([^#]*?)\s*###(#+)\s*$')
+
+POT_HEADER = """msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\\n"
+"Report-Msgid-Bugs-To: \\n"
+"POT-Creation-Date: %(NOW)s\\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\\n"
+"Language-Team: %(LANGUAGE)s <LL@li.org>\\n"
+"Language: %(LANGUAGE)s\\n"
+"MIME-Version: 1.0\\n"
+"Content-Type: text/plain; charset=UTF-8\\n"
+"Content-Transfer-Encoding: 8bit\\n"
+
+"""
+
+
+# python2/3 compatibility layer
+
+encode = lambda s: (s if PY3 else s.encode('UTF-8'))
+
+def trans(translator, s):
+    """Thin gettext translation wrapper to allow compatibility with both Python2
+    and 3."""
+    if PY3:
+        return translator.gettext(s)
+    else:
+        return translator.ugettext(s)
+
+
+def truncate(s, length=32):
+    return (s[:length] + '..') if len(s) > length else s
+
+#pylint: disable=too-few-public-methods,redefined-variable-type
+class TemplateTranslator(object):
+    def __init__(self, i18npath):
+        self.i18npath = i18npath
+        self.__lastlang = None
+        self.translator = None
+        self.init_translator()
+
+    def init_translator(self):
+        ctx = get_ctx()
+        if not ctx:
+            self.translator = gettext.GNUTranslations()
+            return super(TemplateTranslator, self).__init__()
+        if not self.__lastlang == ctx.locale:
+            self.__lastlang = ctx.locale
+            self.translator = gettext.translation("contents",
+                    join(self.i18npath, '_compiled'),
+                    languages=[ctx.locale], fallback=True)
+
+    def gettext(self, x):
+        self.init_translator() # lagnuage could have changed
+        return self.translator.gettext(x)
+
+    def ngettext(self, *x):
+        self.init_translator()
+        return self.translator.ngettext(*x)
+
+
+class Translations():
+    """Memory of translations"""
+
+    def __init__(self):
+        # dict like {'text' : ['source1', 'source2',...],}
+        self.translations = collections.OrderedDict()
+
+    def add(self, text, source):
+        if not text in self.translations.keys():
+            self.translations[text]=[]
+            reporter.report_debug_info('added to translation memory : ', truncate(text))
+        if not source in self.translations[text]:
+            self.translations[text].append(source)
+
+    def __repr__(self):
+        return PrettyPrinter(2).pformat(self.translations)
+
+    def as_pot(self, content_language):
+        """returns a POT version of the translation dictionnary"""
+        now = datetime.datetime.now().strftime('%Y-%m-%d %H:%M')
+        now += '+%s'%(time.tzname[0])
+        result = POT_HEADER % {'LANGUAGE' : content_language, 'NOW' : now}
+
+        for msg, paths in self.translations.items():
+            result += "#: %s\n"%" ".join(paths)
+            for token, repl in {'\\': '\\\\', '\n': '\\n', '\t': '\\t', '"': '\\"'}.items():
+                msg = msg.replace(token, repl)
+            result+='msgid "%s"\n' % msg
+            result+='msgstr ""\n\n'
+        return result
+
+    def write_pot(self, pot_filename, language):
+        if not os.path.exists(os.path.dirname(pot_filename)):
+            os.makedirs(os.path.dirname(pot_filename))
+        with open(pot_filename,'w') as f:
+            f.write(encode(self.as_pot(language)))
+
+    def merge_pot(self, from_filenames, to_filename):
+        msgcat=locate_executable('msgcat')
+        if msgcat is None:
+            msgcat="/usr/bin/msgcat"
+        cmdline=[msgcat, "--use-first"]
+        cmdline.extend(from_filenames)
+        cmdline.extend(("-o", to_filename))
+        reporter.report_debug_info('msgcat cmd line', cmdline)
+        portable_popen(cmdline).wait()
+
+    def parse_templates(self, to_filename):
+        pybabel=locate_executable('pybabel')
+        if pybabel is None:
+            pybabel="/usr/bin/pybabel"
+        cmdline=[pybabel, 'extract', '-F', 'babel.cfg', "-o", to_filename, "./"]
+        reporter.report_debug_info('pybabel cmd line', cmdline)
+        portable_popen(cmdline).wait()
+
+translations = Translations() # let's have a singleton
+
+class POFile():
+
+    FILENAME_PATTERN = "contents+%s.po"
+
+    def __init__(self, language, i18npath):
+        self.language=language
+        self.i18npath=i18npath
+
+    def _exists(self):
+        """Returns True if <language>.po file exists in i18npath"""
+        filename=self.FILENAME_PATTERN%self.language
+        return exists( join(self.i18npath, filename) )
+
+    def _msg_init(self):
+        """Generates the first <language>.po file"""
+        msginit=locate_executable('msginit')
+        cmdline=[msginit, "-i", "contents.pot", "-l", self.language, "-o", self.FILENAME_PATTERN%self.language, "--no-translator"]
+        reporter.report_debug_info('msginit cmd line', cmdline)
+        portable_popen(cmdline, cwd=self.i18npath).wait()
+
+    def _msg_merge(self):
+        """Merges an existing <language>.po file with .pot file"""
+        msgmerge=locate_executable('msgmerge')
+        cmdline=[msgmerge, self.FILENAME_PATTERN%self.language, "contents.pot", "-U", "-N", "--backup=simple"]
+        reporter.report_debug_info('msgmerge cmd line', cmdline)
+        portable_popen(cmdline, cwd=self.i18npath).wait()
+
+    def _prepare_locale_dir(self):
+        """Prepares the i18n/<language>/LC_MESSAGES/ to store the .mo file ; returns the dirname"""
+        directory = join('_compiled',self.language, "LC_MESSAGES")
+        try:
+            os.makedirs(join(self.i18npath, directory))
+        except OSError:
+            pass # already exists, no big deal
+        return directory
+
+    def _msg_fmt(self, locale_dirname):
+        """Compile an existing <language>.po file into a .mo file"""
+        msgfmt=locate_executable('msgfmt')
+        cmdline=[msgfmt, self.FILENAME_PATTERN%self.language, "-o", join(locale_dirname,"contents.mo")]
+        reporter.report_debug_info('msgfmt cmd line', cmdline)
+        portable_popen(cmdline, cwd=self.i18npath).wait()
+
+    def generate(self):
+        if self._exists():
+            self._msg_merge()
+        else:
+            self._msg_init()
+        locale_dirname=self._prepare_locale_dir()
+        self._msg_fmt(locale_dirname)
+
+def line_starts_new_block(line, prev_line):
+    """Detect a new block in a lektor document. Blocks are delimited by a line
+    containing 3 or more dashes. This actually matches the definition of a
+    markdown level 2 heading, so this function returns False if no colon was
+    found in the line before, so if it isn't a new block with a key: value pair
+    before."""
+    if not prev_line or ':' not in prev_line:
+        return False # could be a markdown heading
+    line = line.strip()
+    return line == u'-' * len(line) and len(line) >= 3
+
+
+
+
+def split_paragraphs(document):
+    if isinstance(document, (list, tuple)):
+        document = ''.join(document) # list of lines
+    return re.split('\n(?:\\s*\n){1,}', document)
+
+# We cannot check for unused arguments here, they're mandated by the plugin API.
+#pylint:disable=unused-argument
+class I18NPlugin(Plugin):
+    name = u'i18n'
+    description = u'Internationalisation helper'
+
+    def translate_tag(self, s, *args, **kwargs):
+        if not self.enabled:
+            return s # no operation
+        s = s.strip()
+        ctx = get_ctx()
+        if self.content_language==ctx.locale:
+            translations.add(s,'(dynamic)')
+            reporter.report_debug_info('added to translation memory (dynamic): ', truncate(s))
+            return s
+        else:
+            translator = gettext.translation("contents", join(self.i18npath,'_compiled'), languages=[ctx.locale], fallback = True)
+            return trans(translator, s)
+
+    def choose_language(self, l, language, fallback='en', attribute='language'):
+        """Will return from list 'l' the element with attribute 'attribute' set to given 'language'.
+        If none is found, will try to return element with attribute 'attribute' set to given 'fallback'.
+        Else returns None."""
+        language=language.strip().lower()
+        fallback=fallback.strip().lower()
+        for item in l:
+            if item[attribute].strip().lower()==language:
+                return item
+        # fallback
+        for item in l:
+            if item[attribute].strip().lower()==fallback:
+                return item
+        return None
+
+    #pylint: disable=attribute-defined-outside-init
+    def on_setup_env(self, **extra):
+        """Setup `env` for the plugin"""
+        # Read configuration
+        self.enabled = self.get_config().get('enable', 'true') in ('true','True','1')
+        if not self.enabled:
+            reporter.report_generic('I18N plugin disabled in configs/i18n.ini')
+
+        self.i18npath = self.get_config().get('i18npath', 'i18n')
+        self.url_prefix = self.get_config().get('url_prefix', 'http://localhost/')
+        # whether or not to use a pargraph as smallest translatable unit
+        self.trans_parwise = self.get_config().get('translate_paragraphwise',
+                'false') in ('true','True','1')
+        self.content_language=self.get_config().get('content', 'en')
+        self.env.jinja_env.add_extension('jinja2.ext.i18n')
+        self.env.jinja_env.policies['ext.i18n.trimmed'] = True # do a .strip()
+        self.env.jinja_env.install_gettext_translations(TemplateTranslator(self.i18npath))
+        # ToDo: is this still required
+        try:
+            self.translations_languages=self.get_config().get('translations').replace(' ','').split(',')
+        except AttributeError:
+            raise RuntimeError('Please specify the "translations" configuration option in configs/i18n.ini')
+
+        if not self.content_language in self.translations_languages:
+            self.translations_languages.append(self.content_language)
+
+        self.env.jinja_env.filters['translate'] = self.translate_tag
+        self.env.jinja_env.globals['_'] = self.translate_tag
+        self.env.jinja_env.globals['choose_language'] = self.choose_language
+
+    def process_node(self, fields, sections, source, zone, root_path):
+        """For a given node (), identify all fields to translate, and add new
+        fields to translations memory. Flow blocks are handled recursively."""
+        for field in fields:
+            if ('translate' in field.options) \
+                    and (source.alt in (PRIMARY_ALT, self.content_language)) \
+                    and (field.options['translate'] in ('True', 'true', '1', 1)):
+                if field.name in sections.keys():
+                    section = sections[field.name]
+                    # if blockwise, each paragraph is one translatable message,
+                    # otherwise each line
+                    chunks = (split_paragraphs(section) if self.trans_parwise
+                            else [x.strip() for x in section if x.strip()])
+                    for chunk in chunks:
+                        translations.add(chunk.strip('\r\n'),
+                            "%s (%s:%s.%s)" % (
+                                urljoin(self.url_prefix, source.url_path),
+                                relpath(source.source_filename, root_path),
+                                zone, field.name)
+                            )
+
+            if isinstance(field.type, FlowType):
+                if field.name in sections:
+                    section = sections[field.name]
+                    for blockname, blockvalue in process_flowblock_data("".join(section)):
+                        flowblockmodel = source.pad.db.flowblocks[blockname]
+                        blockcontent=dict(tokenize(blockvalue))
+                        self.process_node(flowblockmodel.fields, blockcontent, source, blockname, root_path)
+
+
+    def __parse_source_structure(self, lines):
+        """Parse structure of source file. In short, there are two types of
+        chunks: those which need to be translated ('translatable') and those
+        which don't ('raw'). "title: test" could be split into:
+        [('raw': 'title: ',), ('translatable', 'test')]
+        NOTE: There is no guarantee that multiple raw blocks couldn't occur and
+        in fact due to implementation details, this actually happens."""
+        blocks = []
+        count_lines_block = 0 # counting the number of lines of the current block
+        is_content = False
+        prev_line = None
+        for line in lines:
+            stripped_line = line.strip()
+            if not stripped_line: # empty line
+                blocks.append(('raw', '\n'))
+                continue
+            # line like "---*" or a new block tag
+            if line_starts_new_block(stripped_line, prev_line) or \
+                    block2re.search(stripped_line):
+                count_lines_block=0
+                is_content = False
+                blocks.append(('raw', line))
+            else:
+                count_lines_block+=1
+                match = command_re.search(stripped_line)
+                if count_lines_block==1 and not is_content and match: # handle first line, while not in content
+                    key, value = match.groups()
+                    blocks.append(('raw', encode(key) + ':'))
+                    if value:
+                        blocks.append(('raw', ' '))
+                        blocks.append(('translatable', encode(value)))
+                    blocks.append(('raw', '\n'))
+                else:
+                    is_content=True
+            if is_content:
+                blocks.append(('translatable', line))
+            prev_line = line
+        # join neighbour blocks of same type
+        newblocks = []
+        for type, data in blocks:
+            if len(newblocks) > 0 and newblocks[-1][0] == type: # same type, merge
+                newblocks[-1][1] += data
+            else:
+                newblocks.append([type, data])
+        return newblocks
+
+
+    def on_before_build(self, builder, build_state, source, prog, **extra):
+        """Before building a page, produce all its alternatives (=translated pages)
+        using the gettext translations available."""
+        if self.enabled and isinstance(source,Page) and source.alt in (PRIMARY_ALT, self.content_language):
+            contents = None
+            for fn in source.iter_source_filenames():
+                try:
+                    contents=FileContents(fn)
+                except IOError:
+                    pass # next
+
+            for language in self.translations_languages:
+                translator = gettext.translation("contents",
+                        join(self.i18npath,'_compiled'), languages=[language], fallback = True)
+                translated_filename = join(dirname(source.source_filename),
+                        "contents+%s.lr"%language)
+                with contents.open(encoding='utf-8') as file:
+                    chunks = self.__parse_source_structure(file.readlines())
+                with open(translated_filename,"w") as f:
+                    for type, content in chunks: # see __parse_source_structure
+                        if type == 'raw':
+                            f.write(content)
+                        elif type == 'translatable':
+                            if self.trans_parwise: # translate per paragraph
+                                f.write(self.__trans_parwise(content,
+                                    translator))
+                            else:
+                                f.write(self.__trans_linewise(content,
+                                    translator))
+                        else:
+                            raise RuntimeError("Unknown chunk type detected, this is a bug")
+
+    def __trans_linewise(self, content, translator):
+        """Translate the chunk linewise."""
+        lines = []
+        for line in content.split('\n'):
+            line_stripped = line.strip()
+            trans_stripline = trans(translator, line_stripped) # trnanslate the stripped version
+            # and re-inject the stripped translation into original line (not stripped)
+            lines.append(line.replace(line_stripped,
+                        trans_stripline, 1))
+        return '\n'.join(lines)
+
+
+    def __trans_parwise(self, content, translator):
+        """Extract translatable strings block-wise, query for translation of
+        block and re-inject result."""
+        result = []
+        for paragraph in split_paragraphs(content):
+            stripped = paragraph.strip('\n\r')
+            paragraph = paragraph.replace(stripped, trans(translator,
+                    stripped))
+            result.append(paragraph)
+        return '\n\n'.join(result)
+
+
+    def on_after_build(self, builder, build_state, source, prog, **extra):
+        if self.enabled and isinstance(source,Page):
+            try:
+                text = source.contents.as_text()
+            except IOError:
+                pass
+            else:
+                fields = source.datamodel.fields
+                sections = dict(tokenize(text.splitlines())) # {'sectionname':[list of section texts]}
+                self.process_node(fields, sections, source, source.datamodel.id, builder.env.root_path)
+
+
+    def get_templates_pot_filename(self):
+        try:
+            return self.pot_templates_filename
+        except AttributeError:
+            self.pot_templates_file = tempfile.NamedTemporaryFile(suffix=".pot",prefix="templates-")
+            self.pot_templates_filename = self.pot_templates_file.name
+            return self.pot_templates_filename
+
+    def on_before_build_all(self, builder, **extra):
+        if self.enabled:
+            reporter.report_generic("i18n activated, with main language %s"% self.content_language )
+            templates_pot_filename = self.get_templates_pot_filename()
+            reporter.report_generic("Parsing templates for i18n into %s" \
+                    % relpath(templates_pot_filename, builder.env.root_path))
+            translations.parse_templates(templates_pot_filename)
+
+
+    def on_after_build_all(self, builder, **extra):
+        """Once the build process is over :
+        - write the translation template `contents.pot` on the filesystem,
+        - write all translation contents+<language>.po files """
+        if not self.enabled:
+            return
+        contents_pot_filename = join(builder.env.root_path, self.i18npath, 'contents.pot')
+        pots = [contents_pot_filename,
+                self.get_templates_pot_filename(),
+                join(builder.env.root_path, self.i18npath, 'plugins.pot')]
+        # write out contents.pot from web site contents
+        translations.write_pot(pots[0], self.content_language)
+        reporter.report_generic("%s generated" % relpath(pots[0],
+            builder.env.root_path))
+        pots = [p for p in pots if os.path.exists(p) ] # only keep existing ones
+        if len(pots) > 1:
+            translations.merge_pot(pots, contents_pot_filename)
+            reporter.report_generic("Merged POT files %s" % ', '.join(
+                relpath(p, builder.env.root_path) for p in pots))
+
+        for language in self.translations_languages:
+            po_file=POFile(language, self.i18npath)
+            po_file.generate()
diff --git a/packages/i18n/setup.py b/packages/i18n/setup.py
new file mode 100644
index 0000000..2f30cf1
--- /dev/null
+++ b/packages/i18n/setup.py
@@ -0,0 +1,16 @@
+from setuptools import setup
+
+setup(
+    name='lektor-i18n',
+    version='0.4.4',
+    author=u'NumeriCube',
+    author_email='support@numericube.com',
+    url='https://github.com/numericube/lektor-i18n-plugin',
+    license='GPL',
+    py_modules=['lektor_i18n'],
+    entry_points={
+        'lektor.plugins': [
+            'i18n = lektor_i18n:I18NPlugin',
+        ]
+    }
+)
diff --git a/website.lektorproject b/website.lektorproject
index b8ee9cc..879e173 100644
--- a/website.lektorproject
+++ b/website.lektorproject
@@ -6,8 +6,8 @@ locale = en
 
 [alternatives.en]
 name = English
-url_prefix = /
 primary = yes
+url_prefix = /
 locale = en
 
 [alternatives.fr]