merge

diff --git a/po/booh.pot b/po/booh.pot
index 844d0c3..5910d18 100644 (file)
--- a/po/booh.pot
+++ b/po/booh.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2005-04-03 01:03+0200\n"
+"POT-Creation-Date: 2005-04-09 20:09+0200\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"
@@ -168,19 +168,19 @@ msgstr ""
 msgid "\tfixating configuration file..."
 msgstr ""
 
-#: ../bin/booh:556
+#: ../bin/booh:563
 msgid "Theme `%s' has no default size."
 msgstr ""
 
-#: ../bin/booh:561
+#: ../bin/booh:568
 msgid "\trescanning directories to generate all `index.html' files..."
 msgstr ""
 
-#: ../bin/booh:647 ../bin/booh:650
+#: ../bin/booh:651 ../bin/booh:654
 msgid "Return to albums"
 msgstr ""
 
-#: ../bin/booh:662
+#: ../bin/booh:666
 msgid " all done."
 msgstr ""
 
@@ -204,71 +204,91 @@ msgstr ""
 msgid "Last ->>"
 msgstr ""
 
-#: ../bin/booh-gui:183
+#: ../bin/booh-gui:173
+msgid "Could not generate fullscreen thumbnail!"
+msgstr ""
+
+#: ../bin/booh-gui:267
 msgid "%s (video - %s KB)"
 msgstr ""
 
-#: ../bin/booh-gui:389
-msgid "Booh message"
+#: ../bin/booh-gui:407 ../bin/booh-gui:666
+msgid "Rotate clockwise"
 msgstr ""
 
-#: ../bin/booh-gui:452
-msgid "Not a booh file!"
+#: ../bin/booh-gui:408 ../bin/booh-gui:667
+msgid "Rotate counter-clockwise"
 msgstr ""
 
-#: ../bin/booh-gui:456 ../bin/booh-gui:460 ../bin/booh-gui:464 ../bin/booh-gui:477
-msgid "Corrupted booh file..."
+#: ../bin/booh-gui:415 ../bin/booh-gui:676
+msgid "Red/blue color swap"
 msgstr ""
 
-#: ../bin/booh-gui:500
-msgid "Open file"
+#: ../bin/booh-gui:416 ../bin/booh-gui:677
+msgid "Flip upside-down"
 msgstr ""
 
-#: ../bin/booh-gui:530
-msgid "_File"
+#: ../bin/booh-gui:489
+msgid "Booh message"
+msgstr ""
+
+#: ../bin/booh-gui:605
+msgid "Select image for caption"
 msgstr ""
 
-#: ../bin/booh-gui:532
-msgid "_New (do nothing)"
+#: ../bin/booh-gui:664
+msgid "Change image"
 msgstr ""
 
-#: ../bin/booh-gui:533
-msgid "_Open"
+#: ../bin/booh-gui:770
+msgid "File not found."
 msgstr ""
 
-#: ../bin/booh-gui:535
-msgid "_Save (do nothing - autosave on quit)"
+#: ../bin/booh-gui:780
+msgid "Not a booh file!"
 msgstr ""
 
-#: ../bin/booh-gui:536
-msgid "Save _as... (do nothing)"
+#: ../bin/booh-gui:784 ../bin/booh-gui:788 ../bin/booh-gui:792 ../bin/booh-gui:807
+msgid "Corrupted booh file..."
+msgstr ""
+
+#: ../bin/booh-gui:830
+msgid "Open file"
 msgstr ""
 
-#: ../bin/booh-gui:538
-msgid "_Quit"
+#: ../bin/booh-gui:860
+msgid "_File"
 msgstr ""
 
-#: ../bin/booh-gui:552
+#: ../bin/booh-gui:882
 msgid "Open"
 msgstr ""
 
-#: ../bin/booh-gui:558 ../bin/booh-gui:561
+#: ../bin/booh-gui:909 ../bin/booh-gui:912
 msgid "Rotate"
 msgstr ""
 
-#: ../bin/booh-gui:563
+#: ../bin/booh-gui:914
 msgid "Delete"
 msgstr ""
 
-#: ../bin/booh-gui:566
+#: ../bin/booh-gui:917
 msgid "None"
 msgstr ""
 
-#: ../bin/booh-gui:572
+#: ../bin/booh-gui:923
 msgid "<b>One-Click tools.</b>\n\nYou have just clicked on a One-Click tool. When such a tool is activated\n(<span foreground=darkblue>Rotate clockwise</span>, <span foreground=darkblue>Rotate counter-clockwise</span>, or <span foreground=darkblue>Delete</span>), clicking on a\nthumbnail will immediately apply the desired action.\n\nClick the <span foreground=darkblue>None</span> icon when you're finished with One-Click tools.\n"
 msgstr ""
 
-#: ../bin/booh-gui:694
+#: ../bin/booh-gui:1017
+msgid "Sub-albums page"
+msgstr ""
+
+#: ../bin/booh-gui:1019
+msgid "Thumbnails page"
+msgstr ""
+
+#: ../bin/booh-gui:1065
 msgid "Ready."
 msgstr ""
 
@@ -304,14 +324,14 @@ msgstr ""
 msgid ","
 msgstr ""
 
-#: ../lib/booh/booh-lib.rb:213
+#: ../lib/booh/booh-lib.rb:239
 msgid "* could not extract first image of video %s with transcode, will try first converting with mencoder"
 msgstr ""
 
-#: ../lib/booh/booh-lib.rb:223
+#: ../lib/booh/booh-lib.rb:249
 msgid "could not extract first image of video %s encoded by mencoder"
 msgstr ""
 
-#: ../lib/booh/booh-lib.rb:227
+#: ../lib/booh/booh-lib.rb:253
 msgid "could not make mencoder to encode %s to mpeg4"
 msgstr ""

diff --git a/po/fr.po b/po/fr.po
index d53524d..22a5981 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2005-04-03 01:03+0200\n"
-"PO-Revision-Date: 2005-04-03 01:04+0200\n"
+"POT-Creation-Date: 2005-04-09 20:09+0200\n"
+"PO-Revision-Date: 2005-04-09 20:13+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -204,21 +204,21 @@ msgstr "Retourner aux vignettes"
 msgid "\tfixating configuration file..."
 msgstr "\tfixation du fichier de configuration..."
 
-#: ../bin/booh:556
+#: ../bin/booh:563
 msgid "Theme `%s' has no default size."
 msgstr "Le theme `%s' n'a pas de taille par défaut."
 
-#: ../bin/booh:561
+#: ../bin/booh:568
 msgid "\trescanning directories to generate all `index.html' files..."
 msgstr ""
 "\trelecture des sous-répertoires pour générer tous les fichiers `index."
 "html'..."
 
-#: ../bin/booh:647 ../bin/booh:650
+#: ../bin/booh:651 ../bin/booh:654
 msgid "Return to albums"
 msgstr "Retourner aux albums"
 
-#: ../bin/booh:662
+#: ../bin/booh:666
 msgid " all done."
 msgstr " fin."
 
@@ -242,79 +242,90 @@ msgstr "Prochain ->"
 msgid "Last ->>"
 msgstr "Dernier ->>"
 
-#: ../bin/booh-gui:183
+#: ../bin/booh-gui:173
+msgid "Could not generate fullscreen thumbnail!"
+msgstr "Impossible de générer la vignette plein-écran !"
+
+#: ../bin/booh-gui:267
 msgid "%s (video - %s KB)"
 msgstr "%s (vidéo - %s Ko)"
 
-#: ../bin/booh-gui:389
+#: ../bin/booh-gui:407 ../bin/booh-gui:666
+msgid "Rotate clockwise"
+msgstr "Tourner dans le sens horaire"
+
+#: ../bin/booh-gui:408 ../bin/booh-gui:667
+msgid "Rotate counter-clockwise"
+msgstr "Tourner dans le sens anti-horaire"
+
+#: ../bin/booh-gui:415 ../bin/booh-gui:676
+msgid "Red/blue color swap"
+msgstr "Inverser le rouge et le bleu"
+
+#: ../bin/booh-gui:416 ../bin/booh-gui:677
+msgid "Flip upside-down"
+msgstr "Renverser haut/bas"
+
+#: ../bin/booh-gui:489
 msgid "Booh message"
 msgstr "Message de booh"
 
-#: ../bin/booh-gui:452
+#: ../bin/booh-gui:605
+msgid "Select image for caption"
+msgstr "Sélectionnez une image"
+
+#: ../bin/booh-gui:664
+msgid "Change image"
+msgstr "Changer d'image"
+
+#: ../bin/booh-gui:770
+msgid "File not found."
+msgstr "Fichier non trouvé."
+
+#: ../bin/booh-gui:780
 msgid "Not a booh file!"
 msgstr "Ce n'est pas un fichier de booh !"
 
-#: ../bin/booh-gui:456 ../bin/booh-gui:460 ../bin/booh-gui:464
-#: ../bin/booh-gui:477
+#: ../bin/booh-gui:784 ../bin/booh-gui:788 ../bin/booh-gui:792
+#: ../bin/booh-gui:807
 msgid "Corrupted booh file..."
 msgstr "Le fichier booh est corrompu..."
 
-#: ../bin/booh-gui:500
+#: ../bin/booh-gui:830
 msgid "Open file"
 msgstr "Ouverture d'un fichier"
 
-#: ../bin/booh-gui:530
+#: ../bin/booh-gui:860
 msgid "_File"
 msgstr "_Fichier"
 
-#: ../bin/booh-gui:532
-msgid "_New (do nothing)"
-msgstr "_Nouveau (ne fait rien)"
-
-#: ../bin/booh-gui:533
-msgid "_Open"
-msgstr "_Ouvrir"
-
-#: ../bin/booh-gui:535
-msgid "_Save (do nothing - autosave on quit)"
-msgstr "_Sauver (ne fait rien - sauvegarde automatique au moment de quitter)"
-
-#: ../bin/booh-gui:536
-msgid "Save _as... (do nothing)"
-msgstr "Sauvegarder _sous... (ne fait rien)"
-
-#: ../bin/booh-gui:538
-msgid "_Quit"
-msgstr "_Quitter"
-
-#: ../bin/booh-gui:552
+#: ../bin/booh-gui:882
 msgid "Open"
 msgstr "Ouvrir"
 
-#: ../bin/booh-gui:558 ../bin/booh-gui:561
+#: ../bin/booh-gui:909 ../bin/booh-gui:912
 msgid "Rotate"
 msgstr "Tourner"
 
-#: ../bin/booh-gui:563
+#: ../bin/booh-gui:914
 msgid "Delete"
 msgstr "Supprimer"
 
-#: ../bin/booh-gui:566
+#: ../bin/booh-gui:917
 msgid "None"
 msgstr "Aucun"
 
-#: ../bin/booh-gui:572
-#, fuzzy
+#: ../bin/booh-gui:923
 msgid ""
 "<b>One-Click tools.</b>\n"
 "\n"
 "You have just clicked on a One-Click tool. When such a tool is activated\n"
-"(<span foreground=darkblue>Rotate clockwise</span>, <span "
-"foreground=darkblue>Rotate counter-clockwise</span>, or <span "
-"foreground=darkblue>Delete</span>), clicking on a\n"
+"(<span foreground=\"darkblue\">Rotate clockwise</span>, <span "
+"foreground=\"darkblue\">Rotate counter-clockwise</span>, or <span "
+"foreground=\"darkblue\">Delete</span>), clicking on a\n"
 "thumbnail will immediately apply the desired action.\n"
 "\n"
-"Click the <span foreground=darkblue>None</span> icon when you're finished "
+"Click the <span foreground=\"darkblue\">None</span> icon when you're finished "
 "with One-Click tools.\n"
 msgstr ""
 "<b>Outils Un-Click.</b>\n"
@@ -330,7 +341,15 @@ msgstr ""
 "aurez fini avec les outils\n"
 "Un-Click.\n"
 
-#: ../bin/booh-gui:694
+#: ../bin/booh-gui:1017
+msgid "Sub-albums page"
+msgstr "Page des sous-albums"
+
+#: ../bin/booh-gui:1019
+msgid "Thumbnails page"
+msgstr "Page des vignettes"
+
+#: ../bin/booh-gui:1065
 msgid "Ready."
 msgstr "Prêt."
 
@@ -368,7 +387,7 @@ msgstr ""
 msgid ","
 msgstr " "
 
-#: ../lib/booh/booh-lib.rb:213
+#: ../lib/booh/booh-lib.rb:239
 msgid ""
 "* could not extract first image of video %s with transcode, will try first "
 "converting with mencoder"
@@ -376,11 +395,27 @@ msgstr ""
 "* impossible d'extraire la première image de la vidéo %s avec transcode, je "
 "vais tenter le coup en convertissant d'abord avec mencoder"
 
-#: ../lib/booh/booh-lib.rb:223
+#: ../lib/booh/booh-lib.rb:249
 msgid "could not extract first image of video %s encoded by mencoder"
 msgstr ""
 "impossible d'extraire la première image de la vidéo %s encodée par mencoder"
 
-#: ../lib/booh/booh-lib.rb:227
+#: ../lib/booh/booh-lib.rb:253
 msgid "could not make mencoder to encode %s to mpeg4"
 msgstr "impossible d'encoder %s en mpeg4 avec mencoder"
+
+#~ msgid "_New (do nothing)"
+#~ msgstr "_Nouveau (ne fait rien)"
+
+#~ msgid "_Open"
+#~ msgstr "_Ouvrir"
+
+#~ msgid "_Save (do nothing - autosave on quit)"
+#~ msgstr ""
+#~ "_Sauver (ne fait rien - sauvegarde automatique au moment de quitter)"
+
+#~ msgid "Save _as... (do nothing)"
+#~ msgstr "Sauvegarder _sous... (ne fait rien)"
+
+#~ msgid "_Quit"
+#~ msgstr "_Quitter"