diff -Nru bookletimposer-0.3~beta1/bin/bookletimposer bookletimposer-0.3+ds/bin/bookletimposer
--- bookletimposer-0.3~beta1/bin/bookletimposer	2019-09-29 21:18:53.000000000 +0000
+++ bookletimposer-0.3+ds/bin/bookletimposer	2019-12-13 12:18:35.000000000 +0000
@@ -2,20 +2,20 @@
 # -*- coding: UTF-8 -*-
 
 ########################################################################
-# 
+#
 # BookletImposer - Utility to achieve some basic imposition on PDF documents
-# Copyright (C) 2008-2012 Kjö Hansi Glaz <kjo@a4nancy.net.eu.org>
-# 
+# Copyright (C) 2008-2019 Kjö Hansi Glaz <kjo@a4nancy.net.eu.org>
+#
 # 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/>.
 #
@@ -40,71 +40,88 @@
     import os
     sys.path.insert(0, os.path.join(os.getcwd(), "lib"))
 
-import pdfimposer # We need its exceptions
+# We need its exceptions
+import pdfimposer                           # noqa: E402
 
-import bookletimposer.backend as backend
-import bookletimposer.config as config
+import bookletimposer.backend as backend    # noqa: E402
+import bookletimposer.config as config      # noqa: E402
 
 gettext.install("bookletimposer", localedir=config.get_localedir())
 
-__version__ = "0.3beta1"
+__version__ = "0.3"
+
 
 def main():
     """
     This is the function that launches the program
     """
-    
     infile = None
-    
+
     parser = optparse.OptionParser(
         usage="%prog [options] [infile]",
         version="%prog " + __version__)
-    parser.add_option ("-o", "--output", dest="outfile",
+    parser.add_option(
+        "-o", "--output", dest="outfile",
         help=_("output PDF file"))
-    parser.add_option ("-a", "--no-gui", 
+    parser.add_option(
+        "-a", "--no-gui",
         action="store_false", dest="gui",
         default=True,
-        help=_("automatic conversion (don't show the user interface). At least input file must be defined"))
-    parser.add_option ("-i", "--gui", 
+        help=_("automatic conversion (don't show the user interface). "
+               "At least input file must be defined."))
+    parser.add_option(
+        "-i", "--gui",
         action="store_true", dest="gui",
         default=True,
         help=_("shows the user interface (default)."))
-    parser.add_option ("-b", "--booklet",
-        action="store_const", dest="conv_type", 
-        const=backend.ConversionType.BOOKLETIZE, default=backend.ConversionType.BOOKLETIZE,
+    parser.add_option(
+        "-b", "--booklet",
+        action="store_const", dest="conv_type",
+        const=backend.ConversionType.BOOKLETIZE,
+        default=backend.ConversionType.BOOKLETIZE,
         help=_("makes a booklet"))
-    parser.add_option ("-l", "--linearize",
-        action="store_const", dest="conv_type", 
-        const=backend.ConversionType.LINEARIZE, default=backend.ConversionType.BOOKLETIZE,
+    parser.add_option(
+        "-l", "--linearize",
+        action="store_const", dest="conv_type",
+        const=backend.ConversionType.LINEARIZE,
+        default=backend.ConversionType.BOOKLETIZE,
         help=_("convert a booklet to single pages"))
-    parser.add_option ("-n", "--no-reorganisation",
-        action="store_const", dest="conv_type", 
-        const=backend.ConversionType.REDUCE, default=backend.ConversionType.BOOKLETIZE,
-        help=_("don't do any reorganisation (will only scale and assemble pages)"))
-    parser.add_option ("-c", "--copy-pages",
+    parser.add_option(
+        "-n", "--no-reorganisation",
+        action="store_const", dest="conv_type",
+        const=backend.ConversionType.REDUCE,
+        default=backend.ConversionType.BOOKLETIZE,
+        help=_("don't do any reorganisation (will only scale and assemble "
+               "pages)"))
+    parser.add_option(
+        "-c", "--copy-pages",
         action="store_true", dest="copy_pages",
         default=False,
         help=_("Copy the same group of input pages on one output page"))
-    parser.add_option ("-p", "--pages-per-sheet", 
-        dest="pages_per_sheet", 
-        default="2x1", 
-        help=_("number of pages per sheet, in the format HORIZONTALxVERTICAL, e.g. 2x1"))
-    parser.add_option ("-f", "--format", 
-        dest="output_format", 
+    parser.add_option(
+        "-p", "--pages-per-sheet",
+        dest="pages_per_sheet",
+        default="2x1",
+        help=_("number of pages per sheet, in the format HORIZONTALxVERTICAL, "
+               "e.g. 2x1"))
+    parser.add_option(
+        "-f", "--format",
+        dest="output_format",
         default=None,
         help=_("output page format, e.g. A4 or A3R"))
-    parser.add_option ("-k", "--keep",
+    parser.add_option(
+        "-k", "--keep",
         action="store_false", dest="overwrite",
         default=True,
         help=_("do not overwrite output file if it exists"))
-    
+
     (options, args) = parser.parse_args()
-    
+
     if len(args) >= 1:
         infile = args[0]
-    
+
     preferences = backend.ConverterPreferences()
-        
+
     if infile:
         preferences.infile_name = infile
     if options.outfile:
@@ -117,26 +134,32 @@
         preferences.layout = options.pages_per_sheet
     if options.copy_pages:
         preferences.copy_pages = True
-    
+
     if options.gui:
         import bookletimposer.gui as gui
         ui = gui.BookletImposerUI(preferences)
         gui.Gtk.main()
     else:
         if not preferences.infile_name:
-            print(_("ERROR: In automatic mode, you must provide a file to process."))
+            print(_("ERROR: In automatic mode, you must provide a file to "
+                    "process."))
             return
+
         def overwrite_callback(filename):
             return options.overwrite
+
         try:
             converter = preferences.create_converter(overwrite_callback)
         except pdfimposer.UserInterruptError:
             return
+
         def progress_callback(message, progress):
             print((_("%i%%: %s") % (progress*100, message)))
+
         converter.set_progress_callback(progress_callback)
         converter.run()
-    return 0 
-    
+    return 0
+
+
 if __name__ == "__main__":
     main()
diff -Nru bookletimposer-0.3~beta1/CHANGELOG bookletimposer-0.3+ds/CHANGELOG
--- bookletimposer-0.3~beta1/CHANGELOG	2019-09-29 21:18:53.000000000 +0000
+++ bookletimposer-0.3+ds/CHANGELOG	2019-12-13 12:18:35.000000000 +0000
@@ -1,8 +1,12 @@
 Changelog
 =========
 
-0.3beta1
---------
+0.3
+---
+
+- update documentation and website
+- update file headears
+- add a Keywords entry to desktop file
 
 ### pdfimposer
 
@@ -15,13 +19,21 @@
 ### bookletimposer
 
 - gui: select layout as a pair of spinbuttons
-- start without gtk
-- only use local data if DEBUG envvar is set
+- allow to start without gtk
+- only use local data if DEBUG environnment variable is set
 - gui: add an option to support long-edge flip printing
 - update german translation
+- update french translation
 - add danish translation
 - add hungarian translation
+- gui: fix "copy pages" button
+- gui: update to GTK 3.22
+- gui: fix icon names
+- pass pylint checks
+
+### tests
 
+- add CLI integration tests
 
 0.2
 ---
diff -Nru bookletimposer-0.3~beta1/data/bookletimposer.desktop bookletimposer-0.3+ds/data/bookletimposer.desktop
--- bookletimposer-0.3~beta1/data/bookletimposer.desktop	2019-09-29 21:18:53.000000000 +0000
+++ bookletimposer-0.3+ds/data/bookletimposer.desktop	2019-12-13 12:18:35.000000000 +0000
@@ -1,6 +1,7 @@
 [Desktop Entry]
-Version=0.3beta1
+Version=0.3
 Name=bookletimposer
+Keywords=PDF;
 Comment=Impose PDF documents to create booklets
 Comment[fr]=Imposer des documents PDF pour créer des brochures
 Type=Application
diff -Nru bookletimposer-0.3~beta1/data/bookletimposer.ui bookletimposer-0.3+ds/data/bookletimposer.ui
--- bookletimposer-0.3~beta1/data/bookletimposer.ui	2019-09-29 21:18:53.000000000 +0000
+++ bookletimposer-0.3+ds/data/bookletimposer.ui	2019-12-13 12:18:35.000000000 +0000
@@ -1,64 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.1 -->
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
-  <object class="GtkAboutDialog" id="about_dialog">
-    <property name="can_focus">False</property>
-    <property name="border_width">5</property>
-    <property name="window_position">center-on-parent</property>
-    <property name="destroy_with_parent">True</property>
-    <property name="type_hint">normal</property>
-    <property name="transient_for">main_window</property>
-    <property name="program_name">BookletImposer</property>
-    <property name="version">0.3beta1</property>
-    <property name="copyright" translatable="yes">Copyright © 2008-2012 kjo@a4nancy.net.eu.org</property>
-    <property name="comments" translatable="yes">Convert PDF documents between diffrents page layouts</property>
-    <property name="website">http://kjo.herbesfolles.org/bookletimposer/</property>
-    <property name="license" translatable="yes">
-PyPdfConv - Utility to convert PDF files between diffrents page layouts
-Copyright (C) 2008-2012 Kjö Hansi Glaz &lt;kjo&amp;a4nancy.net.eu.org&gt;
-
-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 &lt;http://www.gnu.org/licenses/&gt;.
-</property>
-    <property name="authors">Kjö Hansi Glaz &lt;kjo@a4nancy.net.eu.org&gt;</property>
-    <property name="wrap_license">True</property>
-    <signal name="close" handler="cb_dialog_close" swapped="no"/>
-    <signal name="response" handler="cb_dialog_close" swapped="no"/>
-    <child internal-child="vbox">
-      <object class="GtkBox" id="dialog-vbox2">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">2</property>
-        <child internal-child="action_area">
-          <object class="GtkButtonBox" id="dialog-action_area2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <placeholder/>
-        </child>
-      </object>
-    </child>
-  </object>
+  <requires lib="gtk+" version="3.20"/>
   <object class="GtkAdjustment" id="pages_in_height_adjustment">
     <property name="lower">1</property>
     <property name="upper">100</property>
@@ -76,9 +19,12 @@
   <object class="GtkWindow" id="main_window">
     <property name="can_focus">False</property>
     <property name="border_width">12</property>
-    <property name="icon">bookletimposer.svg</property>
+    <property name="icon_name">bookletimposer</property>
     <signal name="delete-event" handler="cb_close_main_window" swapped="no"/>
     <child>
+      <placeholder/>
+    </child>
+    <child>
       <object class="GtkVBox" id="vbox1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -95,10 +41,10 @@
               <object class="GtkLabel" id="label4">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">0</property>
                 <property name="label" translatable="yes">Output _paper format</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">output_paper_format_combobox</property>
+                <property name="xalign">0</property>
               </object>
               <packing>
                 <property name="top_attach">5</property>
@@ -110,10 +56,10 @@
               <object class="GtkLabel" id="label8">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">0</property>
                 <property name="label" translatable="yes">Two-sided _flip</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">output_paper_format_combobox</property>
+                <property name="xalign">0</property>
               </object>
               <packing>
                 <property name="top_attach">6</property>
@@ -125,10 +71,10 @@
               <object class="GtkLabel" id="label3">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">0</property>
                 <property name="label" translatable="yes">Number of pages in _width</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">pages_in_width_spinbutton</property>
+                <property name="xalign">0</property>
               </object>
               <packing>
                 <property name="top_attach">3</property>
@@ -168,10 +114,10 @@
               <object class="GtkLabel" id="label6">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">0</property>
                 <property name="label" translatable="yes">_Output file</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">output_file_chooser_button</property>
+                <property name="xalign">0</property>
               </object>
               <packing>
                 <property name="top_attach">7</property>
@@ -185,7 +131,6 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="xalign">0</property>
                 <signal name="clicked" handler="cb_outfile_clicked" swapped="no"/>
                 <child>
@@ -196,7 +141,7 @@
                       <object class="GtkImage" id="output_file_chooser_file_image">
                         <property name="can_focus">False</property>
                         <property name="stock">gtk-file</property>
-                        <property name="icon-size">1</property>
+                        <property name="icon_size">1</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -208,9 +153,9 @@
                       <object class="GtkLabel" id="output_file_chooser_label">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="xpad">5</property>
                         <property name="label" translatable="yes">(None)</property>
+                        <property name="xalign">0</property>
                       </object>
                       <packing>
                         <property name="expand">True</property>
@@ -234,7 +179,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="stock">gtk-save-as</property>
-                        <property name="icon-size">1</property>
+                        <property name="icon_size">1</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -258,10 +203,10 @@
               <object class="GtkLabel" id="label5">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">0</property>
                 <property name="label" translatable="yes">_Copy the same group of input pages on one output page</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">copy_pages_switch</property>
+                <property name="xalign">0</property>
               </object>
               <packing>
                 <property name="top_attach">2</property>
@@ -271,10 +216,10 @@
             </child>
             <child>
               <object class="GtkSwitch" id="copy_pages_switch">
-                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="use_action_appearance">False</property>
+                <property name="halign">end</property>
+                <property name="valign">start</property>
                 <signal name="notify::active" handler="cb_copy_pages_toggled" swapped="no"/>
               </object>
               <packing>
@@ -282,6 +227,7 @@
                 <property name="right_attach">2</property>
                 <property name="top_attach">2</property>
                 <property name="bottom_attach">3</property>
+                <property name="x_options">GTK_SHRINK | GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
@@ -310,7 +256,6 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
-                            <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
                             <property name="xalign">0.5</property>
                             <property name="image_position">top</property>
@@ -328,7 +273,7 @@
                                     <property name="can_focus">False</property>
                                     <property name="pixel_size">180</property>
                                     <property name="icon_name">booklet</property>
-                                    <property name="icon-size">6</property>
+                                    <property name="icon_size">6</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -366,7 +311,6 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
-                            <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
                             <property name="xalign">0</property>
                             <property name="image_position">top</property>
@@ -384,7 +328,7 @@
                                     <property name="can_focus">False</property>
                                     <property name="pixel_size">180</property>
                                     <property name="icon_name">linearise</property>
-                                    <property name="icon-size">6</property>
+                                    <property name="icon_size">6</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -422,7 +366,6 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
-                            <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
                             <property name="xalign">0</property>
                             <property name="image_position">top</property>
@@ -440,7 +383,7 @@
                                     <property name="can_focus">False</property>
                                     <property name="pixel_size">180</property>
                                     <property name="icon_name">reduce</property>
-                                    <property name="icon-size">6</property>
+                                    <property name="icon_size">6</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -494,10 +437,10 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">0</property>
                 <property name="label" translatable="yes">_Input file</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">input_file_chooser_button</property>
+                <property name="xalign">0</property>
               </object>
               <packing>
                 <property name="top_attach">1</property>
@@ -526,10 +469,10 @@
               <object class="GtkLabel" id="label7">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">0</property>
                 <property name="label" translatable="yes">Number of pages in _height</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">pages_in_height_spinbutton</property>
+                <property name="xalign">0</property>
               </object>
               <packing>
                 <property name="top_attach">4</property>
@@ -603,7 +546,6 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
                 <signal name="clicked" handler="cb_about_button" swapped="no"/>
               </object>
@@ -621,7 +563,6 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
                 <signal name="clicked" handler="cb_help_button" swapped="no"/>
               </object>
@@ -640,7 +581,6 @@
                 <property name="sensitive">False</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
                 <signal name="clicked" handler="cb_apply_button" swapped="no"/>
               </object>
@@ -656,7 +596,6 @@
                 <property name="use_action_appearance">False</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
                 <signal name="clicked" handler="cb_progress_stop" swapped="no"/>
               </object>
@@ -676,5 +615,67 @@
         </child>
       </object>
     </child>
+  </object>
+  <object class="GtkAboutDialog" id="about_dialog">
+    <property name="can_focus">False</property>
+    <property name="border_width">5</property>
+    <property name="window_position">center-on-parent</property>
+    <property name="destroy_with_parent">True</property>
+    <property name="type_hint">normal</property>
+    <property name="transient_for">main_window</property>
+    <property name="program_name">BookletImposer</property>
+    <property name="version">0.3</property>
+    <property name="copyright" translatable="yes">Copyright © 2008-2019 kjo@a4nancy.net.eu.org</property>
+    <property name="comments" translatable="yes">Convert PDF documents between diffrents page layouts</property>
+    <property name="website">http://kjo.herbesfolles.org/bookletimposer/</property>
+    <property name="license" translatable="yes">
+PyPdfConv - Utility to convert PDF files between diffrents page layouts
+Copyright (C) 2008-2019 Kjö Hansi Glaz &lt;kjo&amp;a4nancy.net.eu.org&gt;
+
+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 &lt;http://www.gnu.org/licenses/&gt;.
+</property>
+    <property name="authors">Kjö Hansi Glaz &lt;kjo@a4nancy.net.eu.org&gt;</property>
+    <property name="logo_icon_name">bookletimposer</property>
+    <property name="wrap_license">True</property>
+    <signal name="close" handler="cb_dialog_close" swapped="no"/>
+    <signal name="response" handler="cb_dialog_close" swapped="no"/>
+    <child>
+      <placeholder/>
+    </child>
+    <child internal-child="vbox">
+      <object class="GtkBox" id="dialog-vbox2">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">2</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox" id="dialog-action_area2">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <placeholder/>
+        </child>
+      </object>
+    </child>
   </object>
 </interface>
diff -Nru bookletimposer-0.3~beta1/debian/changelog bookletimposer-0.3+ds/debian/changelog
--- bookletimposer-0.3~beta1/debian/changelog	2019-11-16 06:57:33.000000000 +0000
+++ bookletimposer-0.3+ds/debian/changelog	2020-02-24 21:45:06.000000000 +0000
@@ -1,3 +1,17 @@
+bookletimposer (0.3+ds-1) unstable; urgency=medium
+
+  * New upstream version (Closes: #945165, #945167, #945168).
+  * d/watch: re-enable signature check, new tags are signed.
+  * d/patches: delete 0001, it has been upstreamed.
+  * d/tests: use upstream's unit tests as an autopkgtest.
+  * d/upstream: add metadata file.
+  * Update Standards-Version to 4.5.0.0 (no changes needed).
+  * d/rules: remove the 'help' dir, as those files aren't useful.
+  * d/patches: add a new patch to make autopkgtests work.
+  * Repack the upstream source to fix 'source-contains-unsafe-symlink'
+
+ -- Louis-Philippe Véronneau <pollo@debian.org>  Mon, 24 Feb 2020 16:45:06 -0500
+
 bookletimposer (0.3~beta1-1) unstable; urgency=medium
 
   [ Louis-Philippe Véronneau ]
diff -Nru bookletimposer-0.3~beta1/debian/control bookletimposer-0.3+ds/debian/control
--- bookletimposer-0.3~beta1/debian/control	2019-11-16 06:57:33.000000000 +0000
+++ bookletimposer-0.3+ds/debian/control	2020-02-24 21:45:06.000000000 +0000
@@ -10,7 +10,7 @@
                intltool,
                pandoc,
 Build-Depends-Indep: python3-distutils-extra
-Standards-Version: 4.4.1
+Standards-Version: 4.5.0.0
 Vcs-Browser: https://salsa.debian.org/python-team/applications/bookletimposer
 Vcs-Git: https://salsa.debian.org/python-team/applications/bookletimposer.git
 Homepage: https://kjo.herbesfolles.org/bookletimposer/
diff -Nru bookletimposer-0.3~beta1/debian/copyright bookletimposer-0.3+ds/debian/copyright
--- bookletimposer-0.3~beta1/debian/copyright	2019-11-16 06:57:33.000000000 +0000
+++ bookletimposer-0.3+ds/debian/copyright	2020-02-24 21:45:06.000000000 +0000
@@ -1,5 +1,9 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Source: https://kjo.herbesfolles.org/bookletimposer/
+Comment:
+ The upstream source tarball is repacked to fix 'source-contains-unsafe-symlink'
+Files-Excluded:
+ help/C/img
 
 Files: *
 Copyright: © 2008-2012 Kjö Hansi Glaz <kjo@a4nancy.net.eu.org>
@@ -7,8 +11,32 @@
 
 Files: debian/*
 Copyright: © 2011-2016 intrigeri <intrigeri@debian.org>
+           © 2019 Louis-Philippe Véronneau <pollo@debian.org>
 License: GPL-3+
 
+Files: debian/tests/unittests
+Copyright: 2019 Stefano Rivera <stefanor@debian.org>
+License: Expat
+
+License: Expat
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in all
+ copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.
+
 License: GPL-3+
  This package is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
diff -Nru bookletimposer-0.3~beta1/debian/patches/0001_Freedesktop_Keywords_Entry.patch bookletimposer-0.3+ds/debian/patches/0001_Freedesktop_Keywords_Entry.patch
--- bookletimposer-0.3~beta1/debian/patches/0001_Freedesktop_Keywords_Entry.patch	2019-11-16 06:57:33.000000000 +0000
+++ bookletimposer-0.3+ds/debian/patches/0001_Freedesktop_Keywords_Entry.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-Add a Keyworks entry in the .desktop file to make Lintian happy.
-Index: bookletimposer/data/bookletimposer.desktop
-===================================================================
---- bookletimposer.orig/data/bookletimposer.desktop
-+++ bookletimposer/data/bookletimposer.desktop
-@@ -1,6 +1,7 @@
- [Desktop Entry]
- Version=0.3beta1
- Name=bookletimposer
-+Keywords=PDF;
- Comment=Impose PDF documents to create booklets
- Comment[fr]=Imposer des documents PDF pour créer des brochures
- Type=Application
diff -Nru bookletimposer-0.3~beta1/debian/patches/0001_unittest.patch bookletimposer-0.3+ds/debian/patches/0001_unittest.patch
--- bookletimposer-0.3~beta1/debian/patches/0001_unittest.patch	1970-01-01 00:00:00.000000000 +0000
+++ bookletimposer-0.3+ds/debian/patches/0001_unittest.patch	2020-02-24 21:45:06.000000000 +0000
@@ -0,0 +1,28 @@
+Call the binary from the proper path, or else it fails during autopkgtests
+Index: bookletimposer/tests/test_bookletimposer_cli.py
+===================================================================
+--- bookletimposer.orig/tests/test_bookletimposer_cli.py
++++ bookletimposer/tests/test_bookletimposer_cli.py
+@@ -31,19 +31,19 @@ def getContents(pdf_path, num_pages):
+ 
+ def convertToBooklet(in_pdf, out_pdf):
+     subprocess.check_call(
+-        ['bin/bookletimposer', '-a', '-b', '-o', out_pdf,
++        ['bookletimposer', '-a', '-b', '-o', out_pdf,
+          in_pdf])
+ 
+ 
+ def convertToLinear(in_pdf, out_pdf):
+     subprocess.check_call(
+-        ['bin/bookletimposer', '-a', '-l', '-o', out_pdf,
++        ['bookletimposer', '-a', '-l', '-o', out_pdf,
+          in_pdf])
+ 
+ 
+ def convertScale(in_pdf, out_pdf):
+     subprocess.check_call(
+-        ['bin/bookletimposer', '-a', '-l', '-o', out_pdf,
++        ['bookletimposer', '-a', '-l', '-o', out_pdf,
+          in_pdf])
+ 
+ 
diff -Nru bookletimposer-0.3~beta1/debian/patches/series bookletimposer-0.3+ds/debian/patches/series
--- bookletimposer-0.3~beta1/debian/patches/series	2019-11-16 06:57:33.000000000 +0000
+++ bookletimposer-0.3+ds/debian/patches/series	2020-02-24 21:45:06.000000000 +0000
@@ -1 +1 @@
-0001_Freedesktop_Keywords_Entry.patch
+0001_unittest.patch
diff -Nru bookletimposer-0.3~beta1/debian/rules bookletimposer-0.3+ds/debian/rules
--- bookletimposer-0.3~beta1/debian/rules	2019-11-16 06:57:33.000000000 +0000
+++ bookletimposer-0.3+ds/debian/rules	2020-02-24 21:45:06.000000000 +0000
@@ -4,3 +4,7 @@
 
 %:
 	dh $@ --with python3 --buildsystem=pybuild
+
+override_dh_auto_build:
+	rm -R help
+	dh_auto_build
diff -Nru bookletimposer-0.3~beta1/debian/tests/control bookletimposer-0.3+ds/debian/tests/control
--- bookletimposer-0.3~beta1/debian/tests/control	2019-11-16 06:57:33.000000000 +0000
+++ bookletimposer-0.3+ds/debian/tests/control	2020-02-24 21:45:06.000000000 +0000
@@ -1,3 +1,14 @@
-Tests: testsuite
-Depends: bookletimposer, poppler-utils, imagemagick
+Tests: unittests
+Depends:
+ python3-all,
+ python3-pytest,
+ poppler-utils,
+ bookletimposer
+Restrictions: superficial
+
+Tests: integration
+Depends:
+ bookletimposer,
+ poppler-utils,
+ imagemagick
 Restrictions: superficial
diff -Nru bookletimposer-0.3~beta1/debian/tests/integration bookletimposer-0.3+ds/debian/tests/integration
--- bookletimposer-0.3~beta1/debian/tests/integration	1970-01-01 00:00:00.000000000 +0000
+++ bookletimposer-0.3+ds/debian/tests/integration	2020-02-24 21:45:06.000000000 +0000
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+set -e
+
+# Generate a PDF with 4 A4 pages, use bookletimposer and verify if the final
+# PDF has 2 A4 pages
+
+for i in 1 2 3 4
+do
+  convert xc:none -page A4 $i.pdf
+done
+
+pdfunite 1.pdf 2.pdf 3.pdf 4.pdf linear.pdf
+bookletimposer -a linear.pdf -o booklet.pdf -f A4
+pdfinfo booklet.pdf | grep -c "Pages: \+2"
+pdfinfo booklet.pdf | grep -c "Page size: \+842 x 595 pts (A4)"
+
+# Take the booklet we previously generated, linearise it and check if the final
+# PDF has 4 A4 pages.
+
+bookletimposer -a booklet.pdf -o newlinear.pdf -f A4 -l
+pdfinfo newlinear.pdf | grep -c "Pages: \+4"
+pdfinfo newlinear.pdf | grep -c "Page size: \+595 x 842 pts (A4)"
+
+# Make sure the "--keep" option works
+
+bookletimposer -a booklet.pdf -o linear.pdf -f A4 -l -k
+diff -s linear.pdf newlinear.pdf | grep -c "differ"
diff -Nru bookletimposer-0.3~beta1/debian/tests/testsuite bookletimposer-0.3+ds/debian/tests/testsuite
--- bookletimposer-0.3~beta1/debian/tests/testsuite	2019-11-16 06:57:33.000000000 +0000
+++ bookletimposer-0.3+ds/debian/tests/testsuite	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# Generate a PDF with 4 A4 pages, use bookletimposer and verify if the final
-# PDF has 2 A4 pages
-
-for i in 1 2 3 4
-do
-  convert xc:none -page A4 $i.pdf
-done
-
-pdfunite 1.pdf 2.pdf 3.pdf 4.pdf linear.pdf
-bookletimposer -a linear.pdf -o booklet.pdf -f A4
-pdfinfo booklet.pdf | grep -c "Pages: \+2"
-pdfinfo booklet.pdf | grep -c "Page size: \+842 x 595 pts (A4)"
-
-# Take the booklet we previously generated, linearise it and check if the final
-# PDF has 4 A4 pages.
-
-bookletimposer -a booklet.pdf -o newlinear.pdf -f A4 -l
-pdfinfo newlinear.pdf | grep -c "Pages: \+4"
-pdfinfo newlinear.pdf | grep -c "Page size: \+595 x 842 pts (A4)"
-
-# Make sure the "--keep" option works
-
-bookletimposer -a booklet.pdf -o linear.pdf -f A4 -l -k
-diff -s linear.pdf newlinear.pdf | grep -c "differ"
diff -Nru bookletimposer-0.3~beta1/debian/tests/unittests bookletimposer-0.3+ds/debian/tests/unittests
--- bookletimposer-0.3~beta1/debian/tests/unittests	1970-01-01 00:00:00.000000000 +0000
+++ bookletimposer-0.3+ds/debian/tests/unittests	2020-02-24 21:45:06.000000000 +0000
@@ -0,0 +1,12 @@
+#!/bin/sh
+set -efu
+
+pys="$(py3versions -r 2> /dev/null)"
+
+cp -a tests "$AUTOPKGTEST_TMP"
+cd "$AUTOPKGTEST_TMP"
+
+for py in $pys; do
+	echo "=== $py ==="
+	$py -m pytest tests 2>&1
+done
diff -Nru bookletimposer-0.3~beta1/debian/upstream/metadata bookletimposer-0.3+ds/debian/upstream/metadata
--- bookletimposer-0.3~beta1/debian/upstream/metadata	1970-01-01 00:00:00.000000000 +0000
+++ bookletimposer-0.3+ds/debian/upstream/metadata	2020-02-24 21:45:06.000000000 +0000
@@ -0,0 +1,7 @@
+Bug-Submit: kjo@a4nancy.net.eu.org
+Contact: Kjö Hansi Glaz <kjo@a4nancy.net.eu.org>
+Changelog: https://git.codecoop.org/kjo/bookletimposer/blob/master/CHANGELOG
+Documentation: https://git.codecoop.org/kjo/bookletimposer/blob/master/README.md
+Name: bookletimposer
+Repository-Browse: https://git.codecoop.org/kjo/bookletimposer
+Repository: https://git.codecoop.org/kjo/bookletimposer
diff -Nru bookletimposer-0.3~beta1/debian/watch bookletimposer-0.3+ds/debian/watch
--- bookletimposer-0.3~beta1/debian/watch	2019-11-16 06:57:33.000000000 +0000
+++ bookletimposer-0.3+ds/debian/watch	2020-02-24 21:45:06.000000000 +0000
@@ -1,6 +1,4 @@
 version=4
-# The latest release is not signed, so uscan fails...
-# opts="mode=git, pgpmode=gittag" \
-opts="mode=git, uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/" \
+opts="mode=git, pgpmode=gittag, uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/, repacksuffix=+ds, dversionmangle=s/\+ds//,repack" \
 https://git.codecoop.org/kjo/bookletimposer.git \
 refs/tags/(\d.+)
diff -Nru bookletimposer-0.3~beta1/doc/bookletimposer.1.mdwn bookletimposer-0.3+ds/doc/bookletimposer.1.mdwn
--- bookletimposer-0.3~beta1/doc/bookletimposer.1.mdwn	2019-09-29 21:18:53.000000000 +0000
+++ bookletimposer-0.3+ds/doc/bookletimposer.1.mdwn	2019-12-13 12:18:35.000000000 +0000
@@ -1,6 +1,6 @@
 % BOOKLETIMPOSER(1) bookletimposer user manual
 % Kjö Hansi Glaz <kjo@a4nancy.net.eu.org>
-% 2012
+% 2019
 
 
 NAME
Binary files /tmp/tmpfcWJCR/6gtVeMSnJg/bookletimposer-0.3~beta1/help/C/figures/icon.png and /tmp/tmpfcWJCR/f0SWVRM50f/bookletimposer-0.3+ds/help/C/figures/icon.png differ
Binary files /tmp/tmpfcWJCR/6gtVeMSnJg/bookletimposer-0.3~beta1/help/C/figures/main-window.png and /tmp/tmpfcWJCR/f0SWVRM50f/bookletimposer-0.3+ds/help/C/figures/main-window.png differ
diff -Nru bookletimposer-0.3~beta1/help/C/index.docbook bookletimposer-0.3+ds/help/C/index.docbook
--- bookletimposer-0.3~beta1/help/C/index.docbook	2019-09-29 21:18:53.000000000 +0000
+++ bookletimposer-0.3+ds/help/C/index.docbook	2019-12-13 12:18:35.000000000 +0000
@@ -20,7 +20,7 @@
       documents</para>
     </abstract>
     <copyright> 
-      <year>2012</year> 
+      <year>2019</year>
       <holder>Kjö Hansi Glaz</holder> 
     </copyright>
     <!-- translators: uncomment this:
@@ -56,7 +56,14 @@
         <revdescription> 
                 <para role="author">Kjö Hansi Glaz</para>
         </revdescription> 
-        </revision> 
+      </revision>
+      <revision>
+        <revnumber>&app; User Manual 0.2</revnumber>
+        <date>Dec 2019</date>
+        <revdescription>
+                <para role="author">Kjö Hansi Glaz</para>
+        </revdescription>
+      </revision>
     </revhistory> 
 
     <releaseinfo>This manual describes version &appversion; of &app;.</releaseinfo> 
@@ -80,12 +87,14 @@
     <title>Introduction</title> 
 
     <mediaobject>
-      <imageobject><imagedata fileref="figures/icon.png" format="PNG"/></imageobject>
+      <imageobject><imagedata fileref="img/bookletimposer.png" format="PNG"/></imageobject>
       <textobject><phrase><application>&app;</application> icon.</phrase></textobject> 
     </mediaobject> 
  
-    <para><application>&app;</application> is an utility to achieve some basic imposition on PDF
-    documents, especially designed to work on booklets.</para>
+    <para>
+      <application>&app;</application> is an utility to achieve some basic
+      imposition on PDF documents, especially designed to work on booklets.
+    </para>
 
     <para>
       <application>&app;</application> allows:
@@ -117,7 +126,6 @@
         <listitem>
           <para>Choose 
             <menuchoice>
-              <guisubmenu>Office</guisubmenu>
               <guimenuitem>&app;</guimenuitem>
             </menuchoice>.
           </para>
@@ -126,8 +134,11 @@
       <varlistentry>
         <term>Command line</term>
           <listitem>
-            <para>To start <application>&app;</application> from a command line, type the following command, 
-            then press <keycap>Return</keycap>: <command>bookletimposer</command></para>
+            <para>
+              To start <application>&app;</application> from a command line,
+              type the following command, then press <keycap>Return</keycap>:
+              <command>bookletimposer</command>
+            </para>
           </listitem>
         </varlistentry>
       </variablelist>
@@ -142,13 +153,20 @@
         <title><application>&app;</application> window</title> 
         <screenshot> 
           <mediaobject>
-            <imageobject><imagedata fileref="figures/main-window.png" format="PNG"/></imageobject>
-            <textobject><phrase>Shows the<application>&app;</application> window.</phrase></textobject> 
+            <imageobject>
+              <imagedata fileref="img/bookletimposer_main-window.png" format="PNG"/>
+            </imageobject>
+            <textobject>
+              <phrase>Shows the<application>&app;</application> window.</phrase>
+            </textobject>
           </mediaobject> 
         </screenshot> 
       </figure>
         
-        <para>The <application>&app;</application> window contains the following elements: </para>
+        <para>
+          The <application>&app;</application> window contains the following
+          elements:
+        </para>
 
         <variablelist>
           <varlistentry>
@@ -196,8 +214,8 @@
             <term><guilabel>Layout</guilabel></term>
             <listitem>
               <para>Use this drop-down list to select how to dispose input pages
-              on each output page. For example, select <guilabel>2x1</guilabel> to
-              output a simple booklet.</para>
+              on each output page. For example, select <guilabel>2x1</guilabel>
+              to output a simple booklet.</para>
             </listitem>
           </varlistentry>
           <varlistentry>
diff -Nru bookletimposer-0.3~beta1/lib/bookletimposer/backend.py bookletimposer-0.3+ds/lib/bookletimposer/backend.py
--- bookletimposer-0.3~beta1/lib/bookletimposer/backend.py	2019-09-29 21:18:53.000000000 +0000
+++ bookletimposer-0.3+ds/lib/bookletimposer/backend.py	2019-12-13 12:18:35.000000000 +0000
@@ -2,20 +2,20 @@
 # -*- coding: UTF-8 -*-
 
 ########################################################################
-# 
+#
 # BookletImposer - Utility to achieve some basic imposition on PDF documents
-# Copyright (C) 2008-2012 Kjö Hansi Glaz <kjo@a4nancy.net.eu.org>
-# 
+# Copyright (C) 2008-2019 Kjö Hansi Glaz <kjo@a4nancy.net.eu.org>
+#
 # 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/>.
 #
@@ -33,7 +33,7 @@
 import pdfimposer
 import os.path
 import re
-import types
+
 
 class BookletImposerError(pdfimposer.PdfConvError):
     """The base class for all exceptions raised by BookletImposer.
@@ -42,12 +42,14 @@
     error.
     """
 
+
 class MissingInputFileError(BookletImposerError):
     """Excpetion raised when trying to create a converter withot an input file.
 
     An input file is required to create a converter."
     """
 
+
 class ConversionType:
     """The conversion type constants"""
     BOOKLETIZE = 1
@@ -57,6 +59,7 @@
     REDUCE = 3
     """The conversion from multiple input pages to one output page"""
 
+
 class ConverterPreferences(object):
     def __init__(self):
         self._infile_name = None
@@ -75,7 +78,7 @@
 
     @infile_name.setter
     def infile_name(self, value):
-        assert value == None or os.path.isfile(value)
+        assert value is None or os.path.isfile(value)
         self._infile_name = value
         # XXX: duplicate code with pfdimposer.FileConverter.__set_infile_name
         #      but the least one is called only on FileConverer instanciation
@@ -93,7 +96,7 @@
 
     @conversion_type.setter
     def conversion_type(self, value):
-        assert value == None or \
+        assert value is None or \
                value == ConversionType.BOOKLETIZE or \
                value == ConversionType.LINEARIZE or \
                value == ConversionType.REDUCE
@@ -119,7 +122,7 @@
                 and (len(value) == 2)):
             # XXX : verify value
             self._layout = value
-        elif value == None:
+        elif value is None:
             self._layout = None
         else:
             raise ValueError
@@ -164,7 +167,7 @@
 
     @outfile_name.setter
     def outfile_name(self, value):
-        assert value == None or \
+        assert value is None or \
             not os.path.dirname(value) or \
             os.path.exists(os.path.dirname(value))
         self.__outfile_name_changed = True
@@ -204,21 +207,28 @@
             raise MissingInputFileError
             return None
         elif self._outfile_name:
-            converter = TypedFileConverter(self._infile_name, self._outfile_name,
+            converter = TypedFileConverter(
+                self._infile_name, self._outfile_name,
                 overwrite_outfile_callback=overwrite_outfile_callback)
         else:
-            converter = TypedFileConverter(self._infile_name,
+            converter = TypedFileConverter(
+                self._infile_name,
                 overwrite_outfile_callback=overwrite_outfile_callback)
-        if self._conversion_type: converter.set_conversion_type(self._conversion_type)
-        if self._layout: converter.set_layout(self._layout)
-        if self._paper_format: converter.set_output_format(self._paper_format)
+        if self._conversion_type:
+            converter.set_conversion_type(self._conversion_type)
+        if self._layout:
+            converter.set_layout(self._layout)
+        if self._paper_format:
+            converter.set_output_format(self._paper_format)
         if self._paper_orientation:
             converter._set_output_orientation(self._paper_orientation)
         if self._two_sided_flip:
             converter.set_two_sided_flip(self._two_sided_flip)
-        if self._copy_pages: converter.set_copy_pages(self._copy_pages)
+        if self._copy_pages:
+            converter.set_copy_pages(self._copy_pages)
         return converter
 
+
 class TypedFileConverter(pdfimposer.FileConverter):
     """A FileConverter that stores the conversion type.
 
@@ -240,21 +250,22 @@
           - `outfile_name`: The name of the file where the output PDF
             should de written. If ommited, defaults to the
             name of the input PDF postponded by '-conv'.
-          - `conversion_type`: The type of the conversion that will be performed
-            when caling run() (see set_converston_type).
+          - `conversion_type`: The type of the conversion that will be
+            performed when caling run() (see set_converston_type).
           - `layout`: The layout of input pages on one output page (see
             set_layout).
           - `format`: The format of the output paper (see set_output_format).
           - `flip`: Whether the output paper will be flipped on the short edge
-              (default) or the long edge when printing (see set_two_sided_flip).
+              (default) or the long edge when printing
+              (see set_two_sided_flip).
           - `copy_pages`: Wether the same group of input pages shoud be copied
             to fill the corresponding output page or not (see
             set_copy_pages).
         """
-        
+
         pdfimposer.FileConverter.__init__(self, infile_name, outfile_name,
-                                         layout, format, flip, copy_pages,
-                                         overwrite_outfile_callback)
+                                          layout, format, flip, copy_pages,
+                                          overwrite_outfile_callback)
         self._conversion_type = conversion_type
 
     # CONVERSION FUNCTIONS
@@ -282,18 +293,16 @@
         :Parameters:
           - `type`: A constant from the ConversionType class.
         """
-        assert(type == ConversionType.BOOKLETIZE or \
-               type == ConversionType.LINEARIZE or \
+        assert(type == ConversionType.BOOKLETIZE or
+               type == ConversionType.LINEARIZE or
                type == ConversionType.REDUCE)
         self._conversion_type = type
 
     def get_conversion_type(self):
         """
-        Get conversion that will be performed when caling run().
+        Get conversion that will be performed when calling run().
 
         :Returns:
             A constant from ConversionType class.
         """
         return self._conversion_type
-
-
diff -Nru bookletimposer-0.3~beta1/lib/bookletimposer/config.py bookletimposer-0.3+ds/lib/bookletimposer/config.py
--- bookletimposer-0.3~beta1/lib/bookletimposer/config.py	2019-09-29 21:18:53.000000000 +0000
+++ bookletimposer-0.3+ds/lib/bookletimposer/config.py	2019-12-13 12:18:35.000000000 +0000
@@ -2,20 +2,20 @@
 # -*- coding: UTF-8 -*-
 
 ########################################################################
-# 
+#
 # BookletImposer - Utility to achieve some basic imposition on PDF documents
-# Copyright (C) 2008-2012 Kjö Hansi Glaz <kjo@a4nancy.net.eu.org>
-# 
+# Copyright (C) 2008-2019 Kjö Hansi Glaz <kjo@a4nancy.net.eu.org>
+#
 # 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/>.
 #
@@ -30,18 +30,19 @@
 #
 ########################################################################
 
-import gettext
-import locale
 import os
 import os.path
 
 if "DEBUG" in os.environ:
-    debug=True
+    debug = True
 else:
-    debug=False
+    debug = False
+
 
 def debug(msg):
-    if debug: print(msg)
+    if debug:
+        print(msg)
+
 
 def get_sharedir():
     if debug and os.path.exists(os.path.join("/", "usr", "local", "share",
@@ -52,14 +53,17 @@
     else:
         return ""
 
+
 def get_datadir():
     if debug and os.path.exists("data"):
         return "data"
     else:
         return os.path.join(get_sharedir(), "bookletimposer")
 
+
 def get_helpdir():
     return os.path.join(get_sharedir(), "gnome", "help")
 
+
 def get_localedir():
     return os.path.join(get_sharedir(), "locale")
diff -Nru bookletimposer-0.3~beta1/lib/bookletimposer/gui.py bookletimposer-0.3+ds/lib/bookletimposer/gui.py
--- bookletimposer-0.3~beta1/lib/bookletimposer/gui.py	2019-09-29 21:18:53.000000000 +0000
+++ bookletimposer-0.3+ds/lib/bookletimposer/gui.py	2019-12-13 12:18:35.000000000 +0000
@@ -2,20 +2,20 @@
 # -*- coding: UTF-8 -*-
 
 ########################################################################
-# 
+#
 # PdfImposer - Utility to convert PDF files between diffrents page layouts
-# Copyright (C) 2008-2012 Kjö Hansi Glaz <kjo@a4nancy.net.eu.org>
-# 
+# Copyright (C) 2008-2019 Kjö Hansi Glaz <kjo@a4nancy.net.eu.org>
+#
 # 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/>.
 #
@@ -29,25 +29,23 @@
 #
 ########################################################################
 
-import gi
-gi.require_version('Gtk', '3.0')
-from gi.repository import Gtk
-from gi.repository import Gdk
-from gi.repository import GLib
-from gi.repository import GObject
-GObject.threads_init()
-from gi.repository import Gio
-
 import os.path
 import threading
 import traceback
 
-import pdfimposer # We need its exceptions
+import gi
+gi.require_version('Gtk', '3.0')
+from gi.repository import Gtk       # noqa: E401
+from gi.repository import Gdk       # noqa: E401
+from gi.repository import GObject   # noqa: E401
+GObject.threads_init()
+from gi.repository import Gio       # noqa: E401
+
+import pdfimposer                   # noqa: E401
+from . import backend               # noqa: E401
+from . import config                # noqa: E401
+# from .config import debug           # noqa: E401
 
-from . import backend
-import pdfimposer
-from . import config
-from .config import debug
 
 class UserInterrupt(backend.BookletImposerError):
     """Exception raised when the user interrupted the conversion
@@ -55,14 +53,13 @@
     """
     # XXX: this is probably not the right way to do...
 
+
 class BookletImposerUI(object):
     """BookletImposer graphical user interface
-    
     """
-    
+
     def __init__(self, preferences=None):
         """
-        
         """
         if preferences:
             self.__preferences = preferences
@@ -78,25 +75,32 @@
 
         builder = Gtk.Builder()
         builder.set_translation_domain("bookletimposer")
-        builder.add_from_file(os.path.join(config.get_datadir(), "bookletimposer.ui"))
+        builder.add_from_file(os.path.join(config.get_datadir(),
+                              "bookletimposer.ui"))
         builder.connect_signals(self)
 
         self.__main_window = builder.get_object("main_window")
         self.__preferences_table = builder.get_object("preferences_table")
         self.__input_file_chooser_button = \
             builder.get_object("input_file_chooser_button")
-        self.__bookeltize_radiobutton = builder.get_object("bookletize_radiobutton")
-        self.__linearize_radiobutton = builder.get_object("linearize_radiobutton")
-        self.__reduce_radiobutton =  builder.get_object("reduce_radiobutton")
+        self.__bookeltize_radiobutton = \
+            builder.get_object("bookletize_radiobutton")
+        self.__linearize_radiobutton = \
+            builder.get_object("linearize_radiobutton")
+        self.__reduce_radiobutton = builder.get_object("reduce_radiobutton")
         self.__copy_pages_switch = builder.get_object("copy_pages_switch")
-        self.__pages_in_width_spinbutton = builder.get_object("pages_in_width_spinbutton")
-        self.__pages_in_height_spinbutton = builder.get_object("pages_in_height_spinbutton")
+        self.__pages_in_width_spinbutton = \
+            builder.get_object("pages_in_width_spinbutton")
+        self.__pages_in_height_spinbutton = \
+            builder.get_object("pages_in_height_spinbutton")
         self.__paper_format_combobox = \
             builder.get_object("output_paper_format_combobox")
         self.__two_sided_flip_combobox = \
             builder.get_object("two_sided_flip_combobox")
-        self.__output_file_chooser_button = self.__create_output_file_chooser_button(builder)
-        self.__progressbar_conversion = builder.get_object("conversion_progressbar")
+        self.__output_file_chooser_button = \
+            self.__create_output_file_chooser_button(builder)
+        self.__progressbar_conversion = \
+            builder.get_object("conversion_progressbar")
         self.__about_button = builder.get_object("about_button")
         self.__help_button = builder.get_object("help_button")
         self.__apply_button = builder.get_object("apply_button")
@@ -110,9 +114,11 @@
 
     def __add_keybindings(self):
         accelgroup = Gtk.AccelGroup()
-        accelgroup.connect(Gdk.KEY_Escape, 0, Gtk.AccelFlags.VISIBLE,
+        accelgroup.connect(
+            Gdk.KEY_Escape, 0, Gtk.AccelFlags.VISIBLE,
             lambda group, accelerable, key, mod: self.close_application())
-        accelgroup.connect(Gdk.KEY_q, Gdk.ModifierType.CONTROL_MASK, Gtk.AccelFlags.VISIBLE,
+        accelgroup.connect(
+            Gdk.KEY_q, Gdk.ModifierType.CONTROL_MASK, Gtk.AccelFlags.VISIBLE,
             lambda group, accelerable, key, mod: self.close_application())
         self.__main_window.add_accel_group(accelgroup)
 
@@ -175,20 +181,26 @@
     def __apply_preferences(self):
         preferences = self.__preferences
         if preferences.infile_name:
-            self.__input_file_chooser_button.set_filename(preferences.infile_name)
+            self.__input_file_chooser_button.set_filename(
+                preferences.infile_name)
             self.__apply_button.set_sensitive(True)
         if preferences.conversion_type:
-            if  preferences.conversion_type == backend.ConversionType.BOOKLETIZE:
+            if (preferences.conversion_type ==
+                    backend.ConversionType.BOOKLETIZE):
                 self.__bookeltize_radiobutton.set_active(True)
-            if  preferences.conversion_type == backend.ConversionType.LINEARIZE:
+            if (preferences.conversion_type ==
+                    backend.ConversionType.LINEARIZE):
                 self.__linearize_radiobutton.set_active(True)
-            if  preferences.conversion_type == backend.ConversionType.REDUCE:
+            if (preferences.conversion_type ==
+                    backend.ConversionType.REDUCE):
                 self.__reduce_radiobutton.set_active(True)
         if preferences.copy_pages:
             self.__copy_pages_switch.set_active(preferences.copy_pages)
         if preferences.layout:
-            self.__pages_in_width_spinbutton.set_value(preferences.pages_in_width)
-            self.__pages_in_height_spinbutton.set_value(preferences.pages_in_height)
+            self.__pages_in_width_spinbutton.set_value(
+                preferences.pages_in_width)
+            self.__pages_in_height_spinbutton.set_value(
+                preferences.pages_in_height)
         if preferences.two_sided_flip:
             self.combobox_select_row(self.__two_sided_flip_combobox,
                                      preferences.two_sided_flip)
@@ -196,7 +208,8 @@
             self.combobox_select_row(self.__paper_format_combobox,
                                      preferences.paper_format)
         if preferences.outfile_name:
-            self.__output_file_chooser_button.set_filename(preferences.outfile_name)
+            self.__output_file_chooser_button.set_filename(
+                preferences.outfile_name)
 
     # CALLBACKS
 
@@ -212,11 +225,13 @@
 
     def cb_bookletize_toggled(self, widget, data=None):
         if widget.get_active():
-            self.__preferences.conversion_type = backend.ConversionType.BOOKLETIZE
+            self.__preferences.conversion_type = \
+                backend.ConversionType.BOOKLETIZE
 
     def cb_linearize_toggled(self, widget, data=None):
         if widget.get_active():
-            self.__preferences.conversion_type = backend.ConversionType.LINEARIZE
+            self.__preferences.conversion_type = \
+                backend.ConversionType.LINEARIZE
 
     def cb_reduce_toggled(self, widget, data=None):
         if widget.get_active():
@@ -259,20 +274,24 @@
 
     def cb_close_button(self, widget, data=None):
         self.close_application()
-    
+
     def cb_help_button(self, widget, data=None):
         uri = "help:bookletimposer"
         try:
-            Gtk.show_uri(screen = None, uri = uri,
-                timestamp = Gtk.get_current_event_time())
+            Gtk.show_uri(
+                screen=None,
+                uri=uri,
+                timestamp=Gtk.get_current_event_time())
         except Gio.Error as error:
-            dialog = Gtk.MessageDialog(parent=self.__main_window,
-                                       flags=Gtk.DialogFlags.MODAL,
-                                       type=Gtk.MessageType.ERROR,
-                                       buttons=Gtk.ButtonsType.CLOSE,
-                                       message_format=_("Unable to display help: %s")
-                                                      % str(error))
-            dialog.connect("response", lambda widget, data=None: widget.destroy())
+            dialog = Gtk.MessageDialog(
+                parent=self.__main_window,
+                flags=Gtk.DialogFlags.MODAL,
+                type=Gtk.MessageType.ERROR,
+                buttons=Gtk.ButtonsType.CLOSE,
+                message_format=_("Unable to display help: %s") % str(error))
+            dialog.connect(
+                "response",
+                lambda widget, data=None: widget.destroy())
             dialog.run()
 
     def cb_apply_button(self, widget, data=None):
@@ -281,10 +300,11 @@
 
     def cb_progress_stop(self, widget, data=None):
         self.__stop.set()
-        self.__progressbar_conversion.set_text(_("Cancel triggered, please wait..."))
+        self.__progressbar_conversion.set_text(_("Cancel triggered, please "
+                                                 "wait..."))
 
     # ACTIONS
-    
+
     def close_application(self):
         Gtk.main_quit()
 
@@ -320,11 +340,12 @@
             self.__stop_button.set_visible(False)
 
         def cb_overwrite_outfile(filename):
-            dialog = Gtk.MessageDialog(parent=self.__main_window,
-                                       flags=Gtk.DialogFlags.MODAL,
-                                       type=Gtk.MessageType.QUESTION,
-                                       buttons=Gtk.ButtonsType.YES_NO,
-                                       message_format=_("A file named %s already exist.") % filename)
+            dialog = Gtk.MessageDialog(
+                parent=self.__main_window,
+                flags=Gtk.DialogFlags.MODAL,
+                type=Gtk.MessageType.QUESTION,
+                buttons=Gtk.ButtonsType.YES_NO,
+                message_format=_("A file named %s already exist.") % filename)
             dialog.format_secondary_text(_("Do you want to replace it?"))
             resp = dialog.run()
             dialog.destroy()
@@ -339,7 +360,8 @@
             # the operation. To achieve that we raise an exception.
             # XXX: that's not elegant at all
             if self.__stop.is_set():
-                self.__progressbar_conversion.set_text(_("Conversion cancelled"))
+                self.__progressbar_conversion.set_text(
+                    _("Conversion cancelled"))
                 raise UserInterrupt()
             GObject.idle_add(idle_cb_update_progress, message, progress)
 
@@ -367,10 +389,10 @@
                 raise
             GObject.idle_add(idle_cb_finish_callback)
 
-
         start_conversion_mode()
         try:
-            converter = self.__preferences.create_converter(cb_overwrite_outfile)
+            converter = self.__preferences.create_converter(
+                cb_overwrite_outfile)
         except pdfimposer.UserInterruptError:
             stop_conversion_mode()
             return
@@ -382,6 +404,7 @@
         converter_thread = threading.Thread(target=worker)
         converter_thread.start()
 
+
 if __name__ == "__main__":
     ui = BookletImposerUI()
     Gtk.main()
diff -Nru bookletimposer-0.3~beta1/lib/bookletimposer/__init__.py bookletimposer-0.3+ds/lib/bookletimposer/__init__.py
--- bookletimposer-0.3~beta1/lib/bookletimposer/__init__.py	2019-09-29 21:18:53.000000000 +0000
+++ bookletimposer-0.3+ds/lib/bookletimposer/__init__.py	2019-12-13 12:18:35.000000000 +0000
@@ -2,20 +2,20 @@
 # -*- coding: UTF-8 -*-
 
 ########################################################################
-# 
+#
 # PdfImposer - Utility to convert PDF files between diffrents page layouts
-# Copyright (C) 2008-2012 Kjö Hansi Glaz <kjo@a4nancy.net.eu.org>
-# 
+# Copyright (C) 2008-2019 Kjö Hansi Glaz <kjo@a4nancy.net.eu.org>
+#
 # 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/>.
 #
diff -Nru bookletimposer-0.3~beta1/lib/pdfimposer.py bookletimposer-0.3+ds/lib/pdfimposer.py
--- bookletimposer-0.3~beta1/lib/pdfimposer.py	2019-09-29 21:18:53.000000000 +0000
+++ bookletimposer-0.3+ds/lib/pdfimposer.py	2019-12-13 12:18:35.000000000 +0000
@@ -2,20 +2,20 @@
 # -*- coding: UTF-8 -*-
 
 ########################################################################
-# 
+#
 # pdfimposer - achieve some basic imposition on PDF documents
-# Copyright (C) 2008-2012 Kjö Hansi Glaz <kjo@a4nancy.net.eu.org>
-# 
+# Copyright (C) 2008-2019 Kjö Hansi Glaz <kjo@a4nancy.net.eu.org>
+#
 # 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/>.
 #
@@ -49,7 +49,6 @@
 from abc import ABCMeta, abstractmethod
 
 import re
-import sys
 import os
 import types
 
@@ -59,7 +58,7 @@
 try:
     _
 except NameError:
-    _ = lambda x: x
+    def _(x): return x
 
 __docformat__ = "restructuredtext"
 
@@ -67,6 +66,7 @@
 
 # CONSTANTS
 
+
 class PageOrientation:
     """The page orientation constants"""
     PORTRAIT = False
@@ -74,15 +74,17 @@
     LANDSCAPE = True
     """The lanscape orientation"""
 
+
 class TwoSidedFlip:
     """Which paper edge will the flip occur on when printing?"""
-    SHORT_EDGE = "short-edge flip"
+    SHORT_EDGE = _("short-edge flip")
     """Pages will be flipped on the short edge"""
-    LONG_EDGE = "long-edge flip"
+    LONG_EDGE = _("long-edge flip")
     """Pages will be flipped on the long edge"""
 
 ########################################################################
 
+
 class PdfConvError(Exception):
     """
     The base class for all exceptions raised by PdfImposer.
@@ -96,6 +98,7 @@
 
 ########################################################################
 
+
 class MismachingOrientationsError(PdfConvError):
     """
     This exception is raised if the required layout is incompatible with
@@ -104,11 +107,12 @@
     The attribute "message" contains the problematic layout.
     """
     def __str__(self):
-        return _("The layout %s is incompatible with the input page orientation") \
-            % self.message
+        return _("The layout %s is incompatible with the input page "
+                 "orientation") % self.message
 
 ########################################################################
 
+
 class UnknownFormatError(PdfConvError):
     """
     This exception is raised when the user tries to set an unknown page
@@ -131,6 +135,7 @@
 
 ########################################################################
 
+
 class AbstractConverter(object, metaclass=ABCMeta):
     """
     The base class for all pdfimposer converter classes.
@@ -146,17 +151,17 @@
     """
 
     page_formats = {
-        "A3":(841,1190),
-        "A3":(842,1192),
-        "A4":(595,841),
-        "A4":(595,842),
-        "A5":(420,595),
-        "Tabloid":(792, 1224),
-        "Letter":(612, 792),
-        "Legal":(612, 1008),
+        "A3": (841, 1190),      # noqa: F601
+        "A3": (842, 1192),      # noqa: F601
+        "A4": (595, 841),       # noqa: F601
+        "A4": (595, 842),       # noqa: F601
+        "A5": (420, 595),
+        "Tabloid": (792, 1224),
+        "Letter": (612, 792),
+        "Legal": (612, 1008),
         }
 
-    def __init__(self, 
+    def __init__(self,
                  layout='2x1',
                  format='A4',
                  flip=TwoSidedFlip.SHORT_EDGE,
@@ -302,7 +307,7 @@
             must be : a string for the progress message;
             a number in the range [0, 1] for the progress.
         """
-        assert(type(progress_callback) is types.FunctionType)
+        assert(isinstance(progress_callback, types.FunctionType))
         self.__progress_callback = progress_callback
 
     def get_progress_callback(self):
@@ -362,7 +367,8 @@
             The page height of the input document expressed in default
             user space units.
         """
-        raise NotImplementedError("get_input_height must be implemented in a subclass.")
+        raise NotImplementedError("get_input_height must be implemented in "
+                                  "a subclass.")
 
     @abstractmethod
     def get_input_width(self):
@@ -373,7 +379,8 @@
             The page width of the input document expressed in default
             user space units.
         """
-        raise NotImplementedError("get_input_width must be implemented in a subclass.")
+        raise NotImplementedError("get_input_width must be implemented in "
+                                  "a subclass.")
 
     def get_input_orientation(self):
         """
@@ -387,7 +394,7 @@
         elif self.get_input_height() < self.get_input_width():
             return PageOrientation.LANDSCAPE
         else:
-            #XXX: is square
+            # XXX: is square
             return None
 
     def set_layout(self, layout):
@@ -419,7 +426,8 @@
             to put on the width of the output page and H is the number of
             input pages to put in the height of an output page.
         """
-        return str(self.get_pages_in_width()) + 'x' + str(self.get_pages_in_height())
+        return str(self.get_pages_in_width()) + \
+            'x' + str(self.get_pages_in_height())
 
     def get_pages_in_sheet(self):
         """
@@ -439,7 +447,8 @@
           - `format` A string representing name ot the the desired paper
             format, among the keys of page_formats (e.g. A3, A4, A5).
 
-        :Raises UnknonwFormatError: if the given paper format is not recognized.
+        :Raises UnknonwFormatError: if the given paper format is not
+        recognized.
         """
         try:
             width, height = AbstractConverter.page_formats[format]
@@ -458,7 +467,7 @@
         """
         for output_format in list(AbstractConverter.page_formats.keys()):
             if AbstractConverter.page_formats[output_format] == \
-                (self.get_output_width, self.get_output_height):
+                    (self.get_output_width, self.get_output_height):
                 return output_format
 
     def get_input_format(self):
@@ -486,7 +495,8 @@
         :Returns:
             The number of pages of the input document.
         """
-        raise NotImplementedError("get_page_count must be implemented in a subclass.")
+        raise NotImplementedError("get_page_count must be implemented in "
+                                  "a subclass.")
 
     def get_reduction_factor(self):
         """
@@ -561,7 +571,8 @@
         Convert a linear document to a booklet, arranging the pages as
         required.
         """
-        raise NotImplementedError("bookletize must be implemented in a subclass.")
+        raise NotImplementedError("bookletize must be implemented in a "
+                                  "subclass.")
 
     @abstractmethod
     def linearize(self):
@@ -571,7 +582,8 @@
         Convert a booklet to a linear document, arranging the pages as
         required.
         """
-        raise NotImplementedError("linearize must be implemented in a subclass.")
+        raise NotImplementedError("linearize must be implemented in a "
+                                  "subclass.")
 
     @abstractmethod
     def reduce(self):
@@ -582,13 +594,14 @@
 
 ########################################################################
 
+
 class StreamConverter(AbstractConverter):
     """
     This class performs conversions on file-like objects (e.g. a StreamIO).
     """
 
     def __init__(self,
-                 input_stream, 
+                 input_stream,
                  output_stream,
                  layout='2x1',
                  format='A4',
@@ -612,10 +625,6 @@
 
         AbstractConverter.__init__(self, layout, format,
                                    flip, copy_pages)
-
-
-        
-
         self._output_stream = output_stream
         self._input_stream = input_stream
 
@@ -747,18 +756,20 @@
 
         if booklet:
             sequence = []
-            try :
+            try:
                 for i in range(0, self.get_page_count() *
                                self.get_pages_in_sheet(), 4):
                     append_and_remove_copies(sequence,
                                              [int(i / 2), int(i / 2)])
                     append_and_remove_copies(sequence,
                                              [int(i / 2 + 1), int(i / 2 + 2)])
-            except IndexError :
+            except IndexError:
                 # XXX: Print a warning
                 pass
         else:
-            sequence = list(range(0, self.get_page_count() * self.get_pages_in_sheet()))
+            sequence = list(range(0,
+                                  self.get_page_count() *
+                                  self.get_pages_in_sheet()))
         return sequence
 
     def __get_sequence_for_reduce(self):
@@ -778,7 +789,8 @@
         else:
             sequence = list(range(self.get_page_count()))
             if len(sequence) % self.get_pages_in_sheet() != 0:
-                for missing_page in range(self.get_pages_in_sheet() -
+                for missing_page in range(
+                        self.get_pages_in_sheet() -
                         (len(sequence) % self.get_pages_in_sheet())):
                     sequence.append(None)
         return sequence
@@ -813,26 +825,28 @@
         while current_page < len(sequence):
             self.get_progress_callback()(
                 _("creating page %i") %
-                    ((current_page + self.get_pages_in_sheet()) /
-                        self.get_pages_in_sheet()),
+                ((current_page + self.get_pages_in_sheet()) /
+                 self.get_pages_in_sheet()),
                 float(current_page) / len(sequence)
                 )
-            page = outpdf.addBlankPage(self.get_output_width(), 
-                self.get_output_height())
+            page = outpdf.addBlankPage(self.get_output_width(),
+                                       self.get_output_height())
             for vert_pos in range(0, self.get_pages_in_height()):
                 for horiz_pos in range(0, self.get_pages_in_width()):
-                    if current_page < len(sequence) and sequence[current_page] is not None:
+                    if (current_page < len(sequence) and
+                            sequence[current_page] is not None):
                         page.mergeScaledTranslatedPage(
                             self._inpdf.getPage(sequence[current_page]),
-                            self.get_reduction_factor(), 
-                            horiz_pos*self.get_output_width() / \
-                                self.get_pages_in_width(),
-                            self.get_output_height() - ( 
-                                (vert_pos + 1) * self.get_output_height() / \
+                            self.get_reduction_factor(),
+                            horiz_pos*self.get_output_width() /
+                            self.get_pages_in_width(),
+                            self.get_output_height() - (
+                                (vert_pos + 1) * self.get_output_height() /
                                 self.get_pages_in_height())
                             )
                     current_page += 1
-            if self.get_two_sided_flip() == TwoSidedFlip.LONG_EDGE and output_page % 2:
+            if (self.get_two_sided_flip() == TwoSidedFlip.LONG_EDGE and
+                    output_page % 2):
                 page.rotateClockwise(180)
             page.compressContentStreams()
             output_page += 1
@@ -867,8 +881,8 @@
                             self._inpdf.getPage(input_page),
                             self.get_increasing_factor(),
                             - horiz_pos * self.get_output_width(),
-                            (vert_pos - self.get_pages_in_height() + 1) * \
-                                self.get_output_height()
+                            (vert_pos - self.get_pages_in_height() + 1) *
+                            self.get_output_height()
                             )
                         page.compressContentStreams()
                     output_page += 1
@@ -876,6 +890,7 @@
 
 ########################################################################
 
+
 class FileConverter(StreamConverter):
     """
     This class performs conversions on true files.
@@ -904,7 +919,9 @@
             set_copy_pages).
           - `overwrite_outfile_callback` A callback function which is called
             if outfile_name already exists when trying to open it. Its
-            signature must be : take a string for the outfile_name as an argument;
+            signature must be : take a string for the outfile_name as an
+            argument;
+
             return False not to overwrite the file. If ommited, existing file
             would be overwritten without confirmation.
 
@@ -919,16 +936,17 @@
             self.__set_outfile_name(outfile_name)
         else:
             self.__set_outfile_name(None)
-          
+
         # Then infile_nameis set, so if outfile_name was not provided we
         # can create it from infile_name
         self.__set_infile_name(infile_name)
 
         # Setup callback to ask for confirmation before overwriting outfile
         if overwrite_outfile_callback:
-            assert(type(overwrite_outfile_callback) is types.FunctionType)
+            assert(isinstance(overwrite_outfile_callback, types.FunctionType))
         else:
-            overwrite_outfile_callback = lambda filename: True
+            def overwrite_outfile_callback(filename):
+                return True
 
         # Now initialize a streamConverter
         self._input_stream = open(self.get_infile_name(), 'rb')
@@ -954,7 +972,6 @@
                 # XXX: Do something better
                 pass
 
-
     # GETTERS AND SETTERS SECTION
     # ===========================
 
@@ -969,7 +986,7 @@
         self.__infile_name = name
 
         if not self.__outfile_name:
-            result = re.search("(.+)\.\w*$", name)
+            result = re.search(r"(.+)\.\w*$", name)
             if result:
                 self.__outfile_name = result.group(1) + '-conv.pdf'
             else:
@@ -1006,7 +1023,7 @@
 # Convenience functions
 # =====================
 
-def bookletize_on_stream(input_stream, 
+def bookletize_on_stream(input_stream,
                          output_stream,
                          layout='2x1',
                          format='A4',
@@ -1037,7 +1054,8 @@
     StreamConverter(layout, format, flip, copy_pages,
                     input_stream, output_stream()).bookletize()
 
-def bookletize_on_file(input_file, 
+
+def bookletize_on_file(input_file,
                        output_file=None,
                        layout='2x1',
                        format='A4',
@@ -1068,7 +1086,8 @@
     FileConverter(input_file, output_file, layout, format,
                   flip, copy_pages).bookletize()
 
-def linearize_on_stream(input_stream, 
+
+def linearize_on_stream(input_stream,
                         output_stream,
                         layout='2x1',
                         format='A4',
@@ -1096,10 +1115,12 @@
     StreamConverter(input_stream, output_stream, layout,
                     format, TwoSidedFlip.SHORT_EDGE, copy_pages).linearize()
 
-def linearize_on_file(input_file, 
+
+def linearize_on_file(input_file,
                       output_file=None,
                       layout='2x1',
                       format='A4',
+                      flip=TwoSidedFlip.SHORT_EDGE,
                       copy_pages=False):
     """
     Convert a booklet to a linear PDF file.
@@ -1122,9 +1143,10 @@
         set_copy_pages).
     """
     FileConverter(input_file, output_file, layout, format,
-                  flip, TwoSidedFlip.SHORT_EDGE, copy_pages).linearize()
+                  flip, copy_pages).linearize()
+
 
-def reduce_on_stream(input_stream, 
+def reduce_on_stream(input_stream,
                      output_stream,
                      layout='2x1',
                      format='A4',
@@ -1152,7 +1174,8 @@
     StreamConverter(input_stream, output_stream, layout, format,
                     flip, copy_pages).reduce()
 
-def reduce_on_file(input_file, 
+
+def reduce_on_file(input_file,
                    output_file=None,
                    layout='2x1',
                    format='A4',
diff -Nru bookletimposer-0.3~beta1/po/bookletimposer.pot bookletimposer-0.3+ds/po/bookletimposer.pot
--- bookletimposer-0.3~beta1/po/bookletimposer.pot	2019-09-29 21:18:53.000000000 +0000
+++ bookletimposer-0.3+ds/po/bookletimposer.pot	2019-12-13 12:18:35.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-29 20:18+0200\n"
+"POT-Creation-Date: 2019-12-13 13:10+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,201 +17,209 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../bin/bookletimposer:63
+#: ../bin/bookletimposer:65
 msgid "output PDF file"
 msgstr ""
 
-#: ../bin/bookletimposer:67
+#: ../bin/bookletimposer:70
 msgid ""
 "automatic conversion (don't show the user interface). At least input file "
-"must be defined"
+"must be defined."
 msgstr ""
 
-#: ../bin/bookletimposer:71
+#: ../bin/bookletimposer:76
 msgid "shows the user interface (default)."
 msgstr ""
 
-#: ../bin/bookletimposer:75
+#: ../bin/bookletimposer:82
 msgid "makes a booklet"
 msgstr ""
 
-#: ../bin/bookletimposer:79
+#: ../bin/bookletimposer:88
 msgid "convert a booklet to single pages"
 msgstr ""
 
-#: ../bin/bookletimposer:83
+#: ../bin/bookletimposer:94
 msgid "don't do any reorganisation (will only scale and assemble pages)"
 msgstr ""
 
-#: ../bin/bookletimposer:87
+#: ../bin/bookletimposer:100
 msgid "Copy the same group of input pages on one output page"
 msgstr ""
 
-#: ../bin/bookletimposer:91
+#: ../bin/bookletimposer:105
 msgid "number of pages per sheet, in the format HORIZONTALxVERTICAL, e.g. 2x1"
 msgstr ""
 
-#: ../bin/bookletimposer:95
+#: ../bin/bookletimposer:111
 msgid "output page format, e.g. A4 or A3R"
 msgstr ""
 
-#: ../bin/bookletimposer:99
+#: ../bin/bookletimposer:116
 msgid "do not overwrite output file if it exists"
 msgstr ""
 
-#: ../bin/bookletimposer:127
+#: ../bin/bookletimposer:144
 msgid "ERROR: In automatic mode, you must provide a file to process."
 msgstr ""
 
-#: ../bin/bookletimposer:136
+#: ../bin/bookletimposer:157
 #, c-format
 msgid "%i%%: %s"
 msgstr ""
 
-#: ../lib/pdfimposer.py:107
+#: ../lib/pdfimposer.py:80
+msgid "short-edge flip"
+msgstr ""
+
+#: ../lib/pdfimposer.py:82
+msgid "long-edge flip"
+msgstr ""
+
+#: ../lib/pdfimposer.py:110
 #, python-format
 msgid "The layout %s is incompatible with the input page orientation"
 msgstr ""
 
-#: ../lib/pdfimposer.py:120
+#: ../lib/pdfimposer.py:124
 #, python-format
 msgid "The page format \"%s\" is unknown"
 msgstr ""
 
-#: ../lib/pdfimposer.py:130
+#: ../lib/pdfimposer.py:134
 msgid "User interruption"
 msgstr ""
 
-#: ../lib/pdfimposer.py:794
+#: ../lib/pdfimposer.py:806
 msgid "writing converted file"
 msgstr ""
 
-#: ../lib/pdfimposer.py:796
+#: ../lib/pdfimposer.py:808
 msgid "done"
 msgstr ""
 
-#: ../lib/pdfimposer.py:815
+#: ../lib/pdfimposer.py:827
 #, python-format
 msgid "creating page %i"
 msgstr ""
 
-#: ../lib/pdfimposer.py:861
+#: ../lib/pdfimposer.py:875
 #, python-format
 msgid "extracting page %i"
 msgstr ""
 
-#: ../lib/bookletimposer/gui.py:244
+#: ../lib/bookletimposer/gui.py:259
 msgid "Choose file to save"
 msgstr ""
 
-#: ../lib/bookletimposer/gui.py:273
+#: ../lib/bookletimposer/gui.py:291
 #, python-format
 msgid "Unable to display help: %s"
 msgstr ""
 
-#: ../lib/bookletimposer/gui.py:284
+#: ../lib/bookletimposer/gui.py:303
 msgid "Cancel triggered, please wait..."
 msgstr ""
 
-#: ../lib/bookletimposer/gui.py:301
+#: ../lib/bookletimposer/gui.py:321
 msgid "Conversion failed"
 msgstr ""
 
-#: ../lib/bookletimposer/gui.py:327
+#: ../lib/bookletimposer/gui.py:348
 #, python-format
 msgid "A file named %s already exist."
 msgstr ""
 
-#: ../lib/bookletimposer/gui.py:328
+#: ../lib/bookletimposer/gui.py:349
 msgid "Do you want to replace it?"
 msgstr ""
 
-#: ../lib/bookletimposer/gui.py:342
+#: ../lib/bookletimposer/gui.py:364
 msgid "Conversion cancelled"
 msgstr ""
 
 #: ../data/bookletimposer.ui.h:1
-msgid "Copyright © 2008-2012 kjo@a4nancy.net.eu.org"
-msgstr ""
-
-#: ../data/bookletimposer.ui.h:2
-msgid "Convert PDF documents between diffrents page layouts"
-msgstr ""
-
-#: ../data/bookletimposer.ui.h:3
-msgid ""
-"\n"
-"PyPdfConv - Utility to convert PDF files between diffrents page layouts\n"
-"Copyright (C) 2008-2012 Kjö Hansi Glaz <kjo&a4nancy.net.eu.org>\n"
-"\n"
-"This program is  free software; you can redistribute  it and/or modify\n"
-"it under the  terms of the GNU General Public  License as published by\n"
-"the Free Software Foundation; either  version 3 of the License, or (at\n"
-"your option) any later version.\n"
-"\n"
-"This program  is distributed in the  hope that it will  be useful, but\n"
-"WITHOUT   ANY  WARRANTY;   without  even   the  implied   warranty  of\n"
-"MERCHANTABILITY  or FITNESS  FOR A  PARTICULAR PURPOSE.   See  the GNU\n"
-"General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program.  If not, see <http://www.gnu.org/licenses/>.\n"
-msgstr ""
-
-#: ../data/bookletimposer.ui.h:20
 msgid "Output _paper format"
 msgstr ""
 
-#: ../data/bookletimposer.ui.h:21
+#: ../data/bookletimposer.ui.h:2
 msgid "Two-sided _flip"
 msgstr ""
 
-#: ../data/bookletimposer.ui.h:22
+#: ../data/bookletimposer.ui.h:3
 msgid "Number of pages in _width"
 msgstr ""
 
-#: ../data/bookletimposer.ui.h:23
+#: ../data/bookletimposer.ui.h:4
 msgid "_Output file"
 msgstr ""
 
-#: ../data/bookletimposer.ui.h:24
+#: ../data/bookletimposer.ui.h:5
 msgid "(None)"
 msgstr ""
 
-#: ../data/bookletimposer.ui.h:25
+#: ../data/bookletimposer.ui.h:6
 msgid "_Copy the same group of input pages on one output page"
 msgstr ""
 
-#: ../data/bookletimposer.ui.h:26
+#: ../data/bookletimposer.ui.h:7
 msgid ""
 "Produce a _booklet\n"
 "out of a linear document"
 msgstr ""
 
-#: ../data/bookletimposer.ui.h:28
+#: ../data/bookletimposer.ui.h:9
 msgid ""
 "Produce a _linear document \n"
 "out of a booklet"
 msgstr ""
 
-#: ../data/bookletimposer.ui.h:30
+#: ../data/bookletimposer.ui.h:11
 msgid ""
 "Put _multiple input pages \n"
 "on one output sheet"
 msgstr ""
 
-#: ../data/bookletimposer.ui.h:32
+#: ../data/bookletimposer.ui.h:13
 msgid "Conversion type"
 msgstr ""
 
-#: ../data/bookletimposer.ui.h:33
+#: ../data/bookletimposer.ui.h:14
 msgid "_Input file"
 msgstr ""
 
-#: ../data/bookletimposer.ui.h:34
+#: ../data/bookletimposer.ui.h:15
 msgid "Open input PDF file"
 msgstr ""
 
-#: ../data/bookletimposer.ui.h:35
+#: ../data/bookletimposer.ui.h:16
 msgid "Number of pages in _height"
 msgstr ""
+
+#: ../data/bookletimposer.ui.h:17
+msgid "Copyright © 2008-2019 kjo@a4nancy.net.eu.org"
+msgstr ""
+
+#: ../data/bookletimposer.ui.h:18
+msgid "Convert PDF documents between diffrents page layouts"
+msgstr ""
+
+#: ../data/bookletimposer.ui.h:19
+msgid ""
+"\n"
+"PyPdfConv - Utility to convert PDF files between diffrents page layouts\n"
+"Copyright (C) 2008-2019 Kjö Hansi Glaz <kjo&a4nancy.net.eu.org>\n"
+"\n"
+"This program is  free software; you can redistribute  it and/or modify\n"
+"it under the  terms of the GNU General Public  License as published by\n"
+"the Free Software Foundation; either  version 3 of the License, or (at\n"
+"your option) any later version.\n"
+"\n"
+"This program  is distributed in the  hope that it will  be useful, but\n"
+"WITHOUT   ANY  WARRANTY;   without  even   the  implied   warranty  of\n"
+"MERCHANTABILITY  or FITNESS  FOR A  PARTICULAR PURPOSE.   See  the GNU\n"
+"General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License\n"
+"along with this program.  If not, see <http://www.gnu.org/licenses/>.\n"
+msgstr ""
diff -Nru bookletimposer-0.3~beta1/po/da.po bookletimposer-0.3+ds/po/da.po
--- bookletimposer-0.3~beta1/po/da.po	2019-09-29 21:18:53.000000000 +0000
+++ bookletimposer-0.3+ds/po/da.po	2019-12-13 12:18:35.000000000 +0000
@@ -6,8 +6,8 @@
 msgstr ""
 "Project-Id-Version: bookletimposer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-16 12:50+0200\n"
-"PO-Revision-Date: 2018-12-12 12:50+0200\n"
+"POT-Creation-Date: 2019-12-13 13:10+0100\n"
+"PO-Revision-Date: 2019-12-13 13:13+0100\n"
 "Last-Translator: scootergrisen\n"
 "Language-Team: Danish\n"
 "Language: da\n"
@@ -15,188 +15,156 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 2.2.4\n"
 
-#: ../bin/bookletimposer:64
+#: ../bin/bookletimposer:65
 msgid "output PDF file"
 msgstr "output PDF-fil"
 
-#: ../bin/bookletimposer:68
+#: ../bin/bookletimposer:70
 msgid ""
 "automatic conversion (don't show the user interface). At least input file "
-"must be defined"
+"must be defined."
 msgstr ""
 "automatisk konvertering (vis ikke brugerfladen). Som det mindste skal der "
-"være angivet en inputfil"
+"være angivet en inputfil."
 
-#: ../bin/bookletimposer:72
+#: ../bin/bookletimposer:76
 msgid "shows the user interface (default)."
 msgstr "viser brugerfladen (standard)."
 
-#: ../bin/bookletimposer:76
+#: ../bin/bookletimposer:82
 msgid "makes a booklet"
 msgstr "skaber en booklet"
 
-#: ../bin/bookletimposer:80
+#: ../bin/bookletimposer:88
 msgid "convert a booklet to single pages"
 msgstr "konverterer en booklet til enkelte sider"
 
-#: ../bin/bookletimposer:84
+#: ../bin/bookletimposer:94
 msgid "don't do any reorganisation (will only scale and assemble pages)"
 msgstr "foretag ikke genorganisering (vil kun skalere og samle sider)"
 
-#: ../bin/bookletimposer:88
+#: ../bin/bookletimposer:100
 msgid "Copy the same group of input pages on one output page"
 msgstr "Kopiér den samme gruppe inputsider på én outputside"
 
-#: ../bin/bookletimposer:92
+#: ../bin/bookletimposer:105
 msgid "number of pages per sheet, in the format HORIZONTALxVERTICAL, e.g. 2x1"
 msgstr "antal sider pr. ark, i formatet VANDRETxLODRET, f.eks. 2x1"
 
-#: ../bin/bookletimposer:96
+#: ../bin/bookletimposer:111
 msgid "output page format, e.g. A4 or A3R"
 msgstr "output sideformat, f.eks. A4 eller A3R"
 
-#: ../bin/bookletimposer:100
+#: ../bin/bookletimposer:116
 msgid "do not overwrite output file if it exists"
 msgstr "overskriv ikke outputfil hvis den findes"
 
-#: ../bin/bookletimposer:127
+#: ../bin/bookletimposer:144
 msgid "ERROR: In automatic mode, you must provide a file to process."
 msgstr "FEJL: I automatisk tilstand, skal du give en fil for at behandle."
 
-#: ../bin/bookletimposer:136
+#: ../bin/bookletimposer:157
 #, c-format
 msgid "%i%%: %s"
 msgstr "%i%%: %s"
 
-#: ../lib/pdfimposer.py:102
+#: ../lib/pdfimposer.py:80
+msgid "short-edge flip"
+msgstr ""
+
+#: ../lib/pdfimposer.py:82
+msgid "long-edge flip"
+msgstr ""
+
+#: ../lib/pdfimposer.py:110
 #, python-format
 msgid "The layout %s is incompatible with the input page orientation"
 msgstr "Layoutet %s er inkompatibelt med inputsideorienteringen"
 
-#: ../lib/pdfimposer.py:115
+#: ../lib/pdfimposer.py:124
 #, python-format
 msgid "The page format \"%s\" is unknown"
 msgstr "Sideformatet \"%s\" er ukendt"
 
-#: ../lib/pdfimposer.py:125
+#: ../lib/pdfimposer.py:134
 msgid "User interruption"
 msgstr "Brugerafbrydelse"
 
-#: ../lib/pdfimposer.py:749
+#: ../lib/pdfimposer.py:806
 msgid "writing converted file"
 msgstr "skriver konverteret fil"
 
-#: ../lib/pdfimposer.py:751
+#: ../lib/pdfimposer.py:808
 msgid "done"
 msgstr "færdig"
 
-#: ../lib/pdfimposer.py:769
+#: ../lib/pdfimposer.py:827
 #, python-format
 msgid "creating page %i"
 msgstr "opretter side %i"
 
-#: ../lib/pdfimposer.py:812
+#: ../lib/pdfimposer.py:875
 #, python-format
 msgid "extracting page %i"
 msgstr "udtrækker side %i"
 
-#: ../lib/bookletimposer/gui.py:231
+#: ../lib/bookletimposer/gui.py:259
 msgid "Choose file to save"
 msgstr "Vælg fil som skal gemmes"
 
-#: ../lib/bookletimposer/gui.py:260
+#: ../lib/bookletimposer/gui.py:291
 #, python-format
 msgid "Unable to display help: %s"
 msgstr "Kan ikke vise hjælp: %s"
 
-#: ../lib/bookletimposer/gui.py:271
+#: ../lib/bookletimposer/gui.py:303
 msgid "Cancel triggered, please wait..."
 msgstr "Annullering udløst, vent venligst..."
 
-#: ../lib/bookletimposer/gui.py:288
+#: ../lib/bookletimposer/gui.py:321
 msgid "Conversion failed"
 msgstr "Konvertering mislykkedes"
 
-#: ../lib/bookletimposer/gui.py:314
+#: ../lib/bookletimposer/gui.py:348
 #, python-format
 msgid "A file named %s already exist."
 msgstr "En fil ved navn %s findes allerede."
 
-#: ../lib/bookletimposer/gui.py:315
+#: ../lib/bookletimposer/gui.py:349
 msgid "Do you want to replace it?"
 msgstr "Vil du erstatte den?"
 
-#: ../lib/bookletimposer/gui.py:329
+#: ../lib/bookletimposer/gui.py:364
 msgid "Conversion cancelled"
 msgstr "Konvertering annulleret"
 
 #: ../data/bookletimposer.ui.h:1
-msgid "Copyright © 2008-2012 kjo@a4nancy.net.eu.org"
-msgstr "Ophavsret © 2008-2012 kjo@a4nancy.net.eu.org"
+msgid "Output _paper format"
+msgstr "_Papirformat for output"
 
 #: ../data/bookletimposer.ui.h:2
-msgid "Convert PDF documents between diffrents page layouts"
-msgstr "Konverter PDF-dokumenter mellem forskellige sidelayouts"
+msgid "Two-sided _flip"
+msgstr ""
 
 #: ../data/bookletimposer.ui.h:3
-msgid ""
-"\n"
-"PyPdfConv - Utility to convert PDF files between diffrents page layouts\n"
-"Copyright (C) 2008-2012 Kjö Hansi Glaz <kjo&a4nancy.net.eu.org>\n"
-"\n"
-"This program is  free software; you can redistribute  it and/or modify\n"
-"it under the  terms of the GNU General Public  License as published by\n"
-"the Free Software Foundation; either  version 3 of the License, or (at\n"
-"your option) any later version.\n"
-"\n"
-"This program  is distributed in the  hope that it will  be useful, but\n"
-"WITHOUT   ANY  WARRANTY;   without  even   the  implied   warranty  of\n"
-"MERCHANTABILITY  or FITNESS  FOR A  PARTICULAR PURPOSE.   See  the GNU\n"
-"General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program.  If not, see <http://www.gnu.org/licenses/>.\n"
+msgid "Number of pages in _width"
 msgstr ""
-"\n"
-"PyPdfConv - Redskab til at konvertere PDF-filer mellem forskellige "
-"sidelayouts\n"
-"Ophavsret (C) 2008-2012 Kjö Hansi Glaz <kjo&a4nancy.net.eu.org>\n"
-"\n"
-"Dette program er fri software: du kan videredistribuere det og/eller\n"
-"modificere det under vilkårene i GNU General Public License som udgivet af\n"
-"Free Software Foundation, enten version 3 af Licensen, eller\n"
-"(efter eget valg) enhver senere version.\n"
-"\n"
-"Dette program er distribueret i håbet om at det vil være nyttigt,\n"
-"men UDEN NOGEN GARANTI; uden selv den underforstået garanti vedrørende\n"
-"SALGBARHED eller EGNETHED TIL ET BESTEMT FORMÅL. Se\n"
-"GNU General Public License for flere detaljer.\n"
-"\n"
-"Du skulle have modtaget en kopi af GNU General Public License\n"
-"sammen med dette program. Hvis ikke, se <http://www.gnu.org/licenses/>.\n"
-
-#: ../data/bookletimposer.ui.h:20
-msgid "Output _paper format"
-msgstr "_Papirformat for output"
-
-#: ../data/bookletimposer.ui.h:21
-msgid "La_yout"
-msgstr "La_yout"
 
-#: ../data/bookletimposer.ui.h:22
+#: ../data/bookletimposer.ui.h:4
 msgid "_Output file"
 msgstr "_Outputfil"
 
-#: ../data/bookletimposer.ui.h:23
+#: ../data/bookletimposer.ui.h:5
 msgid "(None)"
 msgstr "(Ingen)"
 
-#: ../data/bookletimposer.ui.h:24
+#: ../data/bookletimposer.ui.h:6
 msgid "_Copy the same group of input pages on one output page"
 msgstr "_Kopiér den samme gruppe inputsider på én outputside"
 
-#: ../data/bookletimposer.ui.h:25
+#: ../data/bookletimposer.ui.h:7
 msgid ""
 "Produce a _booklet\n"
 "out of a linear document"
@@ -204,7 +172,7 @@
 "Skab en _booklet\n"
 "fra et lineært dokument"
 
-#: ../data/bookletimposer.ui.h:27
+#: ../data/bookletimposer.ui.h:9
 msgid ""
 "Produce a _linear document \n"
 "out of a booklet"
@@ -212,7 +180,7 @@
 "Skab et _lineært dokument\n"
 "fra en booklet"
 
-#: ../data/bookletimposer.ui.h:29
+#: ../data/bookletimposer.ui.h:11
 msgid ""
 "Put _multiple input pages \n"
 "on one output sheet"
@@ -220,14 +188,66 @@
 "Læg _flere inputsider \n"
 "på ét outputark"
 
-#: ../data/bookletimposer.ui.h:31
+#: ../data/bookletimposer.ui.h:13
 msgid "Conversion type"
 msgstr "Konverteringstype"
 
-#: ../data/bookletimposer.ui.h:32
+#: ../data/bookletimposer.ui.h:14
 msgid "_Input file"
 msgstr "_Inputfil"
 
-#: ../data/bookletimposer.ui.h:33
+#: ../data/bookletimposer.ui.h:15
 msgid "Open input PDF file"
 msgstr "Åbn input PDF-fil"
+
+#: ../data/bookletimposer.ui.h:16
+msgid "Number of pages in _height"
+msgstr ""
+
+#: ../data/bookletimposer.ui.h:17
+msgid "Copyright © 2008-2019 kjo@a4nancy.net.eu.org"
+msgstr "Ophavsret © 2008-2019 kjo@a4nancy.net.eu.org"
+
+#: ../data/bookletimposer.ui.h:18
+msgid "Convert PDF documents between diffrents page layouts"
+msgstr "Konverter PDF-dokumenter mellem forskellige sidelayouts"
+
+#: ../data/bookletimposer.ui.h:19
+msgid ""
+"\n"
+"PyPdfConv - Utility to convert PDF files between diffrents page layouts\n"
+"Copyright (C) 2008-2019 Kjö Hansi Glaz <kjo&a4nancy.net.eu.org>\n"
+"\n"
+"This program is  free software; you can redistribute  it and/or modify\n"
+"it under the  terms of the GNU General Public  License as published by\n"
+"the Free Software Foundation; either  version 3 of the License, or (at\n"
+"your option) any later version.\n"
+"\n"
+"This program  is distributed in the  hope that it will  be useful, but\n"
+"WITHOUT   ANY  WARRANTY;   without  even   the  implied   warranty  of\n"
+"MERCHANTABILITY  or FITNESS  FOR A  PARTICULAR PURPOSE.   See  the GNU\n"
+"General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License\n"
+"along with this program.  If not, see <http://www.gnu.org/licenses/>.\n"
+msgstr ""
+"\n"
+"PyPdfConv - Redskab til at konvertere PDF-filer mellem forskellige "
+"sidelayouts\n"
+"Ophavsret (C) 2008-2019 Kjö Hansi Glaz <kjo&a4nancy.net.eu.org>\n"
+"\n"
+"Dette program er fri software: du kan videredistribuere det og/eller\n"
+"modificere det under vilkårene i GNU General Public License som udgivet af\n"
+"Free Software Foundation, enten version 3 af Licensen, eller\n"
+"(efter eget valg) enhver senere version.\n"
+"\n"
+"Dette program er distribueret i håbet om at det vil være nyttigt,\n"
+"men UDEN NOGEN GARANTI; uden selv den underforstået garanti vedrørende\n"
+"SALGBARHED eller EGNETHED TIL ET BESTEMT FORMÅL. Se\n"
+"GNU General Public License for flere detaljer.\n"
+"\n"
+"Du skulle have modtaget en kopi af GNU General Public License\n"
+"sammen med dette program. Hvis ikke, se <http://www.gnu.org/licenses/>.\n"
+
+#~ msgid "La_yout"
+#~ msgstr "La_yout"
diff -Nru bookletimposer-0.3~beta1/po/de.po bookletimposer-0.3+ds/po/de.po
--- bookletimposer-0.3~beta1/po/de.po	2019-09-29 21:18:53.000000000 +0000
+++ bookletimposer-0.3+ds/po/de.po	2019-12-13 12:18:35.000000000 +0000
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-17 19:56+0100\n"
-"PO-Revision-Date: 2014-10-12 22:02-0000\n"
+"POT-Creation-Date: 2019-12-13 13:10+0100\n"
+"PO-Revision-Date: 2019-12-13 13:16+0100\n"
 "Last-Translator: Dominik Pilatzki <tor@dominik-pilatzki.de>\n"
 "Language-Team: German\n"
 "Language: de\n"
@@ -16,140 +16,208 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 2.2.4\n"
 
-#: ../bin/bookletimposer:64
+#: ../bin/bookletimposer:65
 msgid "output PDF file"
 msgstr "Ausgabe PDF-Datei"
 
-#: ../bin/bookletimposer:68
+#: ../bin/bookletimposer:70
 msgid ""
 "automatic conversion (don't show the user interface). At least input file "
-"must be defined"
+"must be defined."
 msgstr ""
 "Automatische Konvertierung (zeigt die Nutzeroberfläche nicht an). Zumindest "
-"eine Eingabedatei muss angegeben werden"
+"eine Eingabedatei muss angegeben werden."
 
-#: ../bin/bookletimposer:72
+#: ../bin/bookletimposer:76
 msgid "shows the user interface (default)."
 msgstr "Zeigt die Nutzeroberfläche (Standardeinstellung)"
 
-#: ../bin/bookletimposer:76
+#: ../bin/bookletimposer:82
 msgid "makes a booklet"
 msgstr "Erstellt ein Heft"
 
-#: ../bin/bookletimposer:80
+#: ../bin/bookletimposer:88
 msgid "convert a booklet to single pages"
 msgstr "Konvertiert ein Heft in einzelne Seiten"
 
-#: ../bin/bookletimposer:84
+#: ../bin/bookletimposer:94
 msgid "don't do any reorganisation (will only scale and assemble pages)"
 msgstr ""
 "Führe keine Reorganisation durch (wird Seiten nur skalieren und "
 "zusammenstellen)"
 
-#: ../bin/bookletimposer:88 ../data/bookletimposer.ui.h:21
+#: ../bin/bookletimposer:100
 msgid "Copy the same group of input pages on one output page"
 msgstr "Kopiere die gleiche Gruppe von Eingabedateien auf eine Ausgabeseite"
 
-#: ../bin/bookletimposer:92
+#: ../bin/bookletimposer:105
 msgid "number of pages per sheet, in the format HORIZONTALxVERTICAL, e.g. 2x1"
 msgstr "Anzahl der Seiten pro Blatt im Format HORIZONTALxVERTIKAL, z.B. 2x1"
 
-#: ../bin/bookletimposer:96
+#: ../bin/bookletimposer:111
 msgid "output page format, e.g. A4 or A3R"
 msgstr "Ausgabeseitenformat, z.B. A4 oder A3R"
 
-#: ../bin/bookletimposer:100
+#: ../bin/bookletimposer:116
 msgid "do not overwrite output file if it exists"
 msgstr "Überschreibe die Ausgabedatei nicht, falls diese existieren sollte"
 
-#: ../bin/bookletimposer:127
+#: ../bin/bookletimposer:144
 msgid "ERROR: In automatic mode, you must provide a file to process."
 msgstr ""
 "FEHLER: Im automatischen Modus muss eine Eingabedatei zum Verarbeiten "
 "angegeben werden."
 
-#: ../bin/bookletimposer:136
+#: ../bin/bookletimposer:157
 #, c-format
 msgid "%i%%: %s"
 msgstr "%i%% : %s"
 
-#: ../bin/bookletimposer:147
-msgid ""
-"WARNING: psyco not found. You can speed Bookletimposer up by installing it."
+#: ../lib/pdfimposer.py:80
+msgid "short-edge flip"
+msgstr ""
+
+#: ../lib/pdfimposer.py:82
+msgid "long-edge flip"
 msgstr ""
-"WARNUNG: Konnte psyco nicht finden. Sie können Bookletimposer durch eine "
-"Installation dessen verschnellern."
 
-#: ../lib/pdfimposer.py:102
+#: ../lib/pdfimposer.py:110
 #, python-format
 msgid "The layout %s is incompatible with the input page orientation"
-msgstr "Das Layout %s ist inkompatibel mit der Ausrichtung der Eingabeseite."
+msgstr "Das Layout %s ist inkompatibel mit der Ausrichtung der Eingabeseite"
 
-#: ../lib/pdfimposer.py:115
+#: ../lib/pdfimposer.py:124
 #, python-format
 msgid "The page format \"%s\" is unknown"
 msgstr "Das Seitenformat \"%s\" ist unbekannt"
 
-#: ../lib/pdfimposer.py:125
+#: ../lib/pdfimposer.py:134
 msgid "User interruption"
 msgstr "Benutzerunterbrechung"
 
-#: ../lib/pdfimposer.py:733
+#: ../lib/pdfimposer.py:806
 msgid "writing converted file"
 msgstr "Schreibe konvertierte Datei"
 
-#: ../lib/pdfimposer.py:735
+#: ../lib/pdfimposer.py:808
 msgid "done"
 msgstr "Erledigt"
 
-#: ../lib/pdfimposer.py:744
+#: ../lib/pdfimposer.py:827
 #, python-format
 msgid "creating page %i"
 msgstr "Erstelle Seite %i"
 
-#: ../lib/pdfimposer.py:788
+#: ../lib/pdfimposer.py:875
 #, python-format
 msgid "extracting page %i"
 msgstr "Extrahiere Seite %i"
 
-#: ../lib/bookletimposer/gui.py:231
+#: ../lib/bookletimposer/gui.py:259
 msgid "Choose file to save"
 msgstr "Datei zum Speichern auswählen"
 
-#: ../lib/bookletimposer/gui.py:260
+#: ../lib/bookletimposer/gui.py:291
 #, python-format
 msgid "Unable to display help: %s"
 msgstr "Konnte Hilfe nicht anzeigen: %s"
 
-#: ../lib/bookletimposer/gui.py:271
+#: ../lib/bookletimposer/gui.py:303
 msgid "Cancel triggered, please wait..."
 msgstr "Abbruch ausgelöst, bitte warten..."
 
-#: ../lib/bookletimposer/gui.py:288
+#: ../lib/bookletimposer/gui.py:321
 msgid "Conversion failed"
 msgstr "Konvertierung fehlgeschlagen"
 
-#: ../lib/bookletimposer/gui.py:300
+#: ../lib/bookletimposer/gui.py:348
 #, python-format
 msgid "A file named %s already exist."
 msgstr "Eine Datei mit dem Namen %s existiert bereits."
 
-#: ../lib/bookletimposer/gui.py:301
+#: ../lib/bookletimposer/gui.py:349
 msgid "Do you want to replace it?"
 msgstr "Wollen Sie diese ersetzen?"
 
-#: ../lib/bookletimposer/gui.py:353
-#, python-format
-msgid "Converting %s"
-msgstr "Konvertiere %s"
+#: ../lib/bookletimposer/gui.py:364
+#, fuzzy
+#| msgid "Conversion failed"
+msgid "Conversion cancelled"
+msgstr "Konvertierung fehlgeschlagen"
 
 #: ../data/bookletimposer.ui.h:1
+msgid "Output _paper format"
+msgstr "Ausgabe_papierformat"
+
+#: ../data/bookletimposer.ui.h:2
+msgid "Two-sided _flip"
+msgstr ""
+
+#: ../data/bookletimposer.ui.h:3
+msgid "Number of pages in _width"
+msgstr ""
+
+#: ../data/bookletimposer.ui.h:4
+msgid "_Output file"
+msgstr "_Ausgabedatei"
+
+#: ../data/bookletimposer.ui.h:5
+msgid "(None)"
+msgstr "(Keine)"
+
+#: ../data/bookletimposer.ui.h:6
+msgid "_Copy the same group of input pages on one output page"
+msgstr "_Kopiere die gleiche Gruppe von Eingabedateien auf eine Ausgabeseite"
+
+#: ../data/bookletimposer.ui.h:7
+msgid ""
+"Produce a _booklet\n"
+"out of a linear document"
+msgstr "Ein _Booklet aus einem linearem Dokument erstellen"
+
+#: ../data/bookletimposer.ui.h:9
+msgid ""
+"Produce a _linear document \n"
+"out of a booklet"
+msgstr "Ein _lineares Dokument aus einem Booklet erstellen"
+
+#: ../data/bookletimposer.ui.h:11
+msgid ""
+"Put _multiple input pages \n"
+"on one output sheet"
+msgstr "_Mehrere Eingabeseiten auf eine Ausgabeseite bringen"
+
+#: ../data/bookletimposer.ui.h:13
+msgid "Conversion type"
+msgstr "Art der Konvertierung"
+
+#: ../data/bookletimposer.ui.h:14
+msgid "_Input file"
+msgstr "_Eingabedatei"
+
+#: ../data/bookletimposer.ui.h:15
+msgid "Open input PDF file"
+msgstr "Eingabedatei öffnen"
+
+#: ../data/bookletimposer.ui.h:16
+msgid "Number of pages in _height"
+msgstr ""
+
+#: ../data/bookletimposer.ui.h:17
+msgid "Copyright © 2008-2019 kjo@a4nancy.net.eu.org"
+msgstr "Copyright © 2008-2019 kjo@a4nancy.net.eu.org"
+
+#: ../data/bookletimposer.ui.h:18
+msgid "Convert PDF documents between diffrents page layouts"
+msgstr "Konvertiere PDF Dateien zwischen verschiedenen Seitenformaten"
+
+#: ../data/bookletimposer.ui.h:19
 msgid ""
 "\n"
 "PyPdfConv - Utility to convert PDF files between diffrents page layouts\n"
-"Copyright (C) 2008-2012 Kjö Hansi Glaz <kjo&a4nancy.net.eu.org>\n"
+"Copyright (C) 2008-2019 Kjö Hansi Glaz <kjo&a4nancy.net.eu.org>\n"
 "\n"
 "This program is  free software; you can redistribute  it and/or modify\n"
 "it under the  terms of the GNU General Public  License as published by\n"
@@ -167,7 +235,7 @@
 "\n"
 "PyPdfConv - Werkzeug zum Konvertieren von PDF-Dateien zwischen verschiedenen "
 "Seitenformaten\n"
-"Copyright (C) 2008-2012 Kjö Hansi Glaz <kjo@a4nancy.net.eu.org>\n"
+"Copyright (C) 2008-2019 Kjö Hansi Glaz <kjo@a4nancy.net.eu.org>\n"
 "\n"
 "Dieses Programm ist freie Software. Sie können es unter den Bedingungen der "
 "GNU General Public License, wie von der Free Software Foundation "
@@ -183,61 +251,24 @@
 "Programm erhalten haben. Falls nicht, konsultieren sie bitte: <http://www."
 "gnu.org/licenses/>.\n"
 
-#: ../data/bookletimposer.ui.h:18
-msgid "(None)"
-msgstr "(Keine)"
-
-#: ../data/bookletimposer.ui.h:19
-msgid "<b>Conversion type</b>"
-msgstr "<b>Art der Konvertierung</b>"
+#~ msgid ""
+#~ "WARNING: psyco not found. You can speed Bookletimposer up by installing "
+#~ "it."
+#~ msgstr ""
+#~ "WARNUNG: Konnte psyco nicht finden. Sie können Bookletimposer durch eine "
+#~ "Installation dessen verschnellern."
 
-#: ../data/bookletimposer.ui.h:20
-msgid "Convert PDF documents between diffrents page layouts"
-msgstr "Konvertiere PDF Dateien zwischen verschiedenen Seitenformaten"
+#~ msgid "Converting %s"
+#~ msgstr "Konvertiere %s"
 
-#: ../data/bookletimposer.ui.h:22
-msgid "Copyright © 2008-2012 kjo@a4nancy.net.eu.org"
-msgstr "Copyright © 2008-2012 kjo@a4nancy.net.eu.org"
-
-#: ../data/bookletimposer.ui.h:23
-msgid "Input file"
-msgstr "Eingabedatei"
-
-#: ../data/bookletimposer.ui.h:24
-msgid "Layout"
-msgstr "Layout"
-
-#: ../data/bookletimposer.ui.h:25
-msgid "No conversion"
-msgstr "Keine Konvertierung"
-
-#: ../data/bookletimposer.ui.h:26
-msgid "No step"
-msgstr "Kein Schritt"
+#~ msgid "Layout"
+#~ msgstr "Layout"
 
-#: ../data/bookletimposer.ui.h:27
-msgid "Open input PDF file"
-msgstr "Eingabedatei öffnen"
+#~ msgid "No conversion"
+#~ msgstr "Keine Konvertierung"
 
-#: ../data/bookletimposer.ui.h:28
-msgid "Output file"
-msgstr "Ausgabedatei"
-
-#: ../data/bookletimposer.ui.h:29
-msgid "Output paper format"
-msgstr "Ausgabepapierformat"
-
-#: ../data/bookletimposer.ui.h:30
-msgid "Produce a booklet out of a linear document"
-msgstr "Ein Booklet aus einem linearem Dokument erstellen"
-
-#: ../data/bookletimposer.ui.h:31
-msgid "Produce a linear document out of a booklet"
-msgstr "Ein lineares Dokument aus einem Booklet erstellen."
-
-#: ../data/bookletimposer.ui.h:32
-msgid "Put multiple input pages on one output page"
-msgstr "Mehrere Eingabeseiten auf eine Ausgabeseite bringen."
+#~ msgid "No step"
+#~ msgstr "Kein Schritt"
 
 #~ msgid "INFO: psyco imported. Bookletimposer will run faster."
 #~ msgstr ""
diff -Nru bookletimposer-0.3~beta1/po/fr.po bookletimposer-0.3+ds/po/fr.po
--- bookletimposer-0.3~beta1/po/fr.po	2019-09-29 21:18:53.000000000 +0000
+++ bookletimposer-0.3+ds/po/fr.po	2019-12-13 12:18:35.000000000 +0000
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-17 19:56+0100\n"
-"PO-Revision-Date: 2012-02-17 19:57+0100\n"
+"POT-Creation-Date: 2019-12-13 13:10+0100\n"
+"PO-Revision-Date: 2019-12-13 13:16+0100\n"
 "Last-Translator: \n"
 "Language-Team: French\n"
 "Language: fr\n"
@@ -16,131 +16,212 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Poedit-Language: French\n"
-"X-Poedit-Country: FRANCE\n"
+"X-Generator: Poedit 2.2.4\n"
 
-#: ../bin/bookletimposer:64
+#: ../bin/bookletimposer:65
 msgid "output PDF file"
 msgstr "fichier PDF de sortie"
 
-#: ../bin/bookletimposer:68
-msgid "automatic conversion (don't show the user interface). At least input file must be defined"
-msgstr "conversion automatique (ne pas afficher l'interface graphique). Au moins le fichier d'entrée doit être défini."
+#: ../bin/bookletimposer:70
+msgid ""
+"automatic conversion (don't show the user interface). At least input file "
+"must be defined."
+msgstr ""
+"conversion automatique (ne pas afficher l'interface graphique). Au moins le "
+"fichier d'entrée doit être défini."
 
-#: ../bin/bookletimposer:72
+#: ../bin/bookletimposer:76
 msgid "shows the user interface (default)."
 msgstr "afficher l'interface graphique (choix par défaut)"
 
-#: ../bin/bookletimposer:76
+#: ../bin/bookletimposer:82
 msgid "makes a booklet"
 msgstr "faire une brochure"
 
-#: ../bin/bookletimposer:80
+#: ../bin/bookletimposer:88
 msgid "convert a booklet to single pages"
 msgstr "convertir une brochure en pages simples"
 
-#: ../bin/bookletimposer:84
+#: ../bin/bookletimposer:94
 msgid "don't do any reorganisation (will only scale and assemble pages)"
-msgstr "ne pas effectuer de réorganisation (seulement redimentionner et assembler les pages)"
+msgstr ""
+"ne pas effectuer de réorganisation (seulement redimentionner et assembler "
+"les pages)"
 
-#: ../bin/bookletimposer:88
-#: ../data/bookletimposer.ui.h:21
+#: ../bin/bookletimposer:100
 msgid "Copy the same group of input pages on one output page"
 msgstr "Copier le même groupe de pages d'entrée sur une page de sortie"
 
-#: ../bin/bookletimposer:92
+#: ../bin/bookletimposer:105
 msgid "number of pages per sheet, in the format HORIZONTALxVERTICAL, e.g. 2x1"
-msgstr "disposition des pages sur la feuille, au format HORIZONTALxVERTICAL, par exemple 2x1"
+msgstr ""
+"disposition des pages sur la feuille, au format HORIZONTALxVERTICAL, par "
+"exemple 2x1"
 
-#: ../bin/bookletimposer:96
+#: ../bin/bookletimposer:111
 msgid "output page format, e.g. A4 or A3R"
 msgstr "format de papier de sortie, par exemple A4 ou A3R"
 
-#: ../bin/bookletimposer:100
+#: ../bin/bookletimposer:116
 msgid "do not overwrite output file if it exists"
 msgstr "ne pas remplacer le fichier de sortie si il existe"
 
-#: ../bin/bookletimposer:127
+#: ../bin/bookletimposer:144
 msgid "ERROR: In automatic mode, you must provide a file to process."
-msgstr "ERREUR : en mode automatique, vous devez spécifier un fichier à convertir."
+msgstr ""
+"ERREUR : en mode automatique, vous devez spécifier un fichier à convertir."
 
-#: ../bin/bookletimposer:136
+#: ../bin/bookletimposer:157
 #, c-format
 msgid "%i%%: %s"
 msgstr "%i%% : %s"
 
-#: ../bin/bookletimposer:147
-msgid "WARNING: psyco not found. You can speed Bookletimposer up by installing it."
-msgstr "AVERTISSEMENT: impossible de trouver psyco. Vous pouvez rendre Bookletimposer plus rapide en l'installant."
+#: ../lib/pdfimposer.py:80
+msgid "short-edge flip"
+msgstr "petit côté"
+
+#: ../lib/pdfimposer.py:82
+msgid "long-edge flip"
+msgstr "grand côté"
 
-#: ../lib/pdfimposer.py:102
+#: ../lib/pdfimposer.py:110
 #, python-format
 msgid "The layout %s is incompatible with the input page orientation"
-msgstr "La disposition %s est incompatible avec l'orientation des pages d'entrée"
+msgstr ""
+"La disposition %s est incompatible avec l'orientation des pages d'entrée"
 
-#: ../lib/pdfimposer.py:115
+#: ../lib/pdfimposer.py:124
 #, python-format
 msgid "The page format \"%s\" is unknown"
 msgstr "Le format de page « %s » est inconnu"
 
-#: ../lib/pdfimposer.py:125
+#: ../lib/pdfimposer.py:134
 msgid "User interruption"
 msgstr "Interruption par l'utilisateur"
 
-#: ../lib/pdfimposer.py:733
+#: ../lib/pdfimposer.py:806
 msgid "writing converted file"
 msgstr "écriture du fichier converti"
 
-#: ../lib/pdfimposer.py:735
+#: ../lib/pdfimposer.py:808
 msgid "done"
 msgstr "fait"
 
-#: ../lib/pdfimposer.py:744
+#: ../lib/pdfimposer.py:827
 #, python-format
 msgid "creating page %i"
 msgstr "création de la page %i"
 
-#: ../lib/pdfimposer.py:788
+#: ../lib/pdfimposer.py:875
 #, python-format
 msgid "extracting page %i"
 msgstr "extraction de la page %i"
 
-#: ../lib/bookletimposer/gui.py:231
+#: ../lib/bookletimposer/gui.py:259
 msgid "Choose file to save"
 msgstr "Choisir le fichier à enregistrer"
 
-#: ../lib/bookletimposer/gui.py:260
+#: ../lib/bookletimposer/gui.py:291
 #, python-format
 msgid "Unable to display help: %s"
 msgstr "Impossible d'afficher l'aide : %s"
 
-#: ../lib/bookletimposer/gui.py:271
+#: ../lib/bookletimposer/gui.py:303
 msgid "Cancel triggered, please wait..."
 msgstr "Annulation prise en compte, merci de patienter..."
 
-#: ../lib/bookletimposer/gui.py:288
+#: ../lib/bookletimposer/gui.py:321
 msgid "Conversion failed"
 msgstr "La conversion a échoué"
 
-#: ../lib/bookletimposer/gui.py:300
+#: ../lib/bookletimposer/gui.py:348
 #, python-format
 msgid "A file named %s already exist."
 msgstr "Un fichier nommé %s existe déjà."
 
-#: ../lib/bookletimposer/gui.py:301
+#: ../lib/bookletimposer/gui.py:349
 msgid "Do you want to replace it?"
 msgstr "Voulez-vous le remplacer ?"
 
-#: ../lib/bookletimposer/gui.py:353
-#, python-format
-msgid "Converting %s"
-msgstr "Conversion de %s"
+#: ../lib/bookletimposer/gui.py:364
+msgid "Conversion cancelled"
+msgstr "La conversion a été annulée"
 
 #: ../data/bookletimposer.ui.h:1
+msgid "Output _paper format"
+msgstr "Format de _papier de sortie"
+
+#: ../data/bookletimposer.ui.h:2
+msgid "Two-sided _flip"
+msgstr "Recto-verso"
+
+#: ../data/bookletimposer.ui.h:3
+msgid "Number of pages in _width"
+msgstr "Nombre de pages en _largeur"
+
+#: ../data/bookletimposer.ui.h:4
+msgid "_Output file"
+msgstr "Fichier de s_ortie"
+
+#: ../data/bookletimposer.ui.h:5
+msgid "(None)"
+msgstr "(Aucun)"
+
+#: ../data/bookletimposer.ui.h:6
+msgid "_Copy the same group of input pages on one output page"
+msgstr "_Copier le même groupe de pages d'entrée sur une page de sortie"
+
+#: ../data/bookletimposer.ui.h:7
+msgid ""
+"Produce a _booklet\n"
+"out of a linear document"
+msgstr ""
+"Créer une _brochure\n"
+"à partir d'un document linéaire"
+
+#: ../data/bookletimposer.ui.h:9
+msgid ""
+"Produce a _linear document \n"
+"out of a booklet"
+msgstr ""
+"Créer un document _linéaire \n"
+"à partir d'une brochure"
+
+#: ../data/bookletimposer.ui.h:11
+msgid ""
+"Put _multiple input pages \n"
+"on one output sheet"
+msgstr "Placer _plusieurs pages d'entrée sur une feuille de sortie"
+
+#: ../data/bookletimposer.ui.h:13
+msgid "Conversion type"
+msgstr "Type de conversion"
+
+#: ../data/bookletimposer.ui.h:14
+msgid "_Input file"
+msgstr "Fichier d'_entrée"
+
+#: ../data/bookletimposer.ui.h:15
+msgid "Open input PDF file"
+msgstr "Ouvrir le fichier PDF d'entrée"
+
+#: ../data/bookletimposer.ui.h:16
+msgid "Number of pages in _height"
+msgstr "Nombre de pages en _hauteur"
+
+#: ../data/bookletimposer.ui.h:17
+msgid "Copyright © 2008-2019 kjo@a4nancy.net.eu.org"
+msgstr "Copyright © 2008-2019 kjo@a4nancy.net.eu.org"
+
+#: ../data/bookletimposer.ui.h:18
+msgid "Convert PDF documents between diffrents page layouts"
+msgstr "Convertir des documents PDF entre différentes dispositions de pages"
+
+#: ../data/bookletimposer.ui.h:19
 msgid ""
 "\n"
 "PyPdfConv - Utility to convert PDF files between diffrents page layouts\n"
-"Copyright (C) 2008-2012 Kjö Hansi Glaz <kjo&a4nancy.net.eu.org>\n"
+"Copyright (C) 2008-2019 Kjö Hansi Glaz <kjo&a4nancy.net.eu.org>\n"
 "\n"
 "This program is  free software; you can redistribute  it and/or modify\n"
 "it under the  terms of the GNU General Public  License as published by\n"
@@ -156,12 +237,16 @@
 "along with this program.  If not, see <http://www.gnu.org/licenses/>.\n"
 msgstr ""
 "\n"
-"PyPdfConv - Utilitaire pour convertir des fichiers PDF entre différentes dispositions de page\n"
-"Copyright (C) 2008-2012 Kjö Hansi Glaz <kjo@a4nancy.net.eu.org>\n"
+"PyPdfConv - Utilitaire pour convertir des fichiers PDF entre différentes "
+"dispositions de page\n"
+"Copyright (C) 2008-2019 Kjö Hansi Glaz <kjo@a4nancy.net.eu.org>\n"
 "\n"
-"Ce programme est un logiciel libre ; vous pouvez le redistribuer ou le modifier\n"
-"suivant les termes de la GNU General Public License telle que publiée par la\n"
-"Free Software Foundation , soit la version 3 de la Licence, soit (à votre gré)\n"
+"Ce programme est un logiciel libre ; vous pouvez le redistribuer ou le "
+"modifier\n"
+"suivant les termes de la GNU General Public License telle que publiée par "
+"la\n"
+"Free Software Foundation , soit la version 3 de la Licence, soit (à votre "
+"gré)\n"
 "toute version ultérieure.\n"
 "\n"
 "Ce programme est distribué dans l’espoir qu’il sera utile, mais SANS AUCUNE\n"
@@ -170,63 +255,27 @@
 "General Public License pour plus de détails.\n"
 "\n"
 "Vous devriez avoir reçu une copie de la GNU General Public License avec ce\n"
-"programme ; si ce n’est pas le cas, consultez : <http://www.gnu.org/licenses/>.\n"
-
-#: ../data/bookletimposer.ui.h:18
-msgid "(None)"
-msgstr "(Aucun)"
+"programme ; si ce n’est pas le cas, consultez : <http://www.gnu.org/licenses/"
+">.\n"
 
-#: ../data/bookletimposer.ui.h:19
-msgid "<b>Conversion type</b>"
-msgstr "<b>Type de conversion</b>"
+#~ msgid ""
+#~ "WARNING: psyco not found. You can speed Bookletimposer up by installing "
+#~ "it."
+#~ msgstr ""
+#~ "AVERTISSEMENT: impossible de trouver psyco. Vous pouvez rendre "
+#~ "Bookletimposer plus rapide en l'installant."
 
-#: ../data/bookletimposer.ui.h:20
-msgid "Convert PDF documents between diffrents page layouts"
-msgstr "Convertir des documents PDF entre différentes dispositions de pages"
+#~ msgid "Converting %s"
+#~ msgstr "Conversion de %s"
 
-#: ../data/bookletimposer.ui.h:22
-msgid "Copyright © 2008-2012 kjo@a4nancy.net.eu.org"
-msgstr "Copyright © 2008-2012 kjo@a4nancy.net.eu.org"
-
-#: ../data/bookletimposer.ui.h:23
-msgid "Input file"
-msgstr "Fichier d'entrée"
-
-#: ../data/bookletimposer.ui.h:24
-msgid "Layout"
-msgstr "Disposition"
-
-#: ../data/bookletimposer.ui.h:25
-msgid "No conversion"
-msgstr "Pas de conversion"
-
-#: ../data/bookletimposer.ui.h:26
-msgid "No step"
-msgstr "Pas d'étape"
+#~ msgid "Layout"
+#~ msgstr "Disposition"
 
-#: ../data/bookletimposer.ui.h:27
-msgid "Open input PDF file"
-msgstr "Ouvrir le fichier PDF d'entrée"
+#~ msgid "No conversion"
+#~ msgstr "Pas de conversion"
 
-#: ../data/bookletimposer.ui.h:28
-msgid "Output file"
-msgstr "Fichier de sortie"
-
-#: ../data/bookletimposer.ui.h:29
-msgid "Output paper format"
-msgstr "Format de papier de sortie"
-
-#: ../data/bookletimposer.ui.h:30
-msgid "Produce a booklet out of a linear document"
-msgstr "Créer une brochure à partir d'un document linéaire"
-
-#: ../data/bookletimposer.ui.h:31
-msgid "Produce a linear document out of a booklet"
-msgstr "Créer un document linéaire à partir d'une brochure"
-
-#: ../data/bookletimposer.ui.h:32
-msgid "Put multiple input pages on one output page"
-msgstr "Placer plusieurs pages d'entrée sur une feuille de sortie"
+#~ msgid "No step"
+#~ msgstr "Pas d'étape"
 
 #~ msgid "INFO: psyco imported. Bookletimposer will run faster."
 #~ msgstr ""
diff -Nru bookletimposer-0.3~beta1/po/hu.po bookletimposer-0.3+ds/po/hu.po
--- bookletimposer-0.3~beta1/po/hu.po	2019-09-29 21:18:53.000000000 +0000
+++ bookletimposer-0.3+ds/po/hu.po	2019-12-13 12:18:35.000000000 +0000
@@ -7,197 +7,165 @@
 msgstr ""
 "Project-Id-Version: bookletimposer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-16 12:50+0200\n"
-"PO-Revision-Date: 2019-06-26 14:31+0200\n"
+"POT-Creation-Date: 2019-12-13 13:10+0100\n"
+"PO-Revision-Date: 2019-12-13 13:16+0100\n"
 "Last-Translator: Gyuris Gellért <gellert.gyuris@ujevangelizacio.hu>\n"
 "Language-Team: hungarian <>\n"
 "Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Gtranslator 3.32.0\n"
+"X-Generator: Poedit 2.2.4\n"
 
-#: ../bin/bookletimposer:64
+#: ../bin/bookletimposer:65
 msgid "output PDF file"
 msgstr "kimeneti PDF-fájl"
 
-#: ../bin/bookletimposer:68
+#: ../bin/bookletimposer:70
 msgid ""
 "automatic conversion (don't show the user interface). At least input file "
-"must be defined"
+"must be defined."
 msgstr ""
 "automatikus átalakítás (felhasználói felület alkalmazása nélkül), melyhez "
-"legalább a bemeneti állományt meg kell határozni"
+"legalább a bemeneti állományt meg kell határozni."
 
-#: ../bin/bookletimposer:72
+#: ../bin/bookletimposer:76
 msgid "shows the user interface (default)."
 msgstr "felhasználói felület megjelenítése (alapértelmezett)"
 
-#: ../bin/bookletimposer:76
+#: ../bin/bookletimposer:82
 msgid "makes a booklet"
 msgstr "füzet készítése"
 
-#: ../bin/bookletimposer:80
+#: ../bin/bookletimposer:88
 msgid "convert a booklet to single pages"
 msgstr "füzet átalakítása önálló oldalakká"
 
-#: ../bin/bookletimposer:84
+#: ../bin/bookletimposer:94
 msgid "don't do any reorganisation (will only scale and assemble pages)"
 msgstr ""
 "minden átszervezés mellőzése (csak átméretezés és oldalak összeállítása)"
 
-#: ../bin/bookletimposer:88
+#: ../bin/bookletimposer:100
 msgid "Copy the same group of input pages on one output page"
 msgstr "bemeneti oldalak ugyanazon csoportjának másolása egy kimeneti oldalra"
 
-#: ../bin/bookletimposer:92
+#: ../bin/bookletimposer:105
 msgid "number of pages per sheet, in the format HORIZONTALxVERTICAL, e.g. 2x1"
 msgstr "oldalak laponkénti száma, VÍZSZINTESxFÜGGŐLEGES formátumban, pl. 2×1"
 
-#: ../bin/bookletimposer:96
+#: ../bin/bookletimposer:111
 msgid "output page format, e.g. A4 or A3R"
 msgstr "kimeneti oldal formátuma, pl. A4 vagy A3R"
 
-#: ../bin/bookletimposer:100
+#: ../bin/bookletimposer:116
 msgid "do not overwrite output file if it exists"
 msgstr "kimeneti fájl felülírásának tiltása, ha már létezik"
 
-#: ../bin/bookletimposer:127
+#: ../bin/bookletimposer:144
 msgid "ERROR: In automatic mode, you must provide a file to process."
 msgstr "HIBA: automatikus módban meg kell adni egy feldolgozandó fájlt."
 
-#: ../bin/bookletimposer:136
+#: ../bin/bookletimposer:157
 #, c-format
 msgid "%i%%: %s"
 msgstr "%i%%: %s"
 
-#: ../lib/pdfimposer.py:102
+#: ../lib/pdfimposer.py:80
+msgid "short-edge flip"
+msgstr ""
+
+#: ../lib/pdfimposer.py:82
+msgid "long-edge flip"
+msgstr ""
+
+#: ../lib/pdfimposer.py:110
 #, python-format
 msgid "The layout %s is incompatible with the input page orientation"
 msgstr "Ez az elrendezés nem kompatibilis a bemeneti lap tájolásával: %s"
 
-#: ../lib/pdfimposer.py:115
+#: ../lib/pdfimposer.py:124
 #, python-format
 msgid "The page format \"%s\" is unknown"
 msgstr "Az oldalformátum nem értelmezhető: %s"
 
-#: ../lib/pdfimposer.py:125
+#: ../lib/pdfimposer.py:134
 msgid "User interruption"
 msgstr "Felhasználói megszakítás"
 
-#: ../lib/pdfimposer.py:749
+#: ../lib/pdfimposer.py:806
 msgid "writing converted file"
 msgstr "átalakított fájl írása"
 
-#: ../lib/pdfimposer.py:751
+#: ../lib/pdfimposer.py:808
 msgid "done"
 msgstr "kész"
 
-#: ../lib/pdfimposer.py:769
+#: ../lib/pdfimposer.py:827
 #, python-format
 msgid "creating page %i"
 msgstr "oldal létrehozása: %i"
 
-#: ../lib/pdfimposer.py:812
+#: ../lib/pdfimposer.py:875
 #, python-format
 msgid "extracting page %i"
 msgstr "oldal kicsomagolása: %i"
 
-#: ../lib/bookletimposer/gui.py:231
+#: ../lib/bookletimposer/gui.py:259
 msgid "Choose file to save"
 msgstr "Mentési fájl kijelölése"
 
-#: ../lib/bookletimposer/gui.py:260
+#: ../lib/bookletimposer/gui.py:291
 #, python-format
 msgid "Unable to display help: %s"
 msgstr "A súgó nem jeleníthető meg: %s"
 
-#: ../lib/bookletimposer/gui.py:271
+#: ../lib/bookletimposer/gui.py:303
 msgid "Cancel triggered, please wait..."
 msgstr "Megszakítás, türelem…"
 
-#: ../lib/bookletimposer/gui.py:288
+#: ../lib/bookletimposer/gui.py:321
 msgid "Conversion failed"
 msgstr "Az átalakítás sikertelen"
 
-#: ../lib/bookletimposer/gui.py:314
+#: ../lib/bookletimposer/gui.py:348
 #, python-format
 msgid "A file named %s already exist."
 msgstr "A fájl már létezik: %s."
 
-#: ../lib/bookletimposer/gui.py:315
+#: ../lib/bookletimposer/gui.py:349
 msgid "Do you want to replace it?"
 msgstr "Felülírható?"
 
-#: ../lib/bookletimposer/gui.py:329
+#: ../lib/bookletimposer/gui.py:364
 msgid "Conversion cancelled"
 msgstr "Átalakítás megszakítva"
 
 #: ../data/bookletimposer.ui.h:1
-msgid "Copyright © 2008-2012 kjo@a4nancy.net.eu.org"
-msgstr "Szerzői jogok © 2008-2012 kjo@a4nancy.net.eu.org"
+msgid "Output _paper format"
+msgstr "Kimeneti _lapformátum"
 
 #: ../data/bookletimposer.ui.h:2
-msgid "Convert PDF documents between diffrents page layouts"
-msgstr "PDF-dokumentumok átalakítása többféle oldalrendezés között"
+msgid "Two-sided _flip"
+msgstr ""
 
 #: ../data/bookletimposer.ui.h:3
-msgid ""
-"\n"
-"PyPdfConv - Utility to convert PDF files between diffrents page layouts\n"
-"Copyright (C) 2008-2012 Kjö Hansi Glaz <kjo&a4nancy.net.eu.org>\n"
-"\n"
-"This program is  free software; you can redistribute  it and/or modify\n"
-"it under the  terms of the GNU General Public  License as published by\n"
-"the Free Software Foundation; either  version 3 of the License, or (at\n"
-"your option) any later version.\n"
-"\n"
-"This program  is distributed in the  hope that it will  be useful, but\n"
-"WITHOUT   ANY  WARRANTY;   without  even   the  implied   warranty  of\n"
-"MERCHANTABILITY  or FITNESS  FOR A  PARTICULAR PURPOSE.   See  the GNU\n"
-"General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program.  If not, see <http://www.gnu.org/licenses/>.\n"
+msgid "Number of pages in _width"
 msgstr ""
-"\n"
-"PyPdfConv – Eszköz PDF-fájlok több oldalelrendezés közötti konvertálásához.\n"
-"Szerzői jogok (C) 2008–2012 Kjö Hansi Glaz <kjo&a4nancy.net.eu.org>\n"
-"\n"
-"Ez egy szabad szoftver; terjeszthető, illetve módosítható a GNU Általános "
-"Nyilvános Licencben leírtak szerint ‒ 3., vagy bármely szabadon választható "
-"következő verzió ‒, melyet a Szabad Szoftver Alapítvány ad ki.\n"
-"\n"
-"Ez a program abban a reményben kerül közreadásra, hogy hasznos lesz, de "
-"minden egyéb GARANCIA NÉLKÜL, az eladhatóságra vagy valamely célra való "
-"alkalmazhatóságra való származtatott garanciát is beleértve. A további "
-"részleteket lásd a GNU Általános Nyilvános Licencben.\n"
-"\n"
-"A programmal együtt meg kellett volna kapnia a GNU Általános Nyilvános "
-"Licenc másolatát. Ha nem, ennek elérhetősége: <http://www.gnu.org/licenses/"
-">.\n"
 
-#: ../data/bookletimposer.ui.h:20
-msgid "Output _paper format"
-msgstr "Kimeneti _lapformátum"
-
-#: ../data/bookletimposer.ui.h:21
-msgid "La_yout"
-msgstr "_Elrendezés"
-
-#: ../data/bookletimposer.ui.h:22
+#: ../data/bookletimposer.ui.h:4
 msgid "_Output file"
 msgstr "_Kimeneti fájl"
 
-#: ../data/bookletimposer.ui.h:23
+#: ../data/bookletimposer.ui.h:5
 msgid "(None)"
 msgstr "(Nincs)"
 
-#: ../data/bookletimposer.ui.h:24
+#: ../data/bookletimposer.ui.h:6
 msgid "_Copy the same group of input pages on one output page"
 msgstr "Bemeneti oldalak _ugyanazon csoportjának másolása egy kimeneti oldalra"
 
-#: ../data/bookletimposer.ui.h:25
+#: ../data/bookletimposer.ui.h:7
 msgid ""
 "Produce a _booklet\n"
 "out of a linear document"
@@ -205,7 +173,7 @@
 "_Füzet létrehozása \n"
 "egy folyamatos dokumentumból"
 
-#: ../data/bookletimposer.ui.h:27
+#: ../data/bookletimposer.ui.h:9
 msgid ""
 "Produce a _linear document \n"
 "out of a booklet"
@@ -213,7 +181,7 @@
 "F_olyamatos dokumentum \n"
 "létrehozása egy füzetből"
 
-#: ../data/bookletimposer.ui.h:29
+#: ../data/bookletimposer.ui.h:11
 msgid ""
 "Put _multiple input pages \n"
 "on one output sheet"
@@ -221,14 +189,67 @@
 "_Több bemeneti oldal \n"
 "elhelyezése egyetlen lapon"
 
-#: ../data/bookletimposer.ui.h:31
+#: ../data/bookletimposer.ui.h:13
 msgid "Conversion type"
 msgstr "Átalakítás típusa"
 
-#: ../data/bookletimposer.ui.h:32
+#: ../data/bookletimposer.ui.h:14
 msgid "_Input file"
 msgstr "_Bemeneti fájl"
 
-#: ../data/bookletimposer.ui.h:33
+#: ../data/bookletimposer.ui.h:15
 msgid "Open input PDF file"
 msgstr "Bemeneti fájl megnyitása"
+
+#: ../data/bookletimposer.ui.h:16
+msgid "Number of pages in _height"
+msgstr ""
+
+#: ../data/bookletimposer.ui.h:17
+msgid "Copyright © 2008-2019 kjo@a4nancy.net.eu.org"
+msgstr ""
+"Szerzői jogok © 2008-2019\n"
+" kjo@a4nancy.net.eu.org"
+
+#: ../data/bookletimposer.ui.h:18
+msgid "Convert PDF documents between diffrents page layouts"
+msgstr "PDF-dokumentumok átalakítása többféle oldalrendezés között"
+
+#: ../data/bookletimposer.ui.h:19
+msgid ""
+"\n"
+"PyPdfConv - Utility to convert PDF files between diffrents page layouts\n"
+"Copyright (C) 2008-2019 Kjö Hansi Glaz <kjo&a4nancy.net.eu.org>\n"
+"\n"
+"This program is  free software; you can redistribute  it and/or modify\n"
+"it under the  terms of the GNU General Public  License as published by\n"
+"the Free Software Foundation; either  version 3 of the License, or (at\n"
+"your option) any later version.\n"
+"\n"
+"This program  is distributed in the  hope that it will  be useful, but\n"
+"WITHOUT   ANY  WARRANTY;   without  even   the  implied   warranty  of\n"
+"MERCHANTABILITY  or FITNESS  FOR A  PARTICULAR PURPOSE.   See  the GNU\n"
+"General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License\n"
+"along with this program.  If not, see <http://www.gnu.org/licenses/>.\n"
+msgstr ""
+"\n"
+"PyPdfConv – Eszköz PDF-fájlok több oldalelrendezés közötti konvertálásához.\n"
+"Szerzői jogok (C) 2008–2019 Kjö Hansi Glaz <kjo&a4nancy.net.eu.org>\n"
+"\n"
+"Ez egy szabad szoftver; terjeszthető, illetve módosítható a GNU Általános "
+"Nyilvános Licencben leírtak szerint ‒ 3., vagy bármely szabadon választható "
+"következő verzió ‒, melyet a Szabad Szoftver Alapítvány ad ki.\n"
+"\n"
+"Ez a program abban a reményben kerül közreadásra, hogy hasznos lesz, de "
+"minden egyéb GARANCIA NÉLKÜL, az eladhatóságra vagy valamely célra való "
+"alkalmazhatóságra való származtatott garanciát is beleértve. A további "
+"részleteket lásd a GNU Általános Nyilvános Licencben.\n"
+"\n"
+"A programmal együtt meg kellett volna kapnia a GNU Általános Nyilvános "
+"Licenc másolatát. Ha nem, ennek elérhetősége: <http://www.gnu.org/licenses/"
+">.\n"
+
+#~ msgid "La_yout"
+#~ msgstr "_Elrendezés"
diff -Nru bookletimposer-0.3~beta1/README.md bookletimposer-0.3+ds/README.md
--- bookletimposer-0.3~beta1/README.md	2019-09-29 21:18:53.000000000 +0000
+++ bookletimposer-0.3+ds/README.md	2019-12-13 12:18:35.000000000 +0000
@@ -31,7 +31,7 @@
 =================
 
 BookletImposer should be quite stable. Thanks to report bugs on
-<https://git.codecoop.org/kjo/bookletimposer/issues>!
+kjo@a4nancy.net.eu.org.
 
 Dependencies
 ============
@@ -84,7 +84,7 @@
 BookletImposer usage
 ====================
 
-BookletImposer can be launched from the Office section of the Application menu,
+BookletImposer can be launched from the Application view,
 or with te command:
 
     $ bookletimposer
diff -Nru bookletimposer-0.3~beta1/scripts/debug_run.py bookletimposer-0.3+ds/scripts/debug_run.py
--- bookletimposer-0.3~beta1/scripts/debug_run.py	1970-01-01 00:00:00.000000000 +0000
+++ bookletimposer-0.3+ds/scripts/debug_run.py	2019-12-13 12:18:35.000000000 +0000
@@ -0,0 +1,14 @@
+#!/usr/bin/python3
+
+# XXX gruge de dev
+
+import sys
+
+sys.path = ["../pyPdf"] + sys.path
+print "DEBUG added custom pyPdf dir in path, which is now ", sys.path
+
+sys.path = ["src/bookletbinder/"] + sys.path
+
+import bookletbinder
+
+bookletbinder.main()
diff -Nru bookletimposer-0.3~beta1/scripts/gensite.sh bookletimposer-0.3+ds/scripts/gensite.sh
--- bookletimposer-0.3~beta1/scripts/gensite.sh	2019-09-29 21:18:53.000000000 +0000
+++ bookletimposer-0.3+ds/scripts/gensite.sh	2019-12-13 12:18:35.000000000 +0000
@@ -33,11 +33,11 @@
     --stringparam html.stylesheet style.css \
     /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
     help/C/index.docbook
-cp -r help/C/figures site/figures
 echo generate API documentation
 epydoc --docformat=restructuredtext \
     --output=build/site/api/ \
     --inheritance=included \
     --no-private \
     --no-frames \
+    --verbose \
     lib/pdfimposer.py
diff -Nru bookletimposer-0.3~beta1/setup.py bookletimposer-0.3+ds/setup.py
--- bookletimposer-0.3~beta1/setup.py	2019-09-29 21:18:53.000000000 +0000
+++ bookletimposer-0.3+ds/setup.py	2019-12-13 12:18:35.000000000 +0000
@@ -10,7 +10,7 @@
 import distutils.cmd
 
 class build_uiheaders(distutils.cmd.Command):
-    description = "generate the headers required to use gettext whit gtkbuilder"
+    description = "generate the headers required to use gettext with gtkbuilder"
     def initialize_options(self):
         pass
     def finalize_options(self):
@@ -81,7 +81,7 @@
 build_extra.build_extra.sub_commands.append(("build_man", None))
 
 setup(name='bookletimposer',
-      version='0.3beta1',
+      version='0.3',
       url="http://kjo.herbesfolles.org/bookletimposer/",
       author="Kjö Hansi Glaz",
       author_email="kjo@a4nancy.net.eu.org",
diff -Nru bookletimposer-0.3~beta1/site/index.mdwn bookletimposer-0.3+ds/site/index.mdwn
--- bookletimposer-0.3~beta1/site/index.mdwn	2019-09-29 21:18:53.000000000 +0000
+++ bookletimposer-0.3+ds/site/index.mdwn	2019-12-13 12:18:35.000000000 +0000
@@ -64,49 +64,12 @@
 Building from sources
 ---------------------
 
-### Download
-
-Everything is in [the archive](archive/).
-
-### Install dependancies
-
-You must first ensure that the dependencies are installed. They are provided by
-the following Debian packages: 
-
-    `python3-gi gir1.2-gtk-3.0 gir1.2-glib-2.0 python3-distutils-extra python3-pypdf2 pandoc`
-
-### Build pdfimposer/BookletImposer
-
-Download the tarball from [the archive](archive/) and extract it. Go in the
-`bookletimposer-`*version* directory and run the following command:
-
-    $ ./setup.py build
-
-Then as run as root:
-
-    # ./setup.py install
-
-Dependencies
-------------
-
-pdfimposer requires:
-
-- python (≥ 2.6)
-- [pyPdf2 (≥ 1.23)](https://github.com/mstamy2/PyPDF2/releases)
-
-
-BookletImposer also requires:
-
-- PyGObject
-- gtk+ (≥ 3.0)
-- glib
-
-In addition, the build and installation process requires:
-
-- python-distutils-extra
-- pandoc
-
+Sources are available from
+<https://git.codecoop.org/kjo/bookletimposer/-/archive/master/bookletimposer-master.tar.gz>
 
+Please follow the
+[readme file](https://git.codecoop.org/kjo/bookletimposer/blob/master/README.md)
+for build and installations instructions.
 
 Documentation
 =============
Binary files /tmp/tmpfcWJCR/6gtVeMSnJg/bookletimposer-0.3~beta1/tests/test-3p.pdf and /tmp/tmpfcWJCR/f0SWVRM50f/bookletimposer-0.3+ds/tests/test-3p.pdf differ
Binary files /tmp/tmpfcWJCR/6gtVeMSnJg/bookletimposer-0.3~beta1/tests/test-5p.pdf and /tmp/tmpfcWJCR/f0SWVRM50f/bookletimposer-0.3+ds/tests/test-5p.pdf differ
Binary files /tmp/tmpfcWJCR/6gtVeMSnJg/bookletimposer-0.3~beta1/tests/test-7p.pdf and /tmp/tmpfcWJCR/f0SWVRM50f/bookletimposer-0.3+ds/tests/test-7p.pdf differ
Binary files /tmp/tmpfcWJCR/6gtVeMSnJg/bookletimposer-0.3~beta1/tests/test-8p-booklet.pdf and /tmp/tmpfcWJCR/f0SWVRM50f/bookletimposer-0.3+ds/tests/test-8p-booklet.pdf differ
Binary files /tmp/tmpfcWJCR/6gtVeMSnJg/bookletimposer-0.3~beta1/tests/test-8p.pdf and /tmp/tmpfcWJCR/f0SWVRM50f/bookletimposer-0.3+ds/tests/test-8p.pdf differ
diff -Nru bookletimposer-0.3~beta1/tests/test_bookletimposer_cli.py bookletimposer-0.3+ds/tests/test_bookletimposer_cli.py
--- bookletimposer-0.3~beta1/tests/test_bookletimposer_cli.py	1970-01-01 00:00:00.000000000 +0000
+++ bookletimposer-0.3+ds/tests/test_bookletimposer_cli.py	2019-12-13 12:18:35.000000000 +0000
@@ -0,0 +1,146 @@
+#!/usr/bin/python3
+import unittest
+import subprocess
+
+import PyPDF2
+
+
+def getNumPages(pdf_path):
+    with open(pdf_path, 'rb') as pdf_file:
+        read_pdf = PyPDF2.PdfFileReader(pdf_file)
+        num_pages = read_pdf.getNumPages()
+    return num_pages
+
+
+def getContents(pdf_path, num_pages):
+    contents = {}
+    for i in range(1, num_pages+1):
+        page_text = subprocess.check_output(
+            ["pdftotext", "-f", str(i), "-l", str(i), pdf_path, "-"])
+        page_text.strip()
+        contents[i] = []
+        for line in page_text.splitlines():
+            line.strip()
+            if line:
+                try:
+                    contents[i].append(int(line))
+                except ValueError:
+                    pass
+    return contents
+
+
+def convertToBooklet(in_pdf, out_pdf):
+    subprocess.check_call(
+        ['bin/bookletimposer', '-a', '-b', '-o', out_pdf,
+         in_pdf])
+
+
+def convertToLinear(in_pdf, out_pdf):
+    subprocess.check_call(
+        ['bin/bookletimposer', '-a', '-l', '-o', out_pdf,
+         in_pdf])
+
+
+def convertScale(in_pdf, out_pdf):
+    subprocess.check_call(
+        ['bin/bookletimposer', '-a', '-l', '-o', out_pdf,
+         in_pdf])
+
+
+class testBookletimposerCli(unittest.TestCase):
+    def testBookletize8p(self):
+        print("\nConverting 8p to booklet")
+        out_path = '/tmp/test-8p-bookelt.pdf'
+        expected = {1: [8, 1],
+                    2: [2, 7],
+                    3: [6, 3],
+                    4: [4, 5]}
+
+        convertToBooklet('tests/test-8p.pdf', out_path)
+
+        # check the number of pages
+        num_pages = getNumPages(out_path)
+        self.assertEqual(num_pages, 4)
+
+        # check that the pages are in the right order
+        contents = getContents(out_path, num_pages)
+        self.assertDictEqual(contents, expected)
+
+    def testBookletize5p(self):
+        print("\nConverting 5p to booklet")
+        out_path = '/tmp/test-5p-booklet.pdf'
+        expected = {1: [1],
+                    2: [2],
+                    3: [3],
+                    4: [4, 5]}
+
+        convertToBooklet('tests/test-5p.pdf', out_path)
+
+        # check the number of pages
+        num_pages = getNumPages(out_path)
+        self.assertEqual(num_pages, 4)
+
+        # check that the pages are in the right order
+        contents = getContents(out_path, num_pages)
+        self.assertDictEqual(contents, expected)
+
+    def testBookletize3p(self):
+        print("\nConverting 3p to booklet")
+        out_path = '/tmp/test-3p-booklet.pdf'
+        expected = {1: [1],
+                    2: [2, 3]}
+
+        convertToBooklet('tests/test-3p.pdf', out_path)
+
+        # check the number of pages
+        num_pages = getNumPages(out_path)
+        self.assertEqual(num_pages, 2)
+
+        # check that the pages are in the right order
+        contents = getContents(out_path, num_pages)
+        self.assertDictEqual(contents, expected)
+
+
+    def testLinearize8p(self):
+        print("\nConverting 8p to linear")
+        out_path = '/tmp/test-8p-linear.pdf'
+        expected = {1: [1],
+                    2: [2],
+                    3: [3],
+                    4: [4],
+                    5: [5],
+                    6: [6],
+                    7: [7],
+                    8: [8]}
+
+        convertToLinear('tests/test-8p-booklet.pdf', out_path)
+
+        # check the number of pages
+        num_pages = getNumPages(out_path)
+        self.assertEqual(num_pages, 8)
+
+        # check that the pages are in the right order
+        contents = getContents(out_path, num_pages)
+        self.assertDictEqual(contents, expected)
+
+    def testScale8p(self):
+        print("\nScaing 8p")
+        out_path = '/tmp/test-8p-bookelt.pdf'
+        expected = {1: [8, 1],
+                    2: [2, 7],
+                    3: [6, 3],
+                    4: [4, 5]}
+
+        convertToBooklet('tests/test-8p.pdf', out_path)
+
+        # check the number of pages
+        num_pages = getNumPages(out_path)
+        self.assertEqual(num_pages, 4)
+
+        # check that the pages are in the right order
+        contents = getContents(out_path, num_pages)
+        self.assertDictEqual(contents, expected)
+
+
+if __name__ == '__main__':
+    unittest.main()