sync

diff --git a/po/booh.pot b/po/booh.pot
index 3af37e6..e3291a5 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-03-28 19:49+0200\n"
+"POT-Creation-Date: 2005-03-28 20:03+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"
@@ -76,115 +76,123 @@ msgstr ""
 msgid "Config file does not exist or is unreadable."
 msgstr ""
 
-#: ../bin/booh:144
+#: ../bin/booh:107
+msgid "Config skeleton file already exists, backuping to %s.backup"
+msgstr ""
+
+#: ../bin/booh:114
+msgid "Merge config notice: backuping current config file to %s.backup"
+msgstr ""
+
+#: ../bin/booh:145
 msgid "Missing --source or --config parameter."
 msgstr ""
 
-#: ../bin/booh:147
+#: ../bin/booh:148
 msgid "Missing --destination parameter."
 msgstr ""
 
-#: ../bin/booh:167
+#: ../bin/booh:168
 msgid "The `%s' program is typically needed. Re-run with --no-check if you're sure you're fine without it."
 msgstr ""
 
-#: ../bin/booh:177
+#: ../bin/booh:178
 msgid "No `%s' found for substitution"
 msgstr ""
 
-#: ../bin/booh:232
+#: ../bin/booh:233
 msgid "forgetting runaway process (transcode sucks again?)"
 msgstr ""
 
-#: ../bin/booh:284
+#: ../bin/booh:285
 msgid "* could not extract first image of video %s with transcode, will try first converting with mencoder"
 msgstr ""
 
-#: ../bin/booh:294
+#: ../bin/booh:295
 msgid "could not extract first image of video %s encoded by mencoder"
 msgstr ""
 
-#: ../bin/booh:298
+#: ../bin/booh:299
 msgid "could not make mencoder to encode %s to mpeg4"
 msgstr ""
 
-#: ../bin/booh:393
+#: ../bin/booh:394
 msgid "Source directory or sub-directories can't contain a single-quote character, sorry."
 msgstr ""
 
-#: ../bin/booh:417
+#: ../bin/booh:418
 msgid "Handling %s from config list..."
 msgstr ""
 
-#: ../bin/booh:424
+#: ../bin/booh:425
 msgid "Examining %s..."
 msgstr ""
 
-#: ../bin/booh:450
+#: ../bin/booh:451
 msgid "\t%s images"
 msgstr ""
 
-#: ../bin/booh:452
+#: ../bin/booh:453
 msgid "\t%s videos"
 msgstr ""
 
-#: ../bin/booh:471
+#: ../bin/booh:472
 msgid "Outputting in %s..."
 msgstr ""
 
-#: ../bin/booh:483
+#: ../bin/booh:484
 msgid "\tcreating images thumbnails..."
 msgstr ""
 
-#: ../bin/booh:500
+#: ../bin/booh:501
 msgid "\tcreating videos thumbnails..."
 msgstr ""
 
-#: ../bin/booh:520
+#: ../bin/booh:521
 msgid "small"
 msgstr ""
 
-#: ../bin/booh:520
+#: ../bin/booh:521
 msgid "medium"
 msgstr ""
 
-#: ../bin/booh:520
+#: ../bin/booh:521
 msgid "large"
 msgstr ""
 
-#: ../bin/booh:522
+#: ../bin/booh:523
 msgid "\tgenerating HTML pages..."
 msgstr ""
 
-#: ../bin/booh:529 ../lib/booh/html-merges.rb:270 ../lib/booh/html-merges.rb:304
+#: ../bin/booh:530 ../lib/booh/html-merges.rb:270 ../lib/booh/html-merges.rb:304
 msgid "Run slideshow!"
 msgstr ""
 
-#: ../bin/booh:562
+#: ../bin/booh:563
 msgid "(no preview)"
 msgstr ""
 
-#: ../bin/booh:601
+#: ../bin/booh:602
 msgid "Return to thumbnails"
 msgstr ""
 
-#: ../bin/booh:623
+#: ../bin/booh:624
 msgid "\tfixating configuration file..."
 msgstr ""
 
-#: ../bin/booh:663
+#: ../bin/booh:664
 msgid "Theme `%s' has no default size."
 msgstr ""
 
-#: ../bin/booh:668
+#: ../bin/booh:669
 msgid "\trescanning directories to generate all `index.html' files..."
 msgstr ""
 
-#: ../bin/booh:754 ../bin/booh:757
+#: ../bin/booh:755 ../bin/booh:758
 msgid "Return to albums"
 msgstr ""
 
-#: ../bin/booh:769
+#: ../bin/booh:770
 msgid " all done."
 msgstr ""
 
@@ -220,39 +228,39 @@ msgstr ""
 msgid "Not a booh file!"
 msgstr ""
 
-#: ../bin/booh-gui:374 ../bin/booh-gui:378 ../bin/booh-gui:387
+#: ../bin/booh-gui:374 ../bin/booh-gui:378 ../bin/booh-gui:382 ../bin/booh-gui:391
 msgid "Corrupted booh file..."
 msgstr ""
 
-#: ../bin/booh-gui:412
+#: ../bin/booh-gui:416
 msgid "_File"
 msgstr ""
 
-#: ../bin/booh-gui:414
+#: ../bin/booh-gui:418
 msgid "_New (do nothing)"
 msgstr ""
 
-#: ../bin/booh-gui:415
+#: ../bin/booh-gui:419
 msgid "_Open"
 msgstr ""
 
-#: ../bin/booh-gui:417
+#: ../bin/booh-gui:421
 msgid "_Save (do nothing - autosave on quit)"
 msgstr ""
 
-#: ../bin/booh-gui:418
+#: ../bin/booh-gui:422
 msgid "Save _as... (do nothing)"
 msgstr ""
 
-#: ../bin/booh-gui:420
+#: ../bin/booh-gui:424
 msgid "_Quit"
 msgstr ""
 
-#: ../bin/booh-gui:425
+#: ../bin/booh-gui:429
 msgid "Open file"
 msgstr ""
 
-#: ../bin/booh-gui:519
+#: ../bin/booh-gui:523
 msgid "Ready."
 msgstr ""
 

diff --git a/po/fr.po b/po/fr.po
index 0dafd54..d2bfb4f 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-03-28 19:49+0200\n"
-"PO-Revision-Date: 2005-03-28 19:47+0200\n"
+"POT-Creation-Date: 2005-03-28 20:03+0200\n"
+"PO-Revision-Date: 2005-03-28 20:04+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -96,15 +96,23 @@ msgstr ""
 msgid "Config file does not exist or is unreadable."
 msgstr "Le fichier de configuration n'existe pas ou est non lisible."
 
-#: ../bin/booh:144
+#: ../bin/booh:107
+msgid "Config skeleton file already exists, backuping to %s.backup"
+msgstr "Le fichier squelette de configuration existe déjà, sauvegarde de la version actuelle en %s.backup"
+
+#: ../bin/booh:114
+msgid "Merge config notice: backuping current config file to %s.backup"
+msgstr "Fusion de la configuration : sauvegarde de la version actuelle en %s.backup"
+
+#: ../bin/booh:145
 msgid "Missing --source or --config parameter."
 msgstr "Il manque le paramètre --source ou le paramètre --config."
 
-#: ../bin/booh:147
+#: ../bin/booh:148
 msgid "Missing --destination parameter."
 msgstr "Il manque le paramètre --destination."
 
-#: ../bin/booh:167
+#: ../bin/booh:168
 msgid ""
 "The `%s' program is typically needed. Re-run with --no-check if you're sure "
 "you're fine without it."
@@ -112,17 +120,17 @@ msgstr ""
 "Le programme `%s' est typiquement nécessaire. Relancez avec --no-check si "
 "vous êtes sûr que vous n'en aurez pas besoin."
 
-#: ../bin/booh:177
+#: ../bin/booh:178
 msgid "No `%s' found for substitution"
 msgstr "`%s' non trouvé pour substitution"
 
-#: ../bin/booh:232
+#: ../bin/booh:233
 msgid "forgetting runaway process (transcode sucks again?)"
 msgstr ""
 "laissons tomber ce processus qui tourne en rond (transcode sux encore une "
 "fois ?)"
 
-#: ../bin/booh:284
+#: ../bin/booh:285
 msgid ""
 "* could not extract first image of video %s with transcode, will try first "
 "converting with mencoder"
@@ -130,16 +138,16 @@ 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"
 
-#: ../bin/booh:294
+#: ../bin/booh:295
 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"
 
-#: ../bin/booh:298
+#: ../bin/booh:299
 msgid "could not make mencoder to encode %s to mpeg4"
 msgstr "impossible d'encoder %s en mpeg4 avec mencoder"
 
-#: ../bin/booh:393
+#: ../bin/booh:394
 msgid ""
 "Source directory or sub-directories can't contain a single-quote character, "
 "sorry."
@@ -147,82 +155,82 @@ msgstr ""
 "Le répertoire source ou un de ses sous-répertoires ne peuvent contenir de "
 "caractère apostrophe, désolé."
 
-#: ../bin/booh:417
+#: ../bin/booh:418
 msgid "Handling %s from config list..."
 msgstr "Prise en charge de %s selon le fichier de configuration..."
 
-#: ../bin/booh:424
+#: ../bin/booh:425
 msgid "Examining %s..."
 msgstr "Examen de %s..."
 
-#: ../bin/booh:450
+#: ../bin/booh:451
 msgid "\t%s images"
 msgstr "\t%s images"
 
-#: ../bin/booh:452
+#: ../bin/booh:453
 msgid "\t%s videos"
 msgstr "\t%s vidéos"
 
-#: ../bin/booh:471
+#: ../bin/booh:472
 msgid "Outputting in %s..."
 msgstr "Écriture dans %s..."
 
-#: ../bin/booh:483
+#: ../bin/booh:484
 msgid "\tcreating images thumbnails..."
 msgstr "\tcréation des vignettes des images..."
 
-#: ../bin/booh:500
+#: ../bin/booh:501
 msgid "\tcreating videos thumbnails..."
 msgstr "\tcréation des vignettes des vidéos..."
 
-#: ../bin/booh:520
+#: ../bin/booh:521
 msgid "small"
 msgstr "petit"
 
-#: ../bin/booh:520
+#: ../bin/booh:521
 msgid "medium"
 msgstr "moyen"
 
-#: ../bin/booh:520
+#: ../bin/booh:521
 msgid "large"
 msgstr "grand"
 
-#: ../bin/booh:522
+#: ../bin/booh:523
 msgid "\tgenerating HTML pages..."
 msgstr "\tgénération des pages HTML..."
 
-#: ../bin/booh:529 ../lib/booh/html-merges.rb:270
+#: ../bin/booh:530 ../lib/booh/html-merges.rb:270
 #: ../lib/booh/html-merges.rb:304
 msgid "Run slideshow!"
 msgstr "Lancer la présentation !"
 
-#: ../bin/booh:562
+#: ../bin/booh:563
 msgid "(no preview)"
 msgstr "(aucune vignette)"
 
-#: ../bin/booh:601
+#: ../bin/booh:602
 msgid "Return to thumbnails"
 msgstr "Retourner aux vignettes"
 
-#: ../bin/booh:623
+#: ../bin/booh:624
 msgid "\tfixating configuration file..."
 msgstr "\tfixation du fichier de configuration..."
 
-#: ../bin/booh:663
+#: ../bin/booh:664
 msgid "Theme `%s' has no default size."
 msgstr "Le theme `%s' n'a pas de taille par défaut."
 
-#: ../bin/booh:668
+#: ../bin/booh:669
 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:754 ../bin/booh:757
+#: ../bin/booh:755 ../bin/booh:758
 msgid "Return to albums"
 msgstr "Retourner aux albums"
 
-#: ../bin/booh:769
+#: ../bin/booh:770
 msgid " all done."
 msgstr " fin."
 
@@ -258,39 +266,40 @@ msgstr "Message de booh"
 msgid "Not a booh file!"
 msgstr "Ce n'est pas un fichier de booh !"
 
-#: ../bin/booh-gui:374 ../bin/booh-gui:378 ../bin/booh-gui:387
+#: ../bin/booh-gui:374 ../bin/booh-gui:378 ../bin/booh-gui:382
+#: ../bin/booh-gui:391
 msgid "Corrupted booh file..."
 msgstr "Le fichier booh est corrompu..."
 
-#: ../bin/booh-gui:412
+#: ../bin/booh-gui:416
 msgid "_File"
 msgstr "_Fichier"
 
-#: ../bin/booh-gui:414
+#: ../bin/booh-gui:418
 msgid "_New (do nothing)"
 msgstr "_Nouveau (ne fait rien)"
 
-#: ../bin/booh-gui:415
+#: ../bin/booh-gui:419
 msgid "_Open"
 msgstr "_Ouvrir"
 
-#: ../bin/booh-gui:417
+#: ../bin/booh-gui:421
 msgid "_Save (do nothing - autosave on quit)"
 msgstr "_Sauver (ne fait rien - sauvegarde automatique au moment de quitter)"
 
-#: ../bin/booh-gui:418
+#: ../bin/booh-gui:422
 msgid "Save _as... (do nothing)"
 msgstr "Sauvegarder _sous... (ne fait rien)"
 
-#: ../bin/booh-gui:420
+#: ../bin/booh-gui:424
 msgid "_Quit"
 msgstr "_Quitter"
 
-#: ../bin/booh-gui:425
+#: ../bin/booh-gui:429
 msgid "Open file"
 msgstr "Ouverture d'un fichier"
 
-#: ../bin/booh-gui:519
+#: ../bin/booh-gui:523
 msgid "Ready."
 msgstr "Prêt."