*** empty log message ***

diff --git a/VERSION b/VERSION
index ef2b0779c8e8e5bb0087995729568c952ae18098..e19d714334734a022361c4e96e88f0946491fef6 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.8.99.6
+0.8.99.7

diff --git a/bin/booh b/bin/booh
index b609058f3f63c46b4caa7d97b7a17583e8a1de42..ea46f811073c99b074b7200e2ddd3ebd54caa027 100755 (executable)
--- a/bin/booh
+++ b/bin/booh
@@ -1991,10 +1991,12 @@ def backend_wait_message(parent, msg, infopipe_path, mode)
 
     directories = nil
     update_progression_title_pb1 = proc {
-        if mode != 'web-album'
+        if mode == 'web-album'
+            set_mainwindow_title((pb1_2.fraction + pb1_1.fraction / directories) * 9 / 10)
+        elsif mode != 'one dir scan'
             set_mainwindow_title(pb1_2.fraction + pb1_1.fraction / directories)
         else
-            set_mainwindow_title((pb1_2.fraction + pb1_1.fraction / directories) * 9 / 10)
+            set_mainwindow_title(pb1_1.fraction)
         end
     }
 
@@ -3165,7 +3167,7 @@ def new_album
                                    pack_start(indexlinkentry = Gtk::Entry.new, true, true, 0))
     tooltips.set_tip(indexlinkentry, utf8(_("Optional HTML markup to use on pages bottom for a small link returning to wherever you see fit in your website (or somewhere else)")), nil)
     vb.add(Gtk::HBox.new(false, 3).pack_start(Gtk::Label.new(utf8(_("'Made with' markup on pages bottom: "))), false, false, 0).
-                                   pack_start(madewithentry = Gtk::Entry.new.set_text('made with <a href=%booh>booh</a>!'), true, true, 0))
+                                   pack_start(madewithentry = Gtk::Entry.new.set_text(utf8(_("made with <a href=%booh>booh</a>!"))), true, true, 0))
     tooltips.set_tip(madewithentry, utf8(_("Optional HTML markup to use on pages bottom for a small 'made with' label; %booh is replaced by the website of booh;\nfor example: made with <a href=%booh>booh</a>!")), nil)
 
     src_nb_calculated_for = ''

diff --git a/data/booh/themes/coni/metadata/parameters.rb b/data/booh/themes/coni/metadata/parameters.rb
index ecdf80cdb02afd1a93b5912492613b27baac4059..4b90cb5db762a09f159fceb0e940387847aa9931 100644 (file)
--- a/data/booh/themes/coni/metadata/parameters.rb
+++ b/data/booh/themes/coni/metadata/parameters.rb
@@ -30,7 +30,7 @@ $images_size = [
     {
         'name' => 'small',
         'description' => _("Sizes that should fit browsers in fullscreen for 800x600 screens"),
-        'fullscreen' => '750x414',
+        'fullscreen' => '600x331',
         'thumbnails' => '192x144',
         'optimizedforwidth' => '800',
         'optional' => true,
@@ -38,7 +38,7 @@ $images_size = [
     {
         'name' => 'medium',
         'description' => _("Sizes that should fit browsers in fullscreen for 1024x768 screens"),
-        'fullscreen' => '960x528',
+        'fullscreen' => '758x422',
         'thumbnails' => '240x180',
         'optimizedforwidth' => '1024',
         'default' => true,
@@ -46,14 +46,14 @@ $images_size = [
     {
         'name' => 'large',
         'description' => _("Sizes that should fit browsers in fullscreen for 1280x1024 screens"),
-        'fullscreen' => '704x528',
+        'fullscreen' => '960x528',
         'thumbnails' => '309x232',
         'optimizedforwidth' => '1280',
     },
     {
         'name' => 'x-large',
         'description' => _("Sizes that should fit browsers in fullscreen for 1400x1050 screens"),
-        'fullscreen' => '1312x721',
+        'fullscreen' => '1050x576',
         'thumbnails' => '328x245',
         'optimizedforwidth' => '1400',
         'optional' => true,
@@ -61,7 +61,7 @@ $images_size = [
     {
         'name' => 'xx-large',
         'description' => _("Sizes that should fit browsers in fullscreen for 1600x1200 screens"),
-        'fullscreen' => '1500x825',
+        'fullscreen' => '1200x660',
         'thumbnails' => '375x281',
         'optimizedforwidth' => '1600',
         'optional' => true,