[Backup-manager-commits] r528 - in backup-manager/trunk: . doc lib man po

Tue Jan 2 14:54:03 CET 2007

Author: sukria
Date: 2007-01-02 14:54:03 +0100 (Tue, 02 Jan 2007)
New Revision: 528

Modified:
   backup-manager/trunk/ChangeLog
   backup-manager/trunk/doc/user-guide.sgml
   backup-manager/trunk/lib/backup-methods.sh
   backup-manager/trunk/lib/sanitize.sh
   backup-manager/trunk/man/backup-manager-upload.8
   backup-manager/trunk/po/cs.po
   backup-manager/trunk/po/de.po
   backup-manager/trunk/po/es.po
   backup-manager/trunk/po/fr.po
   backup-manager/trunk/po/it.po
   backup-manager/trunk/po/nl.po
   backup-manager/trunk/po/vi.po
Log:
2007-01-02	Alexis Sukrieh	<sukria at backup-manager.org>

	* lib/backup-methods.sh
	  + Fix the security vulnerability about passing MySQL client password
	  through the commandline. Using ~/.my.cnf instead.
	  (closes: #146)
	* doc/user-guide.sgml
	  + New section about the encryption using GPG.
	  (closes: #132)



Modified: backup-manager/trunk/ChangeLog
===================================================================

--- backup-manager/trunk/ChangeLog	2006-12-29 13:38:39 UTC (rev 527)
+++ backup-manager/trunk/ChangeLog	2007-01-02 13:54:03 UTC (rev 528)
@@ -1,3 +1,14 @@
+2007-01-02	Alexis Sukrieh	<sukria at backup-manager.org>
+
+	* lib/backup-methods.sh
+	  + Fix the security vulnerability about passing MySQL client password
+	  through the commandline. Using ~/.my.cnf instead.
+	  (closes: #146)
+	* doc/user-guide.sgml
+	  + New section about the encryption using GPG.
+	  (closes: #132)
+
+
 2006-12-29	Alexis Sukrieh	<sukria at backup-manager.org>
 
 	* doc/user-guide.sgml, doc/user-guide.txt

Modified: backup-manager/trunk/doc/user-guide.sgml
===================================================================
--- backup-manager/trunk/doc/user-guide.sgml	2006-12-29 13:38:39 UTC (rev 527)
+++ backup-manager/trunk/doc/user-guide.sgml	2007-01-02 13:54:03 UTC (rev 528)
@@ -729,6 +729,21 @@
 This method provides a way to archive MySQL databases, the archives are made with 
 mysqldump (SQL text files) and can be compressed.
 
+<p>
+In versions prior to 0.8, &bmngr; used to pass the MySQL client's password through 
+the command line. As explained by the MySQL manual, that's a security issue as
+the password is then readable for a short time in the /proc directory (or using
+the ps command).
+
+<p>
+To close that vulnerability, the MySQL client password is not passed through
+the command line anymore, it is written in a configuration file located in the
+home directory of the user running &bmngr; : <tt>~/.my.cnf</tt>.
+
+<p>
+If that file doesn't exist at runtime, &bmngr; will create it and will then
+write the password provided in <tt>BM_MYSQL_ADMINPASS</tt> inside. 
+
 <sect2 id="BM_MYSQL_DATABASES"><tt>BM_MYSQL_DATABASES</tt>
 
 <p>
@@ -779,6 +794,29 @@
 export BM_MYSQL_ADMINLOGIN="root"
 </example>
 
+<sect2 id="BM_MYSQL_ADMINPASS"><tt>BM_MYSQL_ADMINPASS</tt>
+
+<p>
+<em>Type: string, default: <tt>undefined</tt>.</em>
+<p>
+The MySQL client password.
+
+<p>
+If you have already made your own ~/.my.cnf configuration file, you don't have
+to set that variable.
+
+<p>
+If you don't know what is the <tt>~/.my.cnf</tt> configuration file, set the password,
+then &bmngr; will take care of creating the MySQL client configuration file.
+
+<p>
+Example:
+
+<example>
+export BM_MYSQL_ADMINPASS="MySecretPass"
+</example>
+
+
 <sect2 id="BM_MYSQL_HOST"><tt>BM_MYSQL_HOST</tt>
 
 <p>

Modified: backup-manager/trunk/lib/backup-methods.sh
===================================================================
--- backup-manager/trunk/lib/backup-methods.sh	2006-12-29 13:38:39 UTC (rev 527)
+++ backup-manager/trunk/lib/backup-methods.sh	2007-01-02 13:54:03 UTC (rev 528)
@@ -136,24 +136,30 @@
         "gzip"|"gz"|"bzip"|"bzip2")
             if [ "$compress" = "gzip" ] || 
                [ "$compress" = "gz" ]; then
-               compress=$gzip
+               compress_bin=$gzip
+                if [ -z "$compress_bin" ]; then
+                    error "gzip is not installed but gzip compression needed."
+                fi
                ext="gz"
             fi
             if [ "$compress" = "bzip2" ] || 
                [ "$compress" = "bzip" ]; then
-               compress=$bzip
+               compress_bin=$bzip
+                if [ -z "$compress_bin" ]; then
+                    error "bzip2 is not installed but bzip2 compression needed."
+                fi
                ext="bz2"
             fi
 
-            if [ -x $compress ]; then
-                debug "$command 2>$logfile > $file_to_create"
+            if [ -n "$compress_bin" ] && [ -x "$compress_bin" ]; then
+                debug "$command > $file_to_create 2> $logfile"
                 tail_logfile "$logfile"
                 if [ "$BM_ENCRYPTION_METHOD" = "gpg" ]; then
-                    $command | $compress -f -q -9 | $gpg -r "$BM_ENCRYPTION_RECIPIENT" -e > $file_to_create.$ext.gpg 2> $logfile
-                    debug "$command | $compress -f -q -9 | $gpg -r \"$BM_ENCRYPTION_RECIPIENT\" -e > $file_to_create.$ext.gpg 2> $logfile"
+                    $command | $compress_bin -f -q -9 | $gpg -r "$BM_ENCRYPTION_RECIPIENT" -e > $file_to_create.$ext.gpg 2> $logfile
+                    debug "$command | $compress_bin -f -q -9 | $gpg -r \"$BM_ENCRYPTION_RECIPIENT\" -e > $file_to_create.$ext.gpg 2> $logfile"
                     file_to_create="$file_to_create.$ext.gpg"
                 else
-                    $command | $compress -f -q -9 > $file_to_create.$ext 2> $logfile
+                    $command | $compress_bin -f -q -9 > $file_to_create.$ext 2> $logfile
                     file_to_create="$file_to_create.$ext"
                 fi
 
@@ -825,7 +831,21 @@
         opt="--opt"
     fi
     
-    base_command="$mysqldump $opt -u$BM_MYSQL_ADMINLOGIN -p$BM_MYSQL_ADMINPASS -h$BM_MYSQL_HOST -P$BM_MYSQL_PORT"
+    # if a MySQL Client conffile exists, the password must be inside
+    if [ -f "$HOME/.my.cnf" ]; then
+        info "Using existing MySQL client configuration file: \$HOME/.my.cnf"
+    # we create a default one, just with the password
+    else
+        if [ -z "$BM_MYSQL_ADMINPASS" ]; then
+            error "You have to set BM_MYSQL_ADMINPASS in order to use the mysql method."
+        fi
+        warning "Creating a default MySQL client configuration file: \$HOME/.my.cnf"
+        echo "[client]" > $HOME/.my.cnf 
+        echo "# The following password will be sent to all standard MySQL clients" >> $HOME/.my.cnf 
+        echo "password=\"$BM_MYSQL_ADMINPASS\"" >> $HOME/.my.cnf
+        chmod 600 $HOME/.my.cnf
+    fi
+    base_command="$mysqldump $opt -u$BM_MYSQL_ADMINLOGIN -h$BM_MYSQL_HOST -P$BM_MYSQL_PORT"
     compress="$BM_MYSQL_FILETYPE"	
 
     for database in $BM_MYSQL_DATABASES

Modified: backup-manager/trunk/lib/sanitize.sh
===================================================================
--- backup-manager/trunk/lib/sanitize.sh	2006-12-29 13:38:39 UTC (rev 527)
+++ backup-manager/trunk/lib/sanitize.sh	2007-01-02 13:54:03 UTC (rev 528)
@@ -212,7 +212,6 @@
 
 if [ "$BM_ARCHIVE_METHOD" = "mysql" ]; then
 	confkey_require "BM_MYSQL_ADMINLOGIN" "root"
-	confkey_require "BM_MYSQL_ADMINPASS" ""
 	confkey_require "BM_MYSQL_HOST" "localhost"
 	confkey_require "BM_MYSQL_PORT" "3306"
 	confkey_require "BM_MYSQL_FILETYPE" "tar.gz"

Modified: backup-manager/trunk/man/backup-manager-upload.8
===================================================================
--- backup-manager/trunk/man/backup-manager-upload.8	2006-12-29 13:38:39 UTC (rev 527)
+++ backup-manager/trunk/man/backup-manager-upload.8	2007-01-02 13:54:03 UTC (rev 528)
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.32
+.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.14
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -25,11 +25,11 @@
 ..
 .\" Set up some character translations and predefined strings.  \*(-- will
 .\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
-.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
-.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
-.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
-.\" nothing in troff, for use with C<>.
-.tr \(*W-
+.\" double quote, and \*(R" will give a right double quote.  | will give a
+.\" real vertical bar.  \*(C+ will give a nicer C++.  Capital omega is used to
+.\" do unbreakable dashes and therefore won't be available.  \*(C` and \*(C'
+.\" expand to `' in nroff, nothing in troff, for use with C<>.
+.tr \(*W-|\(bv\*(Tr
 .ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
 .ie n \{\
 .    ds -- \(*W-
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "BACKUP-MANAGER-UPLOAD 1"
-.TH BACKUP-MANAGER-UPLOAD 1 "2006-09-08" "perl v5.8.8" "backup-manager-upload"
+.TH BACKUP-MANAGER-UPLOAD 1 "2007-01-02" "perl v5.8.4" "backup-manager-upload"
 .SH "NAME"
 backup\-manager\-upload \- Multiprotocol uploader for backup\-manager.
 .SH "SYNOPSIS"

Modified: backup-manager/trunk/po/cs.po
===================================================================
--- backup-manager/trunk/po/cs.po	2006-12-29 13:38:39 UTC (rev 527)
+++ backup-manager/trunk/po/cs.po	2007-01-02 13:54:03 UTC (rev 528)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: backup-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-20 16:36+0200\n"
+"POT-Creation-Date: 2007-01-02 12:58+0100\n"
 "PO-Revision-Date: 2006-09-05 22:14+0200\n"
 "Last-Translator: Miroslav Kure <kurem at debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech at lists.debian.org>\n"
@@ -20,159 +20,180 @@
 msgid "$file_to_create: ok (${size}M,"
 msgstr "$file_to_create: ok (${size}M,"
 
-#: ../lib/backup-methods.sh:48
+#: ../lib/backup-methods.sh:54
 #, sh-format
 msgid "Unable to purge duplicates of $file_to_create"
 msgstr "Nemohu smazat duplikÃ¡ty $file_to_create"
 
-#: ../lib/backup-methods.sh:53
+#: ../lib/backup-methods.sh:59
 #, sh-format
 msgid "Unable to change the owner of \"$file_to_create\"."
 msgstr "Nemohu zmÄ›nit vlastnÃka \"$file_to_create\"."
 
-#: ../lib/backup-methods.sh:55
+#: ../lib/backup-methods.sh:61
 #, sh-format
 msgid "Unable to change file permissions of \"$file_to_create\"."
 msgstr "Nemohu zmÄ›nit oprÃ¡vnÄ›nÃ k \"$file_to_create\"."
 
-#: ../lib/backup-methods.sh:80
+#: ../lib/backup-methods.sh:72
+#, fuzzy
+msgid "Warning, process interrupted."
+msgstr "VarovÃ¡nÃ, proces pÅ™eruÅ¡en, archivy mohou bÃ½t poruÅ¡eny."
+
+#: ../lib/backup-methods.sh:76
+#, fuzzy, sh-format
+msgid "Removing archive \"$bm_pending_archive\" (build interrupted)."
+msgstr "OdstraÅˆuji archiv \"$archive\"."
+
+#: ../lib/backup-methods.sh:82
 #, sh-format
+msgid ""
+"Restoring incremental-building details list: \"$bm_pending_incremental_list"
+"\"."
+msgstr ""
+
+#: ../lib/backup-methods.sh:116
+#, sh-format
 msgid "Unable to create \"$target\", check $logfile"
 msgstr "Nemohu vytvoÅ™it \"$target\", zkontrolujte $logfile"
 
-#: ../lib/backup-methods.sh:94
+#: ../lib/backup-methods.sh:130
 #, sh-format
 msgid "File $file_to_create already exists, skipping."
 msgstr "Soubor $file_to_create jiÅ¾ existuje, pÅ™eskakuji."
 
-#: ../lib/backup-methods.sh:108 ../lib/backup-methods.sh:128
-#: ../lib/backup-methods.sh:149
+#: ../lib/backup-methods.sh:161 ../lib/backup-methods.sh:185
 #, sh-format
 msgid "Unable to exec $command; check $logfile"
 msgstr "Nemohu spustit $command, zkontrolujte $logfile"
 
-#: ../lib/backup-methods.sh:116
-#, sh-format
-msgid "Compressor $compress requires $gzip."
+#: ../lib/backup-methods.sh:167
+#, fuzzy, sh-format
+msgid "Compressor $compress is needed."
 msgstr "Komprese $compress vyÅ¾aduje $gzip."
 
-#: ../lib/backup-methods.sh:136
+#: ../lib/backup-methods.sh:192
 #, sh-format
-msgid "Compressor $compress requires $bzip."
-msgstr "Komprese $compress vyÅ¾aduje $bzip."
-
-#: ../lib/backup-methods.sh:156
-#, sh-format
 msgid "No such compressor supported: $compress."
 msgstr "Tato komprese nenÃ podporovanÃ¡: $compress."
 
-#: ../lib/backup-methods.sh:162
+#: ../lib/backup-methods.sh:198
 #, sh-format
 msgid "Unable to find $file_to_create"
 msgstr "Nemohu najÃt $file_to_create"
 
-#: ../lib/backup-methods.sh:289
+#: ../lib/backup-methods.sh:325
 msgid "No frequency given, set BM_TARBALLINC_MASTERDATETYPE."
 msgstr "Nebyla zadÃ¡na frekvence, nastavte BM_TARBALLINC_MASTERDATETYPE."
 
-#: ../lib/backup-methods.sh:300
+#: ../lib/backup-methods.sh:336
 #, sh-format
 msgid "Unknown frequency: $BM_TARBALLINC_MASTERDATETYPE"
 msgstr "NeznÃ¡mÃ¡ frekvence: $BM_TARBALLINC_MASTERDATETYPE"
 
-#: ../lib/backup-methods.sh:328
+#: ../lib/backup-methods.sh:369
 #, sh-format
 msgid "Building master backup for target: \"$dir_name\"."
 msgstr "VytvÃ¡Å™Ãm hlavnÃ zÃ¡lohu pro cÃl: \"$dir_name\"."
 
-#: ../lib/backup-methods.sh:452
+#: ../lib/backup-methods.sh:493
 #, sh-format
 msgid "The archive type \"tar.bz2\" depends on the tool \"$bzip\"."
 msgstr "Typ archivu \"tar.bz2\" zÃ¡visÃ na nÃ¡stroji \"$bzip\"."
 
-#: ../lib/backup-methods.sh:459
+#: ../lib/backup-methods.sh:500
 #, sh-format
 msgid "The archive type \"tar.lz\" depends on the tool \"$lzma\"."
 msgstr "Typ archivu \"tar.lz\" zÃ¡visÃ na nÃ¡stroji \"$lzma\"."
 
-#: ../lib/backup-methods.sh:466
+#: ../lib/backup-methods.sh:507
 #, sh-format
 msgid "The archive type \"zip\" depends on the tool \"$zip\"."
 msgstr "Typ archivu \"zip\" zÃ¡visÃ na nÃ¡stroji \"$zip\"."
 
-#: ../lib/backup-methods.sh:472
+#: ../lib/backup-methods.sh:513
 #, sh-format
 msgid "The archive type \"dar\" depends on the tool \"$dar\"."
 msgstr "Typ archivu \"dar\" zÃ¡visÃ na nÃ¡stroji \"$dar\"."
 
-#: ../lib/backup-methods.sh:478 ../lib/backup-methods.sh:579
-#: ../lib/backup-methods.sh:620
+#: ../lib/backup-methods.sh:519 ../lib/backup-methods.sh:619
+#: ../lib/backup-methods.sh:665
 #, sh-format
 msgid "The archive type \"$BM_TARBALL_FILETYPE\" is not supported."
 msgstr "Typ archivu \"$BM_TARBALL_FILETYPE\" nenÃ podporovÃ¡n."
 
-#: ../lib/backup-methods.sh:549
+#: ../lib/backup-methods.sh:589
 msgid "The configuration variable \"BM_ENCRYPTION_RECIPIENT\" must be defined."
 msgstr ""
 "KonfiguraÄnÃ promÄ›nnÃ¡ \"$BM_ENCRYPTION_RECIPIENT\" musÃ bÃ½t definovÃ¡na."
 
-#: ../lib/backup-methods.sh:555
+#: ../lib/backup-methods.sh:595
 #, sh-format
 msgid ""
 "The encryption is not yet possible with \"$BM_TARBALL_FILETYPE\" archives."
 msgstr "Å ifrovÃ¡nÃ archivÅ¯ \"$BM_TARBALL_FILETYPE\" zatÃm nenÃ moÅ¾nÃ©."
 
-#: ../lib/backup-methods.sh:596
+#: ../lib/backup-methods.sh:637
 #, sh-format
 msgid "The program \"$gpg\" is needed."
 msgstr "Je vyÅ¾adovÃ¡n program \"$gpg\"."
 
-#: ../lib/backup-methods.sh:603 ../lib/backup-methods.sh:640
+#: ../lib/backup-methods.sh:646 ../lib/backup-methods.sh:685
 #, sh-format
 msgid "File $file_to_check already exists, skipping."
 msgstr "Soubor $file_to_check jiÅ¾ existuje, pÅ™eskakuji."
 
-#: ../lib/backup-methods.sh:663
+#: ../lib/backup-methods.sh:708
 #, sh-format
 msgid "Target \"$t\" does not exist, skipping."
 msgstr "CÃl \"$t\" neexistuje, pÅ™eskakuji."
 
-#: ../lib/backup-methods.sh:738 ../lib/backup-methods.sh:773
-#: ../lib/backup-methods.sh:804 ../lib/backup-methods.sh:828
+#: ../lib/backup-methods.sh:783 ../lib/backup-methods.sh:818
+#: ../lib/backup-methods.sh:860 ../lib/backup-methods.sh:884
 #, sh-format
 msgid "Using method \"$method\"."
 msgstr "PouÅ¾ÃvÃ¡m metodu \"$method\"."
 
-#: ../lib/backup-methods.sh:762
+#: ../lib/backup-methods.sh:807
 msgid "1 error occurred during the tarball generation."
 msgstr "BÄ›hem vytvÃ¡Å™enÃ tar archivu se objevila 1 chyba."
 
-#: ../lib/backup-methods.sh:764
+#: ../lib/backup-methods.sh:809
 #, sh-format
 msgid "$nb_err errors occurred during the tarball generation."
 msgstr "BÄ›hem vytvÃ¡Å™enÃ tar archivu se objevily chyby (celkem $nb_err)."
 
-#: ../lib/backup-methods.sh:775
+#: ../lib/backup-methods.sh:820
 #, sh-format
 msgid "The \"mysql\" method is chosen, but $mysqldump is not found."
 msgstr "Je vybrÃ¡na metoda \"mysql\", avÅ¡ak $mysqldump nelze nalÃ©zt."
 
-#: ../lib/backup-methods.sh:806
+#: ../lib/backup-methods.sh:830
 #, sh-format
+msgid "Using existing MySQL client configuration file: $HOME/.my.cnf"
+msgstr ""
+
+#: ../lib/backup-methods.sh:833
+#, sh-format
+msgid "Creating a default MySQL client configuration file: $HOME/.my.cnf"
+msgstr ""
+
+#: ../lib/backup-methods.sh:862
+#, sh-format
 msgid "The \"svn\" method is chosen, but $svnadmin is not found."
 msgstr "Je vybrÃ¡na metoda \"svn\", avÅ¡ak $svnadmin nelze nalÃ©zt."
 
-#: ../lib/backup-methods.sh:812
+#: ../lib/backup-methods.sh:868
 #, sh-format
 msgid "SVN repository \"$repository\" is not valid; skipping."
 msgstr "SVN repozitÃ¡Å™ \"$repository\" nenÃ platnÃ½; pÅ™eskakuji."
 
-#: ../lib/backup-methods.sh:837
+#: ../lib/backup-methods.sh:893
 #, sh-format
 msgid "Not enough args for this archive ($archive), skipping."
 msgstr "Pro tento archiv ($archive) nemÃ¡m dost argumentÅ¯, pÅ™eskakuji."
 
-#: ../lib/backup-methods.sh:844
+#: ../lib/backup-methods.sh:900
 msgid "Cannot create archive."
 msgstr "Nemohu vytvoÅ™it archiv."
 
@@ -205,7 +226,7 @@
 msgid "Deprecated boolean, $key is set to \"no\", setting \"false\" instead."
 msgstr "ZmÄ›nÄ›n typ boolean, $key mÃ¡ hodnotu \"no\", nastavuji na \"false\"."
 
-#: ../lib/sanitize.sh:251
+#: ../lib/sanitize.sh:258
 #, sh-format
 msgid ""
 "When validating the configuration file $conffile, $nb_warnings warnings were "
@@ -214,94 +235,6 @@
 "PÅ™i ovÄ›Å™ovÃ¡nÃ konfiguraÄnÃho souboru $conffile bylo nalezeno $nb_warnings "
 "varovÃ¡nÃ."
 
-#: ../lib/actions.sh:44
-msgid "No backup method used."
-msgstr "NenÃ pouÅ¾ita Å¾Ã¡dnÃ¡ zÃ¡lohovacÃ metoda."
-
-#: ../lib/actions.sh:47
-#, sh-format
-msgid "No such backup method: $BM_ARCHIVE_METHOD"
-msgstr "Tato zÃ¡lohovacÃ metoda neexistuje: $BM_ARCHIVE_METHOD"
-
-#: ../lib/actions.sh:56
-#, sh-format
-msgid "Unable to change the owner of \"$md5file\"."
-msgstr "Nemohu zmÄ›nit vlastnÃka \"$md5file\"."
-
-#: ../lib/actions.sh:58
-#, sh-format
-msgid "Unable to change file permissions of \"$md5file\"."
-msgstr "Nemohu zmÄ›nit oprÃ¡vnÄ›nÃ k \"$md5file\"."
-
-#: ../lib/actions.sh:90
-msgid "No upload method used."
-msgstr "NenÃ pouÅ¾ita Å¾Ã¡dnÃ¡ nahrÃ¡vacÃ metoda."
-
-#: ../lib/actions.sh:93
-#, sh-format
-msgid "The upload method \"$method\" is not supported; skipping."
-msgstr "NahrÃ¡vacÃ metoda \"$method\" nenÃ podporovanÃ¡; pÅ™eskakuji."
-
-#: ../lib/actions.sh:105
-#, sh-format
-msgid "Cleaning $BM_REPOSITORY_ROOT"
-msgstr "ÄŒistÃm $BM_REPOSITORY_ROOT"
-
-#: ../lib/actions.sh:118
-#, sh-format
-msgid "Running pre-command: $BM_PRE_BACKUP_COMMAND."
-msgstr "SpouÅ¡tÃm ÃºvodnÃ pÅ™Ãkaz: $BM_PRE_BACKUP_COMMAND."
-
-#: ../lib/actions.sh:122
-msgid "Pre-command failed. Stopping the process."
-msgstr "ÃšvodnÃ pÅ™Ãkaz selhal. Zastavuji proces."
-
-#: ../lib/actions.sh:127
-#, sh-format
-msgid "Pre-command returned: \"$RET\" (success)."
-msgstr "ÃšvodnÃ pÅ™Ãkaz vrÃ¡til: \"$RET\" (ÃºspÄ›ch)."
-
-#: ../lib/actions.sh:139
-#, sh-format
-msgid "Running post-command: $BM_POST_BACKUP_COMMAND"
-msgstr "SpouÅ¡tÃm zÃ¡vÄ›reÄnÃ½ pÅ™Ãkaz: $BM_POST_BACKUP_COMMAND"
-
-#: ../lib/actions.sh:143
-msgid "Post-command failed."
-msgstr "ZÃ¡vÄ›reÄnÃ½ pÅ™Ãkaz selhal."
-
-#: ../lib/actions.sh:148
-#, sh-format
-msgid "Post-command returned: \"$RET\" (success)."
-msgstr "ZÃ¡vÄ›reÄnÃ½ pÅ™Ãkaz vrÃ¡til: \"$RET\" (ÃºspÄ›ch)."
-
-#: ../lib/actions.sh:175
-msgid ""
-"The BM_TARBALL_FILETYPE conf key is set to \"zip\" but zip is not installed."
-msgstr ""
-"KonfiguraÄnÃ klÃÄ BM_TARBALL_FILETYPE je nastaven na \"zip\", ale zip nenÃ "
-"nainstalovÃ¡n."
-
-#: ../lib/actions.sh:180
-msgid ""
-"The BM_TARBALL_FILETYPE conf key is set to \"bzip2\" but bzip2 is not "
-"installed."
-msgstr ""
-"KonfiguraÄnÃ klÃÄ BM_TARBALL_FILETYPE je nastaven na \"bzip2\", ale bzip2 "
-"nenÃ nainstalovÃ¡n."
-
-#: ../lib/actions.sh:185
-msgid ""
-"The BM_TARBALL_FILETYPE conf key is set to \"dar\" but dar is not installed."
-msgstr ""
-"KonfiguraÄnÃ klÃÄ BM_TARBALL_FILETYPE je nastaven na \"dar\", ale dar nenÃ "
-"nainstalovÃ¡n."
-
-#: ../lib/actions.sh:197
-#, sh-format
-msgid "The repository $BM_REPOSITORY_ROOT does not exist, creating it."
-msgstr "ÃšloÅ¾iÅ¡tÄ› $BM_REPOSITORY_ROOT neexistuje, vytvÃ¡Å™Ãm je."
-
 #: ../lib/md5sum.sh:30
 msgid "Internal error: bad usage of function get_md5sum_from_file()"
 msgstr "VnitÅ™nÃ chyba: chybnÃ© pouÅ¾itÃ funkce get_md5sum_from_file()"
@@ -380,11 +313,7 @@
 msgid "Disable the purge process."
 msgstr "ZakÃ¡Å¾e promazÃ¡nÃ starÃ½ch archivÅ¯."
 
-#: ../lib/dialog.sh:60
-msgid "Warning, process interrupted, archives may be corrupted."
-msgstr "VarovÃ¡nÃ, proces pÅ™eruÅ¡en, archivy mohou bÃ½t poruÅ¡eny."
-
-#: ../lib/dialog.sh:74 ../lib/dialog.sh:93
+#: ../lib/dialog.sh:62 ../lib/dialog.sh:81
 msgid "Not in interactive mode, cannot continue."
 msgstr "Nejsem v interaktivnÃm reÅ¾imu, nemohu pokraÄovat."
 
@@ -396,10 +325,94 @@
 msgid "Releasing lock"
 msgstr "UvolÅˆuji zÃ¡mek"
 
-#: ../lib/archives.sh:31
-msgid "Internal error: wrong call to bm_merge_incremental_backups()."
-msgstr "VnitÅ™nÃ chyba: chybnÃ© volÃ¡nÃ bm_merge_incremental_backups()."
+#: ../lib/actions.sh:44
+msgid "No backup method used."
+msgstr "NenÃ pouÅ¾ita Å¾Ã¡dnÃ¡ zÃ¡lohovacÃ metoda."
 
+#: ../lib/actions.sh:47
+#, sh-format
+msgid "No such backup method: $BM_ARCHIVE_METHOD"
+msgstr "Tato zÃ¡lohovacÃ metoda neexistuje: $BM_ARCHIVE_METHOD"
+
+#: ../lib/actions.sh:56
+#, sh-format
+msgid "Unable to change the owner of \"$md5file\"."
+msgstr "Nemohu zmÄ›nit vlastnÃka \"$md5file\"."
+
+#: ../lib/actions.sh:58
+#, sh-format
+msgid "Unable to change file permissions of \"$md5file\"."
+msgstr "Nemohu zmÄ›nit oprÃ¡vnÄ›nÃ k \"$md5file\"."
+
+#: ../lib/actions.sh:90
+msgid "No upload method used."
+msgstr "NenÃ pouÅ¾ita Å¾Ã¡dnÃ¡ nahrÃ¡vacÃ metoda."
+
+#: ../lib/actions.sh:93
+#, sh-format
+msgid "The upload method \"$method\" is not supported; skipping."
+msgstr "NahrÃ¡vacÃ metoda \"$method\" nenÃ podporovanÃ¡; pÅ™eskakuji."
+
+#: ../lib/actions.sh:105
+#, sh-format
+msgid "Cleaning $BM_REPOSITORY_ROOT"
+msgstr "ÄŒistÃm $BM_REPOSITORY_ROOT"
+
+#: ../lib/actions.sh:118
+#, sh-format
+msgid "Running pre-command: $BM_PRE_BACKUP_COMMAND."
+msgstr "SpouÅ¡tÃm ÃºvodnÃ pÅ™Ãkaz: $BM_PRE_BACKUP_COMMAND."
+
+#: ../lib/actions.sh:122
+msgid "Pre-command failed. Stopping the process."
+msgstr "ÃšvodnÃ pÅ™Ãkaz selhal. Zastavuji proces."
+
+#: ../lib/actions.sh:127
+#, sh-format
+msgid "Pre-command returned: \"$RET\" (success)."
+msgstr "ÃšvodnÃ pÅ™Ãkaz vrÃ¡til: \"$RET\" (ÃºspÄ›ch)."
+
+#: ../lib/actions.sh:139
+#, sh-format
+msgid "Running post-command: $BM_POST_BACKUP_COMMAND"
+msgstr "SpouÅ¡tÃm zÃ¡vÄ›reÄnÃ½ pÅ™Ãkaz: $BM_POST_BACKUP_COMMAND"
+
+#: ../lib/actions.sh:143
+msgid "Post-command failed."
+msgstr "ZÃ¡vÄ›reÄnÃ½ pÅ™Ãkaz selhal."
+
+#: ../lib/actions.sh:148
+#, sh-format
+msgid "Post-command returned: \"$RET\" (success)."
+msgstr "ZÃ¡vÄ›reÄnÃ½ pÅ™Ãkaz vrÃ¡til: \"$RET\" (ÃºspÄ›ch)."
+
+#: ../lib/actions.sh:175
+msgid ""
+"The BM_TARBALL_FILETYPE conf key is set to \"zip\" but zip is not installed."
+msgstr ""
+"KonfiguraÄnÃ klÃÄ BM_TARBALL_FILETYPE je nastaven na \"zip\", ale zip nenÃ "
+"nainstalovÃ¡n."
+
+#: ../lib/actions.sh:180
+msgid ""
+"The BM_TARBALL_FILETYPE conf key is set to \"bzip2\" but bzip2 is not "
+"installed."
+msgstr ""
+"KonfiguraÄnÃ klÃÄ BM_TARBALL_FILETYPE je nastaven na \"bzip2\", ale bzip2 "
+"nenÃ nainstalovÃ¡n."
+
+#: ../lib/actions.sh:185
+msgid ""
+"The BM_TARBALL_FILETYPE conf key is set to \"dar\" but dar is not installed."
+msgstr ""
+"KonfiguraÄnÃ klÃÄ BM_TARBALL_FILETYPE je nastaven na \"dar\", ale dar nenÃ "
+"nainstalovÃ¡n."
+
+#: ../lib/actions.sh:197
+#, sh-format
+msgid "The repository $BM_REPOSITORY_ROOT does not exist, creating it."
+msgstr "ÃšloÅ¾iÅ¡tÄ› $BM_REPOSITORY_ROOT neexistuje, vytvÃ¡Å™Ãm je."
+
 #: ../lib/files.sh:72 ../lib/files.sh:87
 msgid "No path given."
 msgstr "Nebyla zadÃ¡na cesta."
@@ -482,106 +495,6 @@
 msgid "$file is a duplicate of $file_to_create (using symlink)."
 msgstr "$file je kopiÃ $file_to_create (pouÅ¾ÃvÃ¡m symbolickÃ½ odkaz)."
 
-#: ../lib/upload-methods.sh:38
-msgid "Using the upload method \"ssh\"."
-msgstr "PouÅ¾ÃvÃ¡m nahrÃ¡vacÃ metodu \"ssh\"."
-
-#: ../lib/upload-methods.sh:47 ../lib/upload-methods.sh:85
-msgid "No valid destination found, SSH upload not possible."
-msgstr "Nebyl nalezen platnÃ½ cÃl, nahrÃ¡nÃ pÅ™es SSH nenÃ moÅ¾nÃ©."
-
-#: ../lib/upload-methods.sh:68
-#, sh-format
-msgid ""
-"Error reported by backup-manager-upload for method \"scp\", check \"$logfile"
-"\"."
-msgstr ""
-"Metoda \"scp\" programu backup-manager-upload vrÃ¡tila chybu, zkontrolujte "
-"\"$logfile\"."
-
-#: ../lib/upload-methods.sh:76
-msgid "Using the upload method \"ssh-gpg\"."
-msgstr "PouÅ¾ÃvÃ¡m nahrÃ¡vacÃ metodu \"ssh-gpg\"."
-
-#: ../lib/upload-methods.sh:88
-msgid ""
-"No gpg recipient given. Argument is mandatory if upload method ssh-gpg is "
-"used."
-msgstr ""
-"Nebyl zadÃ¡n Å¾Ã¡dnÃ½ gpg pÅ™Ãjemce. PÅ™i pouÅ¾itÃ metody ssh-gpg je argument "
-"povinnÃ½."
-
-#: ../lib/upload-methods.sh:105
-#, sh-format
-msgid ""
-"Error reported by backup-manager-upload for method \"ssh-gpg\", check "
-"\"$logfile\"."
-msgstr ""
-"Metoda \"ssh-gpg\" programu backup-manager-upload vrÃ¡tila chybu, "
-"zkontrolujte \"$logfile\"."
-
-#: ../lib/upload-methods.sh:112
-msgid "Using the upload method \"ftp\"."
-msgstr "PouÅ¾ÃvÃ¡m nahrÃ¡vacÃ metodu \"ftp\"."
-
-#: ../lib/upload-methods.sh:122
-msgid "No valid destination found, FTP upload not possible."
-msgstr "Nebyl nalezen platnÃ½ cÃl, nahrÃ¡nÃ pÅ™es FTP nenÃ moÅ¾nÃ©."
-
-#: ../lib/upload-methods.sh:139
-#, sh-format
-msgid ""
-"Error reported by backup-manager-upload for method \"ftp\", check \"$logfile"
-"\"."
-msgstr ""
-"Metoda \"ftp\" programu backup-manager-upload vrÃ¡tila chybu, zkontrolujte "
-"\"$logfile\"."
-
-#: ../lib/upload-methods.sh:147
-msgid "Using the upload method \"S3\"."
-msgstr "PouÅ¾ÃvÃ¡m nahrÃ¡vacÃ metodu \"S3\"."
-
-#: ../lib/upload-methods.sh:170
-#, sh-format
-msgid ""
-"Error reported by backup-manager-upload for method \"s3\", check \"$logfile"
-"\"."
-msgstr ""
-"Metoda \"s3\" programu backup-manager-upload vrÃ¡tila chybu, zkontrolujte "
-"\"$logfile\"."
-
-#: ../lib/upload-methods.sh:176
-#, sh-format
-msgid "Uploading $directory to ${host}:${BM_UPLOAD_RSYNC_DESTINATION}"
-msgstr "NahrÃ¡vÃ¡m $directory na ${host}:${BM_UPLOAD_RSYNC_DESTINATION}"
-
-#: ../lib/upload-methods.sh:187
-msgid "Need a key to use rsync (set BM_UPLOAD_SSH_USER, BM_UPLOAD_SSH_KEY)."
-msgstr ""
-"PouÅ¾itÃ rsync vyÅ¾aduje klÃÄ (nastavte BM_UPLOAD_SSH_USER, BM_UPLOAD_SSH_KEY)."
-
-#: ../lib/upload-methods.sh:198
-#, sh-format
-msgid "Upload of $directory with rsync failed; check $logfile."
-msgstr "NahrÃ¡nÃ $directory pomocÃ rsync selhalo; zkontrolujte $logfile."
-
-#: ../lib/upload-methods.sh:217
-msgid "No valid destination found, RSYNC upload not possible."
-msgstr "Nebyl nalezen platnÃ½ cÃl, nahrÃ¡nÃ pÅ™es RSYNC nenÃ moÅ¾nÃ©."
-
-#: ../lib/upload-methods.sh:236
-msgid "No hosts given to the rsync method, set BM_UPLOAD_RSYNC_HOSTS."
-msgstr ""
-"MetodÄ› rsync nebyl pÅ™edÃ¡n Å¾Ã¡dnÃ½ poÄÃtaÄ, nastavte BM_UPLOAD_RSYNC_HOSTS."
-
-#: ../lib/upload-methods.sh:243
-msgid "Using the upload method \"rsync\"."
-msgstr "PouÅ¾ÃvÃ¡m nahrÃ¡vacÃ metodu \"rsync\"."
-
-#: ../lib/upload-methods.sh:250
-msgid "Using the upload method \"rsync-snapshots\"."
-msgstr "PouÅ¾ÃvÃ¡m nahrÃ¡vacÃ metodu \"rsync-snapshots\"."
-
 #: ../lib/burning-methods.sh:38
 #, sh-format
 msgid "Device \"/dev/$device\" is mounted on \"$m\", unmounting it."
@@ -784,6 +697,106 @@
 msgid "Burning content of $index"
 msgstr "Vypaluji obsah $index"
 
+#: ../lib/upload-methods.sh:38
+msgid "Using the upload method \"ssh\"."
+msgstr "PouÅ¾ÃvÃ¡m nahrÃ¡vacÃ metodu \"ssh\"."
+
+#: ../lib/upload-methods.sh:47 ../lib/upload-methods.sh:85
+msgid "No valid destination found, SSH upload not possible."
+msgstr "Nebyl nalezen platnÃ½ cÃl, nahrÃ¡nÃ pÅ™es SSH nenÃ moÅ¾nÃ©."
+
+#: ../lib/upload-methods.sh:68
+#, sh-format
+msgid ""
+"Error reported by backup-manager-upload for method \"scp\", check \"$logfile"
+"\"."
+msgstr ""
+"Metoda \"scp\" programu backup-manager-upload vrÃ¡tila chybu, zkontrolujte "
+"\"$logfile\"."
+
+#: ../lib/upload-methods.sh:76
+msgid "Using the upload method \"ssh-gpg\"."
+msgstr "PouÅ¾ÃvÃ¡m nahrÃ¡vacÃ metodu \"ssh-gpg\"."
+
+#: ../lib/upload-methods.sh:88
+msgid ""
+"No gpg recipient given. Argument is mandatory if upload method ssh-gpg is "
+"used."
+msgstr ""
+"Nebyl zadÃ¡n Å¾Ã¡dnÃ½ gpg pÅ™Ãjemce. PÅ™i pouÅ¾itÃ metody ssh-gpg je argument "
+"povinnÃ½."
+
+#: ../lib/upload-methods.sh:105
+#, sh-format
+msgid ""
+"Error reported by backup-manager-upload for method \"ssh-gpg\", check "
+"\"$logfile\"."
+msgstr ""
+"Metoda \"ssh-gpg\" programu backup-manager-upload vrÃ¡tila chybu, "
+"zkontrolujte \"$logfile\"."
+
+#: ../lib/upload-methods.sh:112
+msgid "Using the upload method \"ftp\"."
+msgstr "PouÅ¾ÃvÃ¡m nahrÃ¡vacÃ metodu \"ftp\"."
+
+#: ../lib/upload-methods.sh:122
+msgid "No valid destination found, FTP upload not possible."
+msgstr "Nebyl nalezen platnÃ½ cÃl, nahrÃ¡nÃ pÅ™es FTP nenÃ moÅ¾nÃ©."
+
+#: ../lib/upload-methods.sh:139
+#, sh-format
+msgid ""
+"Error reported by backup-manager-upload for method \"ftp\", check \"$logfile"
+"\"."
+msgstr ""
+"Metoda \"ftp\" programu backup-manager-upload vrÃ¡tila chybu, zkontrolujte "
+"\"$logfile\"."
+
+#: ../lib/upload-methods.sh:147
+msgid "Using the upload method \"S3\"."
+msgstr "PouÅ¾ÃvÃ¡m nahrÃ¡vacÃ metodu \"S3\"."
+
+#: ../lib/upload-methods.sh:170
+#, sh-format
+msgid ""
+"Error reported by backup-manager-upload for method \"s3\", check \"$logfile"
+"\"."
+msgstr ""
+"Metoda \"s3\" programu backup-manager-upload vrÃ¡tila chybu, zkontrolujte "
+"\"$logfile\"."
+
+#: ../lib/upload-methods.sh:176
+#, sh-format
+msgid "Uploading $directory to ${host}:${BM_UPLOAD_RSYNC_DESTINATION}"
+msgstr "NahrÃ¡vÃ¡m $directory na ${host}:${BM_UPLOAD_RSYNC_DESTINATION}"
+
+#: ../lib/upload-methods.sh:187
+msgid "Need a key to use rsync (set BM_UPLOAD_SSH_USER, BM_UPLOAD_SSH_KEY)."
+msgstr ""
+"PouÅ¾itÃ rsync vyÅ¾aduje klÃÄ (nastavte BM_UPLOAD_SSH_USER, BM_UPLOAD_SSH_KEY)."
+
+#: ../lib/upload-methods.sh:198
+#, sh-format
+msgid "Upload of $directory with rsync failed; check $logfile."
+msgstr "NahrÃ¡nÃ $directory pomocÃ rsync selhalo; zkontrolujte $logfile."
+
+#: ../lib/upload-methods.sh:217
+msgid "No valid destination found, RSYNC upload not possible."
+msgstr "Nebyl nalezen platnÃ½ cÃl, nahrÃ¡nÃ pÅ™es RSYNC nenÃ moÅ¾nÃ©."
+
+#: ../lib/upload-methods.sh:236
+msgid "No hosts given to the rsync method, set BM_UPLOAD_RSYNC_HOSTS."
+msgstr ""
+"MetodÄ› rsync nebyl pÅ™edÃ¡n Å¾Ã¡dnÃ½ poÄÃtaÄ, nastavte BM_UPLOAD_RSYNC_HOSTS."
+
+#: ../lib/upload-methods.sh:243
+msgid "Using the upload method \"rsync\"."
+msgstr "PouÅ¾ÃvÃ¡m nahrÃ¡vacÃ metodu \"rsync\"."
+
+#: ../lib/upload-methods.sh:250
+msgid "Using the upload method \"rsync-snapshots\"."
+msgstr "PouÅ¾ÃvÃ¡m nahrÃ¡vacÃ metodu \"rsync-snapshots\"."
+
 #: ../backup-manager:139
 msgid "The -b option must be followed by a valid date (YYYYMMDD)."
 msgstr "Za volbou -b musÃ nÃ¡sledovat platnÃ½ datum (YYYYMMDD)."
@@ -796,6 +809,12 @@
 msgid "Unable to exec the pre-command"
 msgstr "Nemohu spustit ÃºvodnÃ pÅ™Ãkaz"
 
+#~ msgid "Compressor $compress requires $bzip."
+#~ msgstr "Komprese $compress vyÅ¾aduje $bzip."
+
+#~ msgid "Internal error: wrong call to bm_merge_incremental_backups()."
+#~ msgstr "VnitÅ™nÃ chyba: chybnÃ© volÃ¡nÃ bm_merge_incremental_backups()."
+
 #~ msgid "CDROM burning requires $cdrecord, aborting."
 #~ msgstr "VypalovÃ¡nÃ CD vyÅ¾aduje $cdrecord, konÄÃm."
 

Modified: backup-manager/trunk/po/de.po
===================================================================
--- backup-manager/trunk/po/de.po	2006-12-29 13:38:39 UTC (rev 527)
+++ backup-manager/trunk/po/de.po	2007-01-02 13:54:03 UTC (rev 528)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: backup-manager 0.7.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-20 16:36+0200\n"
+"POT-Creation-Date: 2007-01-02 12:58+0100\n"
 "PO-Revision-Date: 2006-09-08 21:55+0200\n"
 "Last-Translator: Sven Joachim <sven_joachim at web.de>\n"
 "Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -22,103 +22,114 @@
 msgid "$file_to_create: ok (${size}M,"
 msgstr "$file_to_create: ok (${size}M,"
 
-#: ../lib/backup-methods.sh:48
+#: ../lib/backup-methods.sh:54
 #, sh-format
 msgid "Unable to purge duplicates of $file_to_create"
 msgstr "Kann Duplikate von $file_to_create nicht lÃ¶schen"
 
-#: ../lib/backup-methods.sh:53
+#: ../lib/backup-methods.sh:59
 #, sh-format
 msgid "Unable to change the owner of \"$file_to_create\"."
 msgstr "Kann den Besitzer von Â»$file_to_createÂ« nicht Ã¤ndern."
 
-#: ../lib/backup-methods.sh:55
+#: ../lib/backup-methods.sh:61
 #, sh-format
 msgid "Unable to change file permissions of \"$file_to_create\"."
 msgstr "Kann die Zugriffsrechte von Â»$file_to_createÂ« nicht Ã¤ndern."
 
-#: ../lib/backup-methods.sh:80
+#: ../lib/backup-methods.sh:72
+#, fuzzy
+msgid "Warning, process interrupted."
+msgstr "Warnung, Prozess wurde unterbrochen. Archive kÃ¶nnten defekt sein."
+
+#: ../lib/backup-methods.sh:76
+#, fuzzy, sh-format
+msgid "Removing archive \"$bm_pending_archive\" (build interrupted)."
+msgstr "LÃ¶schen des Archivs Â»$archiveÂ«."
+
+#: ../lib/backup-methods.sh:82
 #, sh-format
+msgid ""
+"Restoring incremental-building details list: \"$bm_pending_incremental_list"
+"\"."
+msgstr ""
+
+#: ../lib/backup-methods.sh:116
+#, sh-format
 msgid "Unable to create \"$target\", check $logfile"
 msgstr "Kann Â»$targetÂ« nicht erzeugen, Ã¼berprÃ¼fen Sie $logfile"
 
-#: ../lib/backup-methods.sh:94
+#: ../lib/backup-methods.sh:130
 #, sh-format
 msgid "File $file_to_create already exists, skipping."
 msgstr "Datei $file_to_create existiert bereits, wird Ã¼bergangen."
 
-#: ../lib/backup-methods.sh:108 ../lib/backup-methods.sh:128
-#: ../lib/backup-methods.sh:149
+#: ../lib/backup-methods.sh:161 ../lib/backup-methods.sh:185
 #, sh-format
 msgid "Unable to exec $command; check $logfile"
 msgstr "Kann $command nicht ausfÃ¼hren; Ã¼berprÃ¼fen Sie $logfile"
 
-#: ../lib/backup-methods.sh:116
-#, sh-format
-msgid "Compressor $compress requires $gzip."
+#: ../lib/backup-methods.sh:167
+#, fuzzy, sh-format
+msgid "Compressor $compress is needed."
 msgstr "Kompressor $compress erfordert $gzip."
 
-#: ../lib/backup-methods.sh:136
+#: ../lib/backup-methods.sh:192
 #, sh-format
-msgid "Compressor $compress requires $bzip."
-msgstr "Kompressor $compress erfordert $bzip."
-
-#: ../lib/backup-methods.sh:156
-#, sh-format
 msgid "No such compressor supported: $compress."
 msgstr "Dieser Kompressor wird nicht unterstÃ¼tzt: $compress."
 
-#: ../lib/backup-methods.sh:162
+#: ../lib/backup-methods.sh:198
 #, sh-format
 msgid "Unable to find $file_to_create"
 msgstr "Kann $file_to_create nicht finden"
 
-#: ../lib/backup-methods.sh:289
+#: ../lib/backup-methods.sh:325
 msgid "No frequency given, set BM_TARBALLINC_MASTERDATETYPE."
 msgstr "Keine HÃ¤ufigkeit angegeben, setzen Sie $BM_TARBALLINC_MASTERDATETYPE."
 
-#: ../lib/backup-methods.sh:300
+#: ../lib/backup-methods.sh:336
 #, sh-format
 msgid "Unknown frequency: $BM_TARBALLINC_MASTERDATETYPE"
 msgstr "Unbekannte HÃ¤ufigkeit: $BM_TARBALLINC_MASTERDATETYPE"
 
-#: ../lib/backup-methods.sh:328
+#: ../lib/backup-methods.sh:369
 #, sh-format
 msgid "Building master backup for target: \"$dir_name\"."
 msgstr "Erstellen des Master-Backups fÃ¼r das Ziel Â»$dir_nameÂ«."
 
-#: ../lib/backup-methods.sh:452
+#: ../lib/backup-methods.sh:493
 #, sh-format
 msgid "The archive type \"tar.bz2\" depends on the tool \"$bzip\"."
 msgstr "Der Archivtyp Â»tar.bz2Â« hÃ¤ngt vom Werkzeug Â»$bzipÂ« ab."
 
-#: ../lib/backup-methods.sh:459
+#: ../lib/backup-methods.sh:500
 #, sh-format
 msgid "The archive type \"tar.lz\" depends on the tool \"$lzma\"."
 msgstr "Der Archivtyp Â»tar.lzÂ« hÃ¤ngt vom Werkzeug Â»$lzmaÂ« ab."
 
-#: ../lib/backup-methods.sh:466
+#: ../lib/backup-methods.sh:507
 #, sh-format
 msgid "The archive type \"zip\" depends on the tool \"$zip\"."
 msgstr "Der Archivtyp Â»zipÂ« hÃ¤ngt vom Werkzeug Â»$zipÂ« ab."
 
-#: ../lib/backup-methods.sh:472
+#: ../lib/backup-methods.sh:513
 #, sh-format
 msgid "The archive type \"dar\" depends on the tool \"$dar\"."
 msgstr "Der Archivtyp Â»darÂ« hÃ¤ngt vom Werkzeug Â»$darÂ« ab."
 
-#: ../lib/backup-methods.sh:478 ../lib/backup-methods.sh:579
-#: ../lib/backup-methods.sh:620
+#: ../lib/backup-methods.sh:519 ../lib/backup-methods.sh:619
+#: ../lib/backup-methods.sh:665
 #, sh-format
 msgid "The archive type \"$BM_TARBALL_FILETYPE\" is not supported."
 msgstr "Der Archivtyp Â»$BM_TARBALL_FILETYPEÂ« wird nicht unterstÃ¼tzt."
 
-#: ../lib/backup-methods.sh:549
+#: ../lib/backup-methods.sh:589
 msgid "The configuration variable \"BM_ENCRYPTION_RECIPIENT\" must be defined."
 msgstr ""
 "Die Konfigurationsvariable Â»$BM_ENCRYPTION_RECIPIENTÂ« muss definiert sein."
 
-#: ../lib/backup-methods.sh:555
+#: ../lib/backup-methods.sh:595
 #, sh-format
 msgid ""
 "The encryption is not yet possible with \"$BM_TARBALL_FILETYPE\" archives."
@@ -126,57 +137,67 @@
 "Die VerschlÃ¼sselung ist mit Â»$BM_TARBALL_FILETYPEÂ«-Archiven noch nicht "
 "mÃ¶glich. "
 
-#: ../lib/backup-methods.sh:596
+#: ../lib/backup-methods.sh:637
 #, sh-format
 msgid "The program \"$gpg\" is needed."
 msgstr "Das Programm Â»$gpgÂ« wird benÃ¶tigt."
 
-#: ../lib/backup-methods.sh:603 ../lib/backup-methods.sh:640
+#: ../lib/backup-methods.sh:646 ../lib/backup-methods.sh:685
 #, sh-format
 msgid "File $file_to_check already exists, skipping."
 msgstr "Datei $file_to_check existiert bereits, wird Ã¼bergangen."
 
-#: ../lib/backup-methods.sh:663
+#: ../lib/backup-methods.sh:708
 #, sh-format
 msgid "Target \"$t\" does not exist, skipping."
 msgstr "Ziel Â»$tÂ« existiert nicht, wird Ã¼bergangen."
 
-#: ../lib/backup-methods.sh:738 ../lib/backup-methods.sh:773
-#: ../lib/backup-methods.sh:804 ../lib/backup-methods.sh:828
+#: ../lib/backup-methods.sh:783 ../lib/backup-methods.sh:818
+#: ../lib/backup-methods.sh:860 ../lib/backup-methods.sh:884
 #, sh-format
 msgid "Using method \"$method\"."
 msgstr "Verwende die Methode Â»$methodÂ«."
 
-#: ../lib/backup-methods.sh:762
+#: ../lib/backup-methods.sh:807
 msgid "1 error occurred during the tarball generation."
 msgstr "Beim Erzeugen der TarbÃ¤lle ist ein Fehler aufgetreten."
 
-#: ../lib/backup-methods.sh:764
+#: ../lib/backup-methods.sh:809
 #, sh-format
 msgid "$nb_err errors occurred during the tarball generation."
 msgstr "Beim Erzeugen der TarbÃ¤lle sind $nb_err Fehler aufgetreten."
 
-#: ../lib/backup-methods.sh:775
+#: ../lib/backup-methods.sh:820
 #, sh-format
 msgid "The \"mysql\" method is chosen, but $mysqldump is not found."
 msgstr "Die Â»mysqlÂ«-Methode ist gewÃ¤hlt, aber $mysqldump wurde nicht gefunden."
 
-#: ../lib/backup-methods.sh:806
+#: ../lib/backup-methods.sh:830
 #, sh-format
+msgid "Using existing MySQL client configuration file: $HOME/.my.cnf"
+msgstr ""
+
+#: ../lib/backup-methods.sh:833
+#, sh-format
+msgid "Creating a default MySQL client configuration file: $HOME/.my.cnf"
+msgstr ""
+
+#: ../lib/backup-methods.sh:862
+#, sh-format
 msgid "The \"svn\" method is chosen, but $svnadmin is not found."
 msgstr "Die Â»svnÂ«-Methode ist gewÃ¤hlt, aber $svnadmin wurde nicht gefunden."
 
-#: ../lib/backup-methods.sh:812
+#: ../lib/backup-methods.sh:868
 #, sh-format
 msgid "SVN repository \"$repository\" is not valid; skipping."
 msgstr "SVN-Depot Â»$repositoryÂ« ist nicht gÃ¼ltig; wird Ã¼bergangen."
 
-#: ../lib/backup-methods.sh:837
+#: ../lib/backup-methods.sh:893
 #, sh-format
 msgid "Not enough args for this archive ($archive), skipping."
 msgstr "Zu wenige Argumente fÃ¼r dieses Archiv ($archive), wird Ã¼bergangen."
 
-#: ../lib/backup-methods.sh:844
+#: ../lib/backup-methods.sh:900
 msgid "Cannot create archive."
 msgstr "Kann Archiv nicht erzeugen."
 
@@ -216,7 +237,7 @@
 "Missbilligter boolescher Wert, $key ist auf Â»noÂ« gesetzt, wird stattdessen "
 "auf Â»falseÂ« gesetzt."
 
-#: ../lib/sanitize.sh:251
+#: ../lib/sanitize.sh:258
 #, sh-format
 msgid ""
 "When validating the configuration file $conffile, $nb_warnings warnings were "
@@ -225,6 +246,96 @@
 "Beim ÃœberprÃ¼fen der Konfigurationsdatei $conffile wurden $nb_warnings "
 "Warnungen gefunden."
 
+#: ../lib/md5sum.sh:30
+msgid "Internal error: bad usage of function get_md5sum_from_file()"
+msgstr "Interner Fehler: falscher Aufruf der Funktion get_md5sum_from_file()"
+
+#: ../lib/md5sum.sh:34
+#, sh-format
+msgid "No md5file found: $md5file"
+msgstr "Keine MD5-Datei gefunden: $md5file"
+
+#: ../lib/md5sum.sh:82
+#, sh-format
+msgid "Archive given does not exist in the repository: $archive"
+msgstr "Angegebenes Archiv existiert nicht im Depot: $archive"
+
+#: ../lib/dialog.sh:27
+msgid "Output:"
+msgstr "Ausgabe:"
+
+#: ../lib/dialog.sh:28
+msgid "Print this short help message."
+msgstr "Diesen kurzen Hilfetext ausgeben."
+
+#: ../lib/dialog.sh:29
+msgid "Print what happens on STDOUT."
+msgstr "Auf STDOUT ausgeben, was passiert."
+
+#: ../lib/dialog.sh:30
+msgid "Disable warnings."
+msgstr "Warnungen deaktivieren."
+
+#: ../lib/dialog.sh:33
+msgid "Single actions:"
+msgstr "Einzelne Aktionen:"
+
+#: ../lib/dialog.sh:34
+msgid "Just upload the files of the day."
+msgstr "Nur die Dateien des Tages hochladen."
+
+#: ../lib/dialog.sh:35
+msgid "Just burn the files of the day."
+msgstr "Nur die Dateien des Tages brennen."
+
+#: ../lib/dialog.sh:36
+msgid "Just test the md5 sums."
+msgstr "Nur die MD5-Summen testen."
+
+#: ../lib/dialog.sh:37
+msgid "Just purge old archives."
+msgstr "Nur alte Archive lÃ¶schen."
+
+#: ../lib/dialog.sh:40
+msgid "Behaviour:"
+msgstr "Verhalten:"
+
+#: ../lib/dialog.sh:41
+msgid "Choose an alternate config file."
+msgstr "Alternative Konfigurationsdatei wÃ¤hlen."
+
+#: ../lib/dialog.sh:42
+msgid "Force overwrite of existing archives."
+msgstr "Ãœberschreiben existierender Archive erzwingen."
+
+#: ../lib/dialog.sh:45
+msgid "Unwanted actions:"
+msgstr "UnerwÃ¼nschte Aktionen:"
+
+#: ../lib/dialog.sh:46
+msgid "Disable the upload process."
+msgstr "Den Upload-Vorgang deaktivieren."
+
+#: ../lib/dialog.sh:47
+msgid "Disable the burning process."
+msgstr "Den Brennvorgang deaktivieren."
+
+#: ../lib/dialog.sh:48
+msgid "Disable the purge process."
+msgstr "LÃ¶schen alter Archive deaktivieren."
+
+#: ../lib/dialog.sh:62 ../lib/dialog.sh:81
+msgid "Not in interactive mode, cannot continue."
+msgstr "Nicht in interaktivem Modus, kann nicht fortsetzen."
+
+#: ../lib/logger.sh:143 ../backup-manager:264
+msgid "Unable to exec post-command."
+msgstr "Kann post-command nicht ausfÃ¼hren."
+
+#: ../lib/logger.sh:145
+msgid "Releasing lock"
+msgstr "Freigabe der Sperre"
+
 #: ../lib/actions.sh:44
 msgid "No backup method used."
 msgstr "Keine Backup-Methode verwendet."
@@ -315,104 +426,6 @@
 msgid "The repository $BM_REPOSITORY_ROOT does not exist, creating it."
 msgstr "Das Depot $BM_REPOSITORY_ROOT existiert nicht, wird angelegt."
 
-#: ../lib/md5sum.sh:30
-msgid "Internal error: bad usage of function get_md5sum_from_file()"
-msgstr "Interner Fehler: falscher Aufruf der Funktion get_md5sum_from_file()"
-
-#: ../lib/md5sum.sh:34
-#, sh-format
-msgid "No md5file found: $md5file"
-msgstr "Keine MD5-Datei gefunden: $md5file"
-
-#: ../lib/md5sum.sh:82
-#, sh-format
-msgid "Archive given does not exist in the repository: $archive"
-msgstr "Angegebenes Archiv existiert nicht im Depot: $archive"
-
-#: ../lib/dialog.sh:27
-msgid "Output:"
-msgstr "Ausgabe:"
-
-#: ../lib/dialog.sh:28
-msgid "Print this short help message."
-msgstr "Diesen kurzen Hilfetext ausgeben."
-
-#: ../lib/dialog.sh:29
-msgid "Print what happens on STDOUT."
-msgstr "Auf STDOUT ausgeben, was passiert."
-
-#: ../lib/dialog.sh:30
-msgid "Disable warnings."
-msgstr "Warnungen deaktivieren."
-
-#: ../lib/dialog.sh:33
-msgid "Single actions:"
-msgstr "Einzelne Aktionen:"
-
-#: ../lib/dialog.sh:34
-msgid "Just upload the files of the day."
-msgstr "Nur die Dateien des Tages hochladen."
-
-#: ../lib/dialog.sh:35
-msgid "Just burn the files of the day."
-msgstr "Nur die Dateien des Tages brennen."
-
-#: ../lib/dialog.sh:36
-msgid "Just test the md5 sums."
-msgstr "Nur die MD5-Summen testen."
-
-#: ../lib/dialog.sh:37
-msgid "Just purge old archives."
-msgstr "Nur alte Archive lÃ¶schen."
-
-#: ../lib/dialog.sh:40
-msgid "Behaviour:"
-msgstr "Verhalten:"
-
-#: ../lib/dialog.sh:41
-msgid "Choose an alternate config file."
-msgstr "Alternative Konfigurationsdatei wÃ¤hlen."
-
-#: ../lib/dialog.sh:42
-msgid "Force overwrite of existing archives."
-msgstr "Ãœberschreiben existierender Archive erzwingen."
-
-#: ../lib/dialog.sh:45
-msgid "Unwanted actions:"
-msgstr "UnerwÃ¼nschte Aktionen:"
-
-#: ../lib/dialog.sh:46
-msgid "Disable the upload process."
-msgstr "Den Upload-Vorgang deaktivieren."
-
-#: ../lib/dialog.sh:47
-msgid "Disable the burning process."
-msgstr "Den Brennvorgang deaktivieren."
-
-#: ../lib/dialog.sh:48
-msgid "Disable the purge process."
-msgstr "LÃ¶schen alter Archive deaktivieren."
-
-#: ../lib/dialog.sh:60
-msgid "Warning, process interrupted, archives may be corrupted."
-msgstr "Warnung, Prozess wurde unterbrochen. Archive kÃ¶nnten defekt sein."
-
-#: ../lib/dialog.sh:74 ../lib/dialog.sh:93
-msgid "Not in interactive mode, cannot continue."
-msgstr "Nicht in interaktivem Modus, kann nicht fortsetzen."
-
-#: ../lib/logger.sh:143 ../backup-manager:264
-msgid "Unable to exec post-command."
-msgstr "Kann post-command nicht ausfÃ¼hren."
-
-#: ../lib/logger.sh:145
-msgid "Releasing lock"
-msgstr "Freigabe der Sperre"
-
-#: ../lib/archives.sh:31
-msgid "Internal error: wrong call to bm_merge_incremental_backups()."
-msgstr "Systemfehler: falscher Aufruf von bm_merge_incremental_backups()."
-
 #: ../lib/files.sh:72 ../lib/files.sh:87
 msgid "No path given."
 msgstr "Kein Pfad angegeben."
@@ -497,109 +510,6 @@
 msgid "$file is a duplicate of $file_to_create (using symlink)."
 msgstr "$file ist ein Duplikat von $file_to_create (verwende Symlink)."
 
-#: ../lib/upload-methods.sh:38
-msgid "Using the upload method \"ssh\"."
-msgstr "Verwende die Upload-Methode Â»sshÂ«."
-
-#: ../lib/upload-methods.sh:47 ../lib/upload-methods.sh:85
-msgid "No valid destination found, SSH upload not possible."
-msgstr "Kein gÃ¼ltiges Ziel gefunden, SSH-Upload ist nicht mÃ¶glich."
-
-#: ../lib/upload-methods.sh:68
-#, sh-format
-msgid ""
-"Error reported by backup-manager-upload for method \"scp\", check \"$logfile"
-"\"."
-msgstr ""
-"Fehler berichtet von backup-manager-upload fÃ¼r Methode Â»scpÂ«, Ã¼berprÃ¼fen Sie "
-"Â»$logfileÂ«."
-
-#: ../lib/upload-methods.sh:76
-msgid "Using the upload method \"ssh-gpg\"."
-msgstr "Verwende die Upload-Methode Â»ssh-gpgÂ«."
-
-#: ../lib/upload-methods.sh:88
-msgid ""
-"No gpg recipient given. Argument is mandatory if upload method ssh-gpg is "
-"used."
-msgstr ""
-"Kein gpg-EmpfÃ¤nger angegeben. Argument ist obligatorisch, falls die Upload-"
-"Methode ssh-gpg verwendet wird."
-
-#: ../lib/upload-methods.sh:105
-#, sh-format
-msgid ""
-"Error reported by backup-manager-upload for method \"ssh-gpg\", check "
-"\"$logfile\"."
-msgstr ""
-"Fehler berichtet von backup-manager-upload fÃ¼r Methode Â»ssh-gpgÂ«, Ã¼berprÃ¼fen "
-"Sie Â»$logfileÂ«."
-
-#: ../lib/upload-methods.sh:112
-msgid "Using the upload method \"ftp\"."
-msgstr "Verwende die Upload-Methode Â»ftpÂ«."
-
-#: ../lib/upload-methods.sh:122
-msgid "No valid destination found, FTP upload not possible."
-msgstr "Kein gÃ¼ltiges Ziel gefunden, FTP-Upload ist nicht mÃ¶glich."
-
-#: ../lib/upload-methods.sh:139
-#, sh-format
-msgid ""
-"Error reported by backup-manager-upload for method \"ftp\", check \"$logfile"
-"\"."
-msgstr ""
-"Fehler berichtet von backup-manager-upload fÃ¼r Methode Â»ftpÂ«, Ã¼berprÃ¼fen Sie "
-"Â»$logfileÂ«."
-
-#: ../lib/upload-methods.sh:147
-msgid "Using the upload method \"S3\"."
-msgstr "Verwende die Upload-Methode Â»S3Â«."
-
-#: ../lib/upload-methods.sh:170
-#, sh-format
-msgid ""
-"Error reported by backup-manager-upload for method \"s3\", check \"$logfile"
-"\"."
-msgstr ""
-"Fehler berichtet von backup-manager-upload fÃ¼r Methode Â»s3Â«, Ã¼berprÃ¼fen Sie "
-"Â»$logfileÂ«."
-
-#: ../lib/upload-methods.sh:176
-#, sh-format
-msgid "Uploading $directory to ${host}:${BM_UPLOAD_RSYNC_DESTINATION}"
-msgstr "Hochladen von $directory auf ${host}:${BM_UPLOAD_RSYNC_DESTINATION}"
-
-#: ../lib/upload-methods.sh:187
-msgid "Need a key to use rsync (set BM_UPLOAD_SSH_USER, BM_UPLOAD_SSH_KEY)."
-msgstr ""
-"Ein SchlÃ¼ssel wird benÃ¶tigt, um rsync auszufÃ¼hren (setzen Sie "
-"BM_UPLOAD_SSH_USER, BM_UPLOAD_SSH_KEY)."
-
-#: ../lib/upload-methods.sh:198
-#, sh-format
-msgid "Upload of $directory with rsync failed; check $logfile."
-msgstr ""
-"Hochladen von $directory mit rsync fehlgeschlagen; Ã¼berprÃ¼fen Sie $logfile."
-
-#: ../lib/upload-methods.sh:217
-msgid "No valid destination found, RSYNC upload not possible."
-msgstr "Kein gÃ¼ltiges Ziel gefunden, RSYNC-Upload ist nicht mÃ¶glich."
-
-#: ../lib/upload-methods.sh:236
-msgid "No hosts given to the rsync method, set BM_UPLOAD_RSYNC_HOSTS."
-msgstr ""
-"Keine Hosts fÃ¼r die rsync-Methode angegeben, setzen Sie "
-"BM_UPLOAD_RSYNC_HOSTS."
-
-#: ../lib/upload-methods.sh:243
-msgid "Using the upload method \"rsync\"."
-msgstr "Verwende die Upload-Methode Â»rsyncÂ«."
-
-#: ../lib/upload-methods.sh:250
-msgid "Using the upload method \"rsync-snapshots\"."
-msgstr "Verwende die Upload-Methode Â»rsync-snapshotsÂ«."
-
 #: ../lib/burning-methods.sh:38
 #, sh-format
 msgid "Device \"/dev/$device\" is mounted on \"$m\", unmounting it."
@@ -803,6 +713,109 @@
 msgid "Burning content of $index"
 msgstr "Brennen des Inhalts von $index"
 
+#: ../lib/upload-methods.sh:38
+msgid "Using the upload method \"ssh\"."
+msgstr "Verwende die Upload-Methode Â»sshÂ«."
+
+#: ../lib/upload-methods.sh:47 ../lib/upload-methods.sh:85
+msgid "No valid destination found, SSH upload not possible."
+msgstr "Kein gÃ¼ltiges Ziel gefunden, SSH-Upload ist nicht mÃ¶glich."
+
+#: ../lib/upload-methods.sh:68
+#, sh-format
+msgid ""
+"Error reported by backup-manager-upload for method \"scp\", check \"$logfile"
+"\"."
+msgstr ""
+"Fehler berichtet von backup-manager-upload fÃ¼r Methode Â»scpÂ«, Ã¼berprÃ¼fen Sie "
+"Â»$logfileÂ«."
+
+#: ../lib/upload-methods.sh:76
+msgid "Using the upload method \"ssh-gpg\"."
+msgstr "Verwende die Upload-Methode Â»ssh-gpgÂ«."
+
+#: ../lib/upload-methods.sh:88
+msgid ""
+"No gpg recipient given. Argument is mandatory if upload method ssh-gpg is "
+"used."
+msgstr ""
+"Kein gpg-EmpfÃ¤nger angegeben. Argument ist obligatorisch, falls die Upload-"
+"Methode ssh-gpg verwendet wird."
+
+#: ../lib/upload-methods.sh:105
+#, sh-format
+msgid ""
+"Error reported by backup-manager-upload for method \"ssh-gpg\", check "
+"\"$logfile\"."
+msgstr ""
+"Fehler berichtet von backup-manager-upload fÃ¼r Methode Â»ssh-gpgÂ«, Ã¼berprÃ¼fen "
+"Sie Â»$logfileÂ«."
+
+#: ../lib/upload-methods.sh:112
+msgid "Using the upload method \"ftp\"."
+msgstr "Verwende die Upload-Methode Â»ftpÂ«."
+
+#: ../lib/upload-methods.sh:122
+msgid "No valid destination found, FTP upload not possible."
+msgstr "Kein gÃ¼ltiges Ziel gefunden, FTP-Upload ist nicht mÃ¶glich."
+
+#: ../lib/upload-methods.sh:139
+#, sh-format
+msgid ""
+"Error reported by backup-manager-upload for method \"ftp\", check \"$logfile"
+"\"."
+msgstr ""
+"Fehler berichtet von backup-manager-upload fÃ¼r Methode Â»ftpÂ«, Ã¼berprÃ¼fen Sie "
+"Â»$logfileÂ«."
+
+#: ../lib/upload-methods.sh:147
+msgid "Using the upload method \"S3\"."
+msgstr "Verwende die Upload-Methode Â»S3Â«."
+
+#: ../lib/upload-methods.sh:170
+#, sh-format
+msgid ""
+"Error reported by backup-manager-upload for method \"s3\", check \"$logfile"
+"\"."
+msgstr ""
+"Fehler berichtet von backup-manager-upload fÃ¼r Methode Â»s3Â«, Ã¼berprÃ¼fen Sie "
+"Â»$logfileÂ«."
+
+#: ../lib/upload-methods.sh:176
+#, sh-format
+msgid "Uploading $directory to ${host}:${BM_UPLOAD_RSYNC_DESTINATION}"
+msgstr "Hochladen von $directory auf ${host}:${BM_UPLOAD_RSYNC_DESTINATION}"
+
+#: ../lib/upload-methods.sh:187
+msgid "Need a key to use rsync (set BM_UPLOAD_SSH_USER, BM_UPLOAD_SSH_KEY)."
+msgstr ""
+"Ein SchlÃ¼ssel wird benÃ¶tigt, um rsync auszufÃ¼hren (setzen Sie "
+"BM_UPLOAD_SSH_USER, BM_UPLOAD_SSH_KEY)."
+
+#: ../lib/upload-methods.sh:198
+#, sh-format
+msgid "Upload of $directory with rsync failed; check $logfile."
+msgstr ""
+"Hochladen von $directory mit rsync fehlgeschlagen; Ã¼berprÃ¼fen Sie $logfile."
+
+#: ../lib/upload-methods.sh:217
+msgid "No valid destination found, RSYNC upload not possible."
+msgstr "Kein gÃ¼ltiges Ziel gefunden, RSYNC-Upload ist nicht mÃ¶glich."
+
+#: ../lib/upload-methods.sh:236
+msgid "No hosts given to the rsync method, set BM_UPLOAD_RSYNC_HOSTS."
+msgstr ""
+"Keine Hosts fÃ¼r die rsync-Methode angegeben, setzen Sie "
+"BM_UPLOAD_RSYNC_HOSTS."
+
+#: ../lib/upload-methods.sh:243
+msgid "Using the upload method \"rsync\"."
+msgstr "Verwende die Upload-Methode Â»rsyncÂ«."
+
+#: ../lib/upload-methods.sh:250
+msgid "Using the upload method \"rsync-snapshots\"."
+msgstr "Verwende die Upload-Methode Â»rsync-snapshotsÂ«."
+
 #: ../backup-manager:139
 msgid "The -b option must be followed by a valid date (YYYYMMDD)."
 msgstr "Auf die Option -b muss ein gÃ¼ltiges Datum (JJJJMMTT) folgen."
@@ -814,3 +827,9 @@
 #: ../backup-manager:214
 msgid "Unable to exec the pre-command"
 msgstr "Kann pre-command nicht ausfÃ¼hren"
+
+#~ msgid "Compressor $compress requires $bzip."
+#~ msgstr "Kompressor $compress erfordert $bzip."
+
+#~ msgid "Internal error: wrong call to bm_merge_incremental_backups()."
+#~ msgstr "Systemfehler: falscher Aufruf von bm_merge_incremental_backups()."

Modified: backup-manager/trunk/po/es.po
===================================================================
--- backup-manager/trunk/po/es.po	2006-12-29 13:38:39 UTC (rev 527)
+++ backup-manager/trunk/po/es.po	2007-01-02 13:54:03 UTC (rev 528)
@@ -30,7 +30,7 @@
 msgstr ""
 "Project-Id-Version: backup-manager 0.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-20 16:36+0200\n"
+"POT-Creation-Date: 2007-01-02 12:58+0100\n"
 "PO-Revision-Date: 2005-12-14 13:07+0100\n"
 "Last-Translator: Carlos Galisteo de Cabo <cgalisteo at k-rolus.net>\n"
 "Language-Team: \n"
@@ -44,165 +44,187 @@
 msgid "$file_to_create: ok (${size}M,"
 msgstr "$file_to_create: ok (${size}M,"
 
-#: ../lib/backup-methods.sh:48
+#: ../lib/backup-methods.sh:54
 #, sh-format
 msgid "Unable to purge duplicates of $file_to_create"
 msgstr "No se pudieron borrar los duplicados de $file_to_create"
 
-#: ../lib/backup-methods.sh:53
+#: ../lib/backup-methods.sh:59
 #, sh-format
 msgid "Unable to change the owner of \"$file_to_create\"."
 msgstr "No se han podido borrar los duplicados de \"$file_to_create\"."
 
-#: ../lib/backup-methods.sh:55
+#: ../lib/backup-methods.sh:61
 #, sh-format
 msgid "Unable to change file permissions of \"$file_to_create\"."
 msgstr "No se han podido borrar los duplicados de \"$file_to_create\"."
 
-#: ../lib/backup-methods.sh:80
+#: ../lib/backup-methods.sh:72
+#, fuzzy
+msgid "Warning, process interrupted."
+msgstr ""
+"Aviso, el proceso se ha interrumpido. Los archivos pueden estar  corruptos."
+
+#: ../lib/backup-methods.sh:76
+#, fuzzy, sh-format
+msgid "Removing archive \"$bm_pending_archive\" (build interrupted)."
+msgstr "Borrando fichero \"$archive\"."
+
+#: ../lib/backup-methods.sh:82
 #, sh-format
+msgid ""
+"Restoring incremental-building details list: \"$bm_pending_incremental_list"
+"\"."
+msgstr ""
+
+#: ../lib/backup-methods.sh:116
+#, sh-format
 msgid "Unable to create \"$target\", check $logfile"
 msgstr "No se pudo crear \"$target\", consulte el fichero $logfile"
 
-#: ../lib/backup-methods.sh:94
+#: ../lib/backup-methods.sh:130
 #, sh-format
 msgid "File $file_to_create already exists, skipping."
 msgstr "El fichero $file_to_create, ya existe. Se ignora."
 
-#: ../lib/backup-methods.sh:108 ../lib/backup-methods.sh:128
-#: ../lib/backup-methods.sh:149
+#: ../lib/backup-methods.sh:161 ../lib/backup-methods.sh:185
 #, sh-format
 msgid "Unable to exec $command; check $logfile"
 msgstr "No se pudo ejecutar $command; consulte el fichero $logfile"
 
-#: ../lib/backup-methods.sh:116
-#, sh-format
-msgid "Compressor $compress requires $gzip."
+#: ../lib/backup-methods.sh:167
+#, fuzzy, sh-format
+msgid "Compressor $compress is needed."
 msgstr "El compresor $compress requiere $gzip"
 
-#: ../lib/backup-methods.sh:136
+#: ../lib/backup-methods.sh:192
 #, sh-format
-msgid "Compressor $compress requires $bzip."
-msgstr "El compresor $compress requiere $bzip"
-
-#: ../lib/backup-methods.sh:156
-#, sh-format
 msgid "No such compressor supported: $compress."
 msgstr "Compresor no soportado: $compress"
 
-#: ../lib/backup-methods.sh:162
+#: ../lib/backup-methods.sh:198
 #, sh-format
 msgid "Unable to find $file_to_create"
 msgstr "No se pudo encontrar $file_to_create"
 
-#: ../lib/backup-methods.sh:289
+#: ../lib/backup-methods.sh:325
 msgid "No frequency given, set BM_TARBALLINC_MASTERDATETYPE."
 msgstr ""
 "No se ha indicado la frecuencia, establÃ©zcala en "
 "BM_TARBALLINC_MASTERDATETYPE"
 
-#: ../lib/backup-methods.sh:300
+#: ../lib/backup-methods.sh:336
 #, sh-format
 msgid "Unknown frequency: $BM_TARBALLINC_MASTERDATETYPE"
 msgstr "Frecuencia desconocida: $BM_TARBALLINC_MASTERDATETYPE"
 
-#: ../lib/backup-methods.sh:328
+#: ../lib/backup-methods.sh:369
 #, sh-format
 msgid "Building master backup for target: \"$dir_name\"."
 msgstr "Creando copia de seguridad maestra para el objetivo : $dir_name"
 
-#: ../lib/backup-methods.sh:452
+#: ../lib/backup-methods.sh:493
 #, sh-format
 msgid "The archive type \"tar.bz2\" depends on the tool \"$bzip\"."
 msgstr "El tipo de fichero \"tar.bz2\" depende de la herramienta \"$bzip\"."
 
-#: ../lib/backup-methods.sh:459
+#: ../lib/backup-methods.sh:500
 #, sh-format
 msgid "The archive type \"tar.lz\" depends on the tool \"$lzma\"."
 msgstr "El tipo de fichero \"tar.lz\" depende de la herramienta \"$lzma\"."
 
-#: ../lib/backup-methods.sh:466
+#: ../lib/backup-methods.sh:507
 #, sh-format
 msgid "The archive type \"zip\" depends on the tool \"$zip\"."
 msgstr "El tipo de fichero \"zip\" depende de la herramienta \"$zip\"."
 
-#: ../lib/backup-methods.sh:472
+#: ../lib/backup-methods.sh:513
 #, sh-format
 msgid "The archive type \"dar\" depends on the tool \"$dar\"."
 msgstr "El tipo de fichero \"dar\" depende de la herramienta \"$dar\"."
 
-#: ../lib/backup-methods.sh:478 ../lib/backup-methods.sh:579
-#: ../lib/backup-methods.sh:620
+#: ../lib/backup-methods.sh:519 ../lib/backup-methods.sh:619
+#: ../lib/backup-methods.sh:665
 #, sh-format
 msgid "The archive type \"$BM_TARBALL_FILETYPE\" is not supported."
 msgstr "El tipo de fichero \"$BM_TARBALL_FILETYPE\" no estÃ¡ soportado."
 
-#: ../lib/backup-methods.sh:549
+#: ../lib/backup-methods.sh:589
 msgid "The configuration variable \"BM_ENCRYPTION_RECIPIENT\" must be defined."
 msgstr ""
 "La variable de configuraciÃ³n \"$BM_ENCRYPTION_RECIPIENT\" debe estar "
 "definida."
 
-#: ../lib/backup-methods.sh:555
+#: ../lib/backup-methods.sh:595
 #, sh-format
 msgid ""
 "The encryption is not yet possible with \"$BM_TARBALL_FILETYPE\" archives."
 msgstr "TodavÃa no es posible cifrar archivos \"$BM_TARBALL_FILETYPE\"."
 
-#: ../lib/backup-methods.sh:596
+#: ../lib/backup-methods.sh:637
 #, sh-format
 msgid "The program \"$gpg\" is needed."
 msgstr "Se necesita el programa \"$gpg\"."
 
-#: ../lib/backup-methods.sh:603 ../lib/backup-methods.sh:640
+#: ../lib/backup-methods.sh:646 ../lib/backup-methods.sh:685
 #, sh-format
 msgid "File $file_to_check already exists, skipping."
 msgstr "El fichero $file_to_check, ya existe. Se ignora."
 
-#: ../lib/backup-methods.sh:663
+#: ../lib/backup-methods.sh:708
 #, sh-format
 msgid "Target \"$t\" does not exist, skipping."
 msgstr "El destino \"$t\" no existe, se omite."
 
-#: ../lib/backup-methods.sh:738 ../lib/backup-methods.sh:773
-#: ../lib/backup-methods.sh:804 ../lib/backup-methods.sh:828
+#: ../lib/backup-methods.sh:783 ../lib/backup-methods.sh:818
+#: ../lib/backup-methods.sh:860 ../lib/backup-methods.sh:884
 #, sh-format
 msgid "Using method \"$method\"."
 msgstr "Utilizando el mÃ©todo de subida \"$method\"."
 
-#: ../lib/backup-methods.sh:762
+#: ../lib/backup-methods.sh:807
 msgid "1 error occurred during the tarball generation."
 msgstr "Ha ocurrido un error durante la generaciÃ³n del archivo comprimido."
 
-#: ../lib/backup-methods.sh:764
+#: ../lib/backup-methods.sh:809
 #, sh-format
 msgid "$nb_err errors occurred during the tarball generation."
 msgstr "$nb_err errores durante la generaciÃ³n del archivo comprimido."
 
-#: ../lib/backup-methods.sh:775
+#: ../lib/backup-methods.sh:820
 #, sh-format
 msgid "The \"mysql\" method is chosen, but $mysqldump is not found."
 msgstr ""
 "El mÃ©todo \"mysql\" estÃ¡ seleccionado, pero no se pudo encontrar "
 "$mysqldump."
 
-#: ../lib/backup-methods.sh:806
+#: ../lib/backup-methods.sh:830
 #, sh-format
+msgid "Using existing MySQL client configuration file: $HOME/.my.cnf"
+msgstr ""
+
+#: ../lib/backup-methods.sh:833
+#, sh-format
+msgid "Creating a default MySQL client configuration file: $HOME/.my.cnf"
+msgstr ""
+
+#: ../lib/backup-methods.sh:862
+#, sh-format
 msgid "The \"svn\" method is chosen, but $svnadmin is not found."
 msgstr ""
 "El mÃ©todo \"svn\" estÃ¡ seleccionado, pero no se pudo encontrar $svnadmin"
 
-#: ../lib/backup-methods.sh:812
+#: ../lib/backup-methods.sh:868
 #, sh-format
 msgid "SVN repository \"$repository\" is not valid; skipping."
 msgstr "El repositorio SVN  \"$repository\" es invÃ¡lido; se omite."
 
-#: ../lib/backup-methods.sh:837
+#: ../lib/backup-methods.sh:893
 #, sh-format
 msgid "Not enough args for this archive ($archive), skipping."
 msgstr "No hay suficientes argumentos para este fichero ($archive), se omite."
 
-#: ../lib/backup-methods.sh:844
+#: ../lib/backup-methods.sh:900
 msgid "Cannot create archive."
 msgstr "No se puede crear el fichero."
 
@@ -240,7 +262,7 @@
 "Valor booleano obsoleto, $key estÃ¡ definido como \"no\", se usarÃ¡ \"false"
 "\" en su lugar."
 
-#: ../lib/sanitize.sh:251
+#: ../lib/sanitize.sh:258
 #, sh-format
 msgid ""
 "When validating the configuration file $conffile, $nb_warnings warnings were "
@@ -249,94 +271,6 @@
 "Se encontraron $nb_warnings avisos al validar el fichero de configuraciÃ³n "
 "$conffile"
 
-#: ../lib/actions.sh:44
-msgid "No backup method used."
-msgstr "No se estÃ¡ usando ningÃºn mÃ©todo de copia de seguridad."
-
-#: ../lib/actions.sh:47
-#, sh-format
-msgid "No such backup method: $BM_ARCHIVE_METHOD"
-msgstr "MÃ©todo de copia de seguridad desconocido: $BM_ARCHIVE_METHOD"
-
-#: ../lib/actions.sh:56
-#, sh-format
-msgid "Unable to change the owner of \"$md5file\"."
-msgstr "No se pudo obtener la fecha de \"$md5file\"."
-
-#: ../lib/actions.sh:58
-#, sh-format
-msgid "Unable to change file permissions of \"$md5file\"."
-msgstr "No se pudieron cambiar los permisos de \"$md5file\"."
-
-#: ../lib/actions.sh:90
-msgid "No upload method used."
-msgstr "No se usÃ³ ningÃºn mÃ©todo de subida."
-
-#: ../lib/actions.sh:93
-#, sh-format
-msgid "The upload method \"$method\" is not supported; skipping."
-msgstr "El mÃ©todo de subida \"$method\" no estÃ¡ soportado; Se omitirÃ¡."
-
-#: ../lib/actions.sh:105
-#, sh-format
-msgid "Cleaning $BM_REPOSITORY_ROOT"
-msgstr "Limpiando $BM_REPOSITORY_ROOT."
-
-#: ../lib/actions.sh:118
-#, sh-format
-msgid "Running pre-command: $BM_PRE_BACKUP_COMMAND."
-msgstr "Ejecutando la orden previa al proceso: $BM_PRE_BACKUP_COMMAND."
-
-#: ../lib/actions.sh:122
-msgid "Pre-command failed. Stopping the process."
-msgstr "La orden previa al proceso fallÃ³. Parando el proceso."
-
-#: ../lib/actions.sh:127
-#, sh-format
-msgid "Pre-command returned: \"$RET\" (success)."
-msgstr "La orden previa al proceso devolviÃ³:\"$RET\" (Ã©xito)."
-
-#: ../lib/actions.sh:139
-#, sh-format
-msgid "Running post-command: $BM_POST_BACKUP_COMMAND"
-msgstr "Ejecutando la orden posterior al proceso: $BM_POST_BACKUP_COMMAND."
-
-#: ../lib/actions.sh:143
-msgid "Post-command failed."
-msgstr "La orden posterior al proceso fallÃ³."
-
-#: ../lib/actions.sh:148
-#, sh-format
-msgid "Post-command returned: \"$RET\" (success)."
-msgstr "La orden posterior al proceso devolviÃ³: \"$RET\" (Ã©xito)."
-
-#: ../lib/actions.sh:175
-msgid ""
-"The BM_TARBALL_FILETYPE conf key is set to \"zip\" but zip is not installed."
-msgstr ""
-"La clave de configuraciÃ³n BM_TARBALL_FILETYPE estÃ¡ establecida como \"zip"
-"\" pero el programa zip no estÃ¡ instalado."
-
-#: ../lib/actions.sh:180
-msgid ""
-"The BM_TARBALL_FILETYPE conf key is set to \"bzip2\" but bzip2 is not "
-"installed."
-msgstr ""
-"La clave de configuraciÃ³n BM_TARBALL_FILETYPE estÃ¡ establecida como \"bzip2"
-"\" pero el programa bzip2 no estÃ¡ instalado."
-
-#: ../lib/actions.sh:185
-msgid ""
-"The BM_TARBALL_FILETYPE conf key is set to \"dar\" but dar is not installed."
-msgstr ""
-"La clave de configuraciÃ³n BM_FILETYPE estÃ¡ establecida como \"dar\" pero "
-"el programa dar no estÃ¡ instalado."
-
-#: ../lib/actions.sh:197
-#, sh-format
-msgid "The repository $BM_REPOSITORY_ROOT does not exist, creating it."
-msgstr "El repositorio $BM_REPOSITORY_ROOT no existe, creÃ¡ndolo"
-
 #: ../lib/md5sum.sh:30
 msgid "Internal error: bad usage of function get_md5sum_from_file()"
 msgstr "Error interno: Mal uso de la funciÃ³n get_md5sum_from_file()"
@@ -415,12 +349,7 @@
 msgid "Disable the purge process."
 msgstr "Deshabilitar el proceso de borrado."
 
-#: ../lib/dialog.sh:60
-msgid "Warning, process interrupted, archives may be corrupted."
-msgstr ""
-"Aviso, el proceso se ha interrumpido. Los archivos pueden estar  corruptos."
-
-#: ../lib/dialog.sh:74 ../lib/dialog.sh:93
+#: ../lib/dialog.sh:62 ../lib/dialog.sh:81
 msgid "Not in interactive mode, cannot continue."
 msgstr "No se puede continuar, no estÃ¡ en modo interactivo."
 
@@ -432,10 +361,94 @@
 msgid "Releasing lock"
 msgstr "Liberando el bloqueo"
 
-#: ../lib/archives.sh:31
-msgid "Internal error: wrong call to bm_merge_incremental_backups()."
-msgstr "Error interno: Lamada erronea a bm_merge_incremental_backups()."
+#: ../lib/actions.sh:44
+msgid "No backup method used."
+msgstr "No se estÃ¡ usando ningÃºn mÃ©todo de copia de seguridad."
 
+#: ../lib/actions.sh:47
+#, sh-format
+msgid "No such backup method: $BM_ARCHIVE_METHOD"
+msgstr "MÃ©todo de copia de seguridad desconocido: $BM_ARCHIVE_METHOD"
+
+#: ../lib/actions.sh:56
+#, sh-format
+msgid "Unable to change the owner of \"$md5file\"."
+msgstr "No se pudo obtener la fecha de \"$md5file\"."
+
+#: ../lib/actions.sh:58
+#, sh-format
+msgid "Unable to change file permissions of \"$md5file\"."
+msgstr "No se pudieron cambiar los permisos de \"$md5file\"."
+
+#: ../lib/actions.sh:90
+msgid "No upload method used."
+msgstr "No se usÃ³ ningÃºn mÃ©todo de subida."
+
+#: ../lib/actions.sh:93
+#, sh-format
+msgid "The upload method \"$method\" is not supported; skipping."
+msgstr "El mÃ©todo de subida \"$method\" no estÃ¡ soportado; Se omitirÃ¡."
+
+#: ../lib/actions.sh:105
+#, sh-format
+msgid "Cleaning $BM_REPOSITORY_ROOT"
+msgstr "Limpiando $BM_REPOSITORY_ROOT."
+
+#: ../lib/actions.sh:118
+#, sh-format
+msgid "Running pre-command: $BM_PRE_BACKUP_COMMAND."
+msgstr "Ejecutando la orden previa al proceso: $BM_PRE_BACKUP_COMMAND."
+
+#: ../lib/actions.sh:122
+msgid "Pre-command failed. Stopping the process."
+msgstr "La orden previa al proceso fallÃ³. Parando el proceso."
+
+#: ../lib/actions.sh:127
+#, sh-format
+msgid "Pre-command returned: \"$RET\" (success)."
+msgstr "La orden previa al proceso devolviÃ³:\"$RET\" (Ã©xito)."
+
+#: ../lib/actions.sh:139
+#, sh-format
+msgid "Running post-command: $BM_POST_BACKUP_COMMAND"
+msgstr "Ejecutando la orden posterior al proceso: $BM_POST_BACKUP_COMMAND."
+
+#: ../lib/actions.sh:143
+msgid "Post-command failed."
+msgstr "La orden posterior al proceso fallÃ³."
+
+#: ../lib/actions.sh:148
+#, sh-format
+msgid "Post-command returned: \"$RET\" (success)."
+msgstr "La orden posterior al proceso devolviÃ³: \"$RET\" (Ã©xito)."
+
+#: ../lib/actions.sh:175
+msgid ""
+"The BM_TARBALL_FILETYPE conf key is set to \"zip\" but zip is not installed."
+msgstr ""
+"La clave de configuraciÃ³n BM_TARBALL_FILETYPE estÃ¡ establecida como \"zip"
+"\" pero el programa zip no estÃ¡ instalado."
+
+#: ../lib/actions.sh:180
+msgid ""
+"The BM_TARBALL_FILETYPE conf key is set to \"bzip2\" but bzip2 is not "
+"installed."
+msgstr ""
+"La clave de configuraciÃ³n BM_TARBALL_FILETYPE estÃ¡ establecida como \"bzip2"
+"\" pero el programa bzip2 no estÃ¡ instalado."
+
+#: ../lib/actions.sh:185
+msgid ""
+"The BM_TARBALL_FILETYPE conf key is set to \"dar\" but dar is not installed."
+msgstr ""
+"La clave de configuraciÃ³n BM_FILETYPE estÃ¡ establecida como \"dar\" pero "
+"el programa dar no estÃ¡ instalado."
+
+#: ../lib/actions.sh:197
+#, sh-format
+msgid "The repository $BM_REPOSITORY_ROOT does not exist, creating it."
+msgstr "El repositorio $BM_REPOSITORY_ROOT no existe, creÃ¡ndolo"
+
 #: ../lib/files.sh:72 ../lib/files.sh:87
 msgid "No path given."
 msgstr "No se especificÃ³ ninguna ruta."
@@ -521,115 +534,6 @@
 msgid "$file is a duplicate of $file_to_create (using symlink)."
 msgstr "$file es un duplicado de $file_to_create (usando un enlace simbÃ³lico)"
 
-#: ../lib/upload-methods.sh:38
-msgid "Using the upload method \"ssh\"."
-msgstr "Usando el mÃ©todo de subida \"ssh\"."
-
-#: ../lib/upload-methods.sh:47 ../lib/upload-methods.sh:85
-msgid "No valid destination found, SSH upload not possible."
-msgstr ""
-"No se encontrÃ³ un destino vÃ¡lido, no se puede subir el fichero utilizando "
-"SSH."
-
-#: ../lib/upload-methods.sh:68
-#, sh-format
-msgid ""
-"Error reported by backup-manager-upload for method \"scp\", check \"$logfile"
-"\"."
-msgstr ""
-"backup-manager-upload ha reportado un error para el mÃ©todo \"scp\", revise "
-"\"$logfile"
-
-#: ../lib/upload-methods.sh:76
-msgid "Using the upload method \"ssh-gpg\"."
-msgstr "Usando el mÃ©todo de subida \"ssh-gpg\"."
-
-#: ../lib/upload-methods.sh:88
-msgid ""
-"No gpg recipient given. Argument is mandatory if upload method ssh-gpg is "
-"used."
-msgstr ""
-"No se ha especificado un  destinatario gpg. Ese argumento es obligatorio si "
-"se usa el mÃ©todo de subida ssh-gpg."
-
-#: ../lib/upload-methods.sh:105
-#, sh-format
-msgid ""
-"Error reported by backup-manager-upload for method \"ssh-gpg\", check "
-"\"$logfile\"."
-msgstr ""
-"backup-manager-upload ha reportado un error para el mÃ©todo \"ssh-gpg\", "
-"revise \"$logfile "
-
-#: ../lib/upload-methods.sh:112
-msgid "Using the upload method \"ftp\"."
-msgstr "Utilizando el mÃ©todo de subida \"ftp\"."
-
-#: ../lib/upload-methods.sh:122
-msgid "No valid destination found, FTP upload not possible."
-msgstr ""
-"No se encontrÃ³ un destino vÃ¡lido, no se puede subir el fichero utilizando "
-"FTP."
-
-#: ../lib/upload-methods.sh:139
-#, sh-format
-msgid ""
-"Error reported by backup-manager-upload for method \"ftp\", check \"$logfile"
-"\"."
-msgstr ""
-"backup-manager-upload ha reportado un error para el mÃ©todo \"ftp\", revise "
-"\"$logfile "
-
-#: ../lib/upload-methods.sh:147
-msgid "Using the upload method \"S3\"."
-msgstr "Usando el mÃ©todo de subida \"S3\"."
-
-#: ../lib/upload-methods.sh:170
-#, sh-format
-msgid ""
-"Error reported by backup-manager-upload for method \"s3\", check \"$logfile"
-"\"."
-msgstr ""
-"backup-manager-upload ha reportado un error para el mÃ©todo \"s3\", revise "
-"\"$logfile "
-
-#: ../lib/upload-methods.sh:176
-#, sh-format
-msgid "Uploading $directory to ${host}:${BM_UPLOAD_RSYNC_DESTINATION}"
-msgstr "Subiendo $directory a ${host}:${BM_UPLOAD_RSYNC_DESTINATION}"
-
-#: ../lib/upload-methods.sh:187
-msgid "Need a key to use rsync (set BM_UPLOAD_SSH_USER, BM_UPLOAD_SSH_KEY)."
-msgstr ""
-"Necesita una clave para utilizar rsync (configure BM_UPLOAD_SSH_USER,  "
-"BM_UPLOAD_SSH_KEY)"
-
-#: ../lib/upload-methods.sh:198
-#, sh-format
-msgid "Upload of $directory with rsync failed; check $logfile."
-msgstr ""
-"No se pudo subir $directory utilizando rsync; consulte el fichero $logfile."
-
-#: ../lib/upload-methods.sh:217
-msgid "No valid destination found, RSYNC upload not possible."
-msgstr ""
-"No se encontrÃ³ un destino vÃ¡lido, no se puede subir el fichero utilizando "
-"RSYNC."
-
-#: ../lib/upload-methods.sh:236
-msgid "No hosts given to the rsync method, set BM_UPLOAD_RSYNC_HOSTS."
-msgstr ""
-"No se especificÃ³ ningÃºn equipo para el mÃ©todo rsync, configure "
-"BM_UPLOAD_RSYNC_HOSTS."
-
-#: ../lib/upload-methods.sh:243
-msgid "Using the upload method \"rsync\"."
-msgstr "Utilizando el mÃ©todo de subida \"rsync\"."
-
-#: ../lib/upload-methods.sh:250
-msgid "Using the upload method \"rsync-snapshots\"."
-msgstr "Utilizando el mÃ©todo de subida \"rsync-snapshots\"."
-
 #: ../lib/burning-methods.sh:38
 #, sh-format
 msgid "Device \"/dev/$device\" is mounted on \"$m\", unmounting it."
@@ -834,6 +738,115 @@
 msgid "Burning content of $index"
 msgstr "Grabando el contenido de $index"
 
+#: ../lib/upload-methods.sh:38
+msgid "Using the upload method \"ssh\"."
+msgstr "Usando el mÃ©todo de subida \"ssh\"."
+
+#: ../lib/upload-methods.sh:47 ../lib/upload-methods.sh:85
+msgid "No valid destination found, SSH upload not possible."
+msgstr ""
+"No se encontrÃ³ un destino vÃ¡lido, no se puede subir el fichero utilizando "
+"SSH."
+
+#: ../lib/upload-methods.sh:68
+#, sh-format
+msgid ""
+"Error reported by backup-manager-upload for method \"scp\", check \"$logfile"
+"\"."
+msgstr ""
+"backup-manager-upload ha reportado un error para el mÃ©todo \"scp\", revise "
+"\"$logfile"
+
+#: ../lib/upload-methods.sh:76
+msgid "Using the upload method \"ssh-gpg\"."
+msgstr "Usando el mÃ©todo de subida \"ssh-gpg\"."
+
+#: ../lib/upload-methods.sh:88
+msgid ""
+"No gpg recipient given. Argument is mandatory if upload method ssh-gpg is "
+"used."
+msgstr ""
+"No se ha especificado un  destinatario gpg. Ese argumento es obligatorio si "
+"se usa el mÃ©todo de subida ssh-gpg."
+
+#: ../lib/upload-methods.sh:105
+#, sh-format
+msgid ""
+"Error reported by backup-manager-upload for method \"ssh-gpg\", check "
+"\"$logfile\"."
+msgstr ""
+"backup-manager-upload ha reportado un error para el mÃ©todo \"ssh-gpg\", "
+"revise \"$logfile "
+
+#: ../lib/upload-methods.sh:112
+msgid "Using the upload method \"ftp\"."
+msgstr "Utilizando el mÃ©todo de subida \"ftp\"."
+
+#: ../lib/upload-methods.sh:122
+msgid "No valid destination found, FTP upload not possible."
+msgstr ""
+"No se encontrÃ³ un destino vÃ¡lido, no se puede subir el fichero utilizando "
+"FTP."
+
+#: ../lib/upload-methods.sh:139
+#, sh-format
+msgid ""
+"Error reported by backup-manager-upload for method \"ftp\", check \"$logfile"
+"\"."
+msgstr ""
+"backup-manager-upload ha reportado un error para el mÃ©todo \"ftp\", revise "
+"\"$logfile "
+
+#: ../lib/upload-methods.sh:147
+msgid "Using the upload method \"S3\"."
+msgstr "Usando el mÃ©todo de subida \"S3\"."
+
+#: ../lib/upload-methods.sh:170
+#, sh-format
+msgid ""
+"Error reported by backup-manager-upload for method \"s3\", check \"$logfile"
+"\"."
+msgstr ""
+"backup-manager-upload ha reportado un error para el mÃ©todo \"s3\", revise "
+"\"$logfile "
+
+#: ../lib/upload-methods.sh:176
+#, sh-format
+msgid "Uploading $directory to ${host}:${BM_UPLOAD_RSYNC_DESTINATION}"
+msgstr "Subiendo $directory a ${host}:${BM_UPLOAD_RSYNC_DESTINATION}"
+
+#: ../lib/upload-methods.sh:187
+msgid "Need a key to use rsync (set BM_UPLOAD_SSH_USER, BM_UPLOAD_SSH_KEY)."
+msgstr ""
+"Necesita una clave para utilizar rsync (configure BM_UPLOAD_SSH_USER,  "
+"BM_UPLOAD_SSH_KEY)"
+
+#: ../lib/upload-methods.sh:198
+#, sh-format
+msgid "Upload of $directory with rsync failed; check $logfile."
+msgstr ""
+"No se pudo subir $directory utilizando rsync; consulte el fichero $logfile."
+
+#: ../lib/upload-methods.sh:217
+msgid "No valid destination found, RSYNC upload not possible."
+msgstr ""
+"No se encontrÃ³ un destino vÃ¡lido, no se puede subir el fichero utilizando "
+"RSYNC."
+
+#: ../lib/upload-methods.sh:236
+msgid "No hosts given to the rsync method, set BM_UPLOAD_RSYNC_HOSTS."
+msgstr ""
+"No se especificÃ³ ningÃºn equipo para el mÃ©todo rsync, configure "
+"BM_UPLOAD_RSYNC_HOSTS."
+
+#: ../lib/upload-methods.sh:243
+msgid "Using the upload method \"rsync\"."
+msgstr "Utilizando el mÃ©todo de subida \"rsync\"."
+
+#: ../lib/upload-methods.sh:250
+msgid "Using the upload method \"rsync-snapshots\"."
+msgstr "Utilizando el mÃ©todo de subida \"rsync-snapshots\"."
+
 #: ../backup-manager:139
 msgid "The -b option must be followed by a valid date (YYYYMMDD)."
 msgstr "La opciÃ³n -b debe acompaÃ±arse de una fecha vÃ¡lida (YYYYMMDD)."
@@ -846,5 +859,11 @@
 msgid "Unable to exec the pre-command"
 msgstr "No se pudo ejecutar la orden previa."
 
+#~ msgid "Compressor $compress requires $bzip."
+#~ msgstr "El compresor $compress requiere $bzip"
+
+#~ msgid "Internal error: wrong call to bm_merge_incremental_backups()."
+#~ msgstr "Error interno: Lamada erronea a bm_merge_incremental_backups()."
+
 #~ msgid "CDROM burning requires $cdrecord, aborting."
 #~ msgstr "Se requiere $cdrecord para la grabaciÃ³n en CDROM, abortando."

Modified: backup-manager/trunk/po/fr.po
===================================================================
--- backup-manager/trunk/po/fr.po	2006-12-29 13:38:39 UTC (rev 527)
+++ backup-manager/trunk/po/fr.po	2007-01-02 13:54:03 UTC (rev 528)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: backup-manager 0.7.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-20 16:36+0200\n"
+"POT-Creation-Date: 2007-01-02 12:58+0100\n"
 "PO-Revision-Date: 2006-09-04 09:27+0100\n"
 "Last-Translator: Alexis Sukrieh <sukria at sukria.net>\n"
 "Language-Team: Debian l10n French Team <debian-l10n-french at lists.debian."
@@ -19,103 +19,115 @@
 msgid "$file_to_create: ok (${size}M,"
 msgstr "$file_to_create : OK (${size} Mo,"
 
-#: ../lib/backup-methods.sh:48
+#: ../lib/backup-methods.sh:54
 #, sh-format
 msgid "Unable to purge duplicates of $file_to_create"
 msgstr "Impossible de purger les doublons de $file_to_create"
 
-#: ../lib/backup-methods.sh:53
+#: ../lib/backup-methods.sh:59
 #, sh-format
 msgid "Unable to change the owner of \"$file_to_create\"."
 msgstr "Impossible de changer le propriétaire de « $file_to_create »."
 
-#: ../lib/backup-methods.sh:55
+#: ../lib/backup-methods.sh:61
 #, sh-format
 msgid "Unable to change file permissions of \"$file_to_create\"."
 msgstr "Impossible de changer les droits d'accès de « $file_to_create »."
 
-#: ../lib/backup-methods.sh:80
+#: ../lib/backup-methods.sh:72
+#, fuzzy
+msgid "Warning, process interrupted."
+msgstr ""
+"Attention, interruption utilisateur. Les archives risquent d'être corrompues."
+
+#: ../lib/backup-methods.sh:76
+#, fuzzy, sh-format
+msgid "Removing archive \"$bm_pending_archive\" (build interrupted)."
+msgstr "Suppression de l'archive « $archive »."
+
+#: ../lib/backup-methods.sh:82
 #, sh-format
+msgid ""
+"Restoring incremental-building details list: \"$bm_pending_incremental_list"
+"\"."
+msgstr ""
+
+#: ../lib/backup-methods.sh:116
+#, sh-format
 msgid "Unable to create \"$target\", check $logfile"
 msgstr "Impossible de créer « $target », lisez $logfile pour les détails."
 
-#: ../lib/backup-methods.sh:94
+#: ../lib/backup-methods.sh:130
 #, sh-format
 msgid "File $file_to_create already exists, skipping."
 msgstr "Fichier $file_to_create existe déjà ; ignoré."
 
-#: ../lib/backup-methods.sh:108 ../lib/backup-methods.sh:128
-#: ../lib/backup-methods.sh:149
+#: ../lib/backup-methods.sh:161 ../lib/backup-methods.sh:185
 #, sh-format
 msgid "Unable to exec $command; check $logfile"
 msgstr "Impossible d'exécuter $command ; lisez $logfile"
 
-#: ../lib/backup-methods.sh:116
-#, sh-format
-msgid "Compressor $compress requires $gzip."
+#: ../lib/backup-methods.sh:167
+#, fuzzy, sh-format
+msgid "Compressor $compress is needed."
 msgstr "L'archiveur $compress nécessite $gzip."
 
-#: ../lib/backup-methods.sh:136
+#: ../lib/backup-methods.sh:192
 #, sh-format
-msgid "Compressor $compress requires $bzip."
-msgstr "L'archiveur $compress nécessite $bzip."
-
-#: ../lib/backup-methods.sh:156
-#, sh-format
 msgid "No such compressor supported: $compress."
 msgstr "Cet archiveur n'est pas supporté : $compress"
 
-#: ../lib/backup-methods.sh:162
+#: ../lib/backup-methods.sh:198
 #, sh-format
 msgid "Unable to find $file_to_create"
 msgstr "Impossible de trouver $file_to_create"
 
-#: ../lib/backup-methods.sh:289
+#: ../lib/backup-methods.sh:325
 msgid "No frequency given, set BM_TARBALLINC_MASTERDATETYPE."
 msgstr "Aucune fréquence définie, changez BM_TARBALLINC_MASTERDATETYPE."
 
-#: ../lib/backup-methods.sh:300
+#: ../lib/backup-methods.sh:336
 #, sh-format
 msgid "Unknown frequency: $BM_TARBALLINC_MASTERDATETYPE"
 msgstr "Fréquence inconnue : $BM_TARBALLINC_MASTERDATETYPE"
 
-#: ../lib/backup-methods.sh:328
+#: ../lib/backup-methods.sh:369
 #, sh-format
 msgid "Building master backup for target: \"$dir_name\"."
 msgstr "Création de l'archive maître pour la cible : « $dir_name »."
 
-#: ../lib/backup-methods.sh:452
+#: ../lib/backup-methods.sh:493
 #, sh-format
 msgid "The archive type \"tar.bz2\" depends on the tool \"$bzip\"."
 msgstr "Le type d'archive « tar.bz2 » dépend de l'outil « $bzip »."
 
-#: ../lib/backup-methods.sh:459
+#: ../lib/backup-methods.sh:500
 #, sh-format
 msgid "The archive type \"tar.lz\" depends on the tool \"$lzma\"."
 msgstr "Le type d'archive « tar.lz » dépend de l'outil « $lzma »."
 
-#: ../lib/backup-methods.sh:466
+#: ../lib/backup-methods.sh:507
 #, sh-format
 msgid "The archive type \"zip\" depends on the tool \"$zip\"."
 msgstr "Le type d'archive « zip » dépend de l'outil « $zip »."
 
-#: ../lib/backup-methods.sh:472
+#: ../lib/backup-methods.sh:513
 #, sh-format
 msgid "The archive type \"dar\" depends on the tool \"$dar\"."
 msgstr "Le type d'archive « dar » dépend de l'outil « $dar »."
 
-#: ../lib/backup-methods.sh:478 ../lib/backup-methods.sh:579
-#: ../lib/backup-methods.sh:620
+#: ../lib/backup-methods.sh:519 ../lib/backup-methods.sh:619
+#: ../lib/backup-methods.sh:665
 #, sh-format
 msgid "The archive type \"$BM_TARBALL_FILETYPE\" is not supported."
 msgstr "Le type d'archive « $BM_TARBALL_FILETYPE » n'est pas géré."
 
-#: ../lib/backup-methods.sh:549
+#: ../lib/backup-methods.sh:589
 msgid "The configuration variable \"BM_ENCRYPTION_RECIPIENT\" must be defined."
 msgstr ""
 "La variable de configuration « BM_ENCRYPTION_RECIPIENT » doit être définie."
 
-#: ../lib/backup-methods.sh:555
+#: ../lib/backup-methods.sh:595
 #, sh-format
 msgid ""
 "The encryption is not yet possible with \"$BM_TARBALL_FILETYPE\" archives."
@@ -123,57 +135,67 @@
 "Le cryptage n'est pas supporté avec les archives de type "
 "« $BM_TARBALL_FILETYPE »."
 
-#: ../lib/backup-methods.sh:596
+#: ../lib/backup-methods.sh:637
 #, sh-format
 msgid "The program \"$gpg\" is needed."
 msgstr "Le programme « $gpg » est nécessaire."
 
-#: ../lib/backup-methods.sh:603 ../lib/backup-methods.sh:640
+#: ../lib/backup-methods.sh:646 ../lib/backup-methods.sh:685
 #, sh-format
 msgid "File $file_to_check already exists, skipping."
 msgstr "Fichier $file_to_check existe déjà ; ignoré."
 
-#: ../lib/backup-methods.sh:663
+#: ../lib/backup-methods.sh:708
 #, sh-format
 msgid "Target \"$t\" does not exist, skipping."
 msgstr "La cible « $t » n'existe pas ; ignoré."
 
-#: ../lib/backup-methods.sh:738 ../lib/backup-methods.sh:773
-#: ../lib/backup-methods.sh:804 ../lib/backup-methods.sh:828
+#: ../lib/backup-methods.sh:783 ../lib/backup-methods.sh:818
+#: ../lib/backup-methods.sh:860 ../lib/backup-methods.sh:884
 #, sh-format
 msgid "Using method \"$method\"."
 msgstr "Utilisation de la méthode « $method »."
 
-#: ../lib/backup-methods.sh:762
+#: ../lib/backup-methods.sh:807
 msgid "1 error occurred during the tarball generation."
 msgstr "Une erreur a eu lieu pendant la génération des archives."
 
-#: ../lib/backup-methods.sh:764
+#: ../lib/backup-methods.sh:809
 #, sh-format
 msgid "$nb_err errors occurred during the tarball generation."
 msgstr "$nb_err erreurs ont eu lieu pendant la génération des archives."
 
-#: ../lib/backup-methods.sh:775
+#: ../lib/backup-methods.sh:820
 #, sh-format
 msgid "The \"mysql\" method is chosen, but $mysqldump is not found."
 msgstr "La méthode « mysql » est choisie, mais $mysqldump n'est pas présent."
 
-#: ../lib/backup-methods.sh:806
+#: ../lib/backup-methods.sh:830
 #, sh-format
+msgid "Using existing MySQL client configuration file: $HOME/.my.cnf"
+msgstr ""
+
+#: ../lib/backup-methods.sh:833
+#, sh-format
+msgid "Creating a default MySQL client configuration file: $HOME/.my.cnf"
+msgstr ""
+
+#: ../lib/backup-methods.sh:862
+#, sh-format
 msgid "The \"svn\" method is chosen, but $svnadmin is not found."
 msgstr "La méthode « svn » est choisie, mais $svnadmin n'est pas présent."
 
-#: ../lib/backup-methods.sh:812
+#: ../lib/backup-methods.sh:868
 #, sh-format
 msgid "SVN repository \"$repository\" is not valid; skipping."
 msgstr "Le dépôt SVN « $repository » n'est pas valide ; ignoré."
 
-#: ../lib/backup-methods.sh:837
+#: ../lib/backup-methods.sh:893
 #, sh-format
 msgid "Not enough args for this archive ($archive), skipping."
 msgstr "Pas assez d'arguments pour cette archive ($archive) ; ignoré."
 
-#: ../lib/backup-methods.sh:844
+#: ../lib/backup-methods.sh:900
 msgid "Cannot create archive."
 msgstr "Impossible de créer l'archive."
 
@@ -213,7 +235,7 @@
 "Booléen obsolète : $key vaut actuellement « no », utilisez « false » à la "
 "place."
 
-#: ../lib/sanitize.sh:251
+#: ../lib/sanitize.sh:258
 #, sh-format
 msgid ""
 "When validating the configuration file $conffile, $nb_warnings warnings were "
@@ -222,89 +244,6 @@
 "Lors de la validation du fichier de configuration $conffile, $nb_warnings "
 "avertissements ont été détectés."
 
-#: ../lib/actions.sh:44
-msgid "No backup method used."
-msgstr "Aucune méthode d'archivage utilisée."
-
-#: ../lib/actions.sh:47
-#, sh-format
-msgid "No such backup method: $BM_ARCHIVE_METHOD"
-msgstr "Aucune méthode de sauvegarde du type : $BM_ARCHIVE_METHOD"
-
-#: ../lib/actions.sh:56
-#, sh-format
-msgid "Unable to change the owner of \"$md5file\"."
-msgstr "Impossible de changer le propriétaire du fichier « $md5file »."
-
-#: ../lib/actions.sh:58
-#, sh-format
-msgid "Unable to change file permissions of \"$md5file\"."
-msgstr "Impossible de changer les droits d'accès au fichier « $md5file »."
-
-#: ../lib/actions.sh:90
-msgid "No upload method used."
-msgstr "Aucune méthode de téléchargement utilisée."
-
-#: ../lib/actions.sh:93
-#, sh-format
-msgid "The upload method \"$method\" is not supported; skipping."
-msgstr "La méthode de téléchargement « $method » n'est pas supportée ; ignoré."
-
-#: ../lib/actions.sh:105
-#, sh-format
-msgid "Cleaning $BM_REPOSITORY_ROOT"
-msgstr "Nettoyage de $BM_REPOSITORY_ROOT"
-
-#: ../lib/actions.sh:118
-#, sh-format
-msgid "Running pre-command: $BM_PRE_BACKUP_COMMAND."
-msgstr "Lancement de la précommande : $BM_PRE_BACKUP_COMMAND"
-
-#: ../lib/actions.sh:122
-msgid "Pre-command failed. Stopping the process."
-msgstr "La précommande a échoué. Arrêt du processus."
-
-#: ../lib/actions.sh:127
-#, sh-format
-msgid "Pre-command returned: \"$RET\" (success)."
-msgstr "La pré-commande a retourné : « $RET » (succès)."
-
-#: ../lib/actions.sh:139
-#, sh-format
-msgid "Running post-command: $BM_POST_BACKUP_COMMAND"
-msgstr "Lancement de la post-commande : $BM_POST_BACKUP_COMMAND"
-
-#: ../lib/actions.sh:143
-msgid "Post-command failed."
-msgstr "La post-commande a échoué."
-
-#: ../lib/actions.sh:148
-#, sh-format
-msgid "Post-command returned: \"$RET\" (success)."
-msgstr "La post-commande a retourné : « $RET » (succès)."
-
-#: ../lib/actions.sh:175
-msgid ""
-"The BM_TARBALL_FILETYPE conf key is set to \"zip\" but zip is not installed."
-msgstr "La clef BM_TARBALL_FILETYPE vaut « zip » mais zip n'est pas installé."
-
-#: ../lib/actions.sh:180
-msgid ""
-"The BM_TARBALL_FILETYPE conf key is set to \"bzip2\" but bzip2 is not "
-"installed."
-msgstr ""
-"La clef BM_TARBALL_FILETYPE vaut « bzip2 » mais bzip2 n'est pas installé."
-
-#: ../lib/actions.sh:185
-msgid ""
-"The BM_TARBALL_FILETYPE conf key is set to \"dar\" but dar is not installed."
-msgstr "La clef BM_TARBALL_FILETYPE vaut « dar » mais dar n'est pas installé."
-
-#: ../lib/actions.sh:197
-#, sh-format
-msgid "The repository $BM_REPOSITORY_ROOT does not exist, creating it."
-msgstr "Le dépôt « $BM_REPOSITORY_ROOT » n'existe pas ; création."
-
 #: ../lib/md5sum.sh:30
 msgid "Internal error: bad usage of function get_md5sum_from_file()"
 msgstr ""
@@ -384,12 +323,7 @@
 msgid "Disable the purge process."
 msgstr "Désactive la phase de nettoyage."
 
-#: ../lib/dialog.sh:60
-msgid "Warning, process interrupted, archives may be corrupted."
-msgstr ""
-"Attention, interruption utilisateur. Les archives risquent d'être corrompues."
-
-#: ../lib/dialog.sh:74 ../lib/dialog.sh:93
+#: ../lib/dialog.sh:62 ../lib/dialog.sh:81
 msgid "Not in interactive mode, cannot continue."
 msgstr "Pas en mode interactif, impossible de continuer."
 
@@ -401,10 +335,89 @@
 msgid "Releasing lock"
 msgstr "Libération du verrou."
 
-#: ../lib/archives.sh:31
-msgid "Internal error: wrong call to bm_merge_incremental_backups()."
-msgstr "Erreur interne : mauvais appel à bm_merge_incremental_backups()."
+#: ../lib/actions.sh:44
+msgid "No backup method used."
+msgstr "Aucune méthode d'archivage utilisée."
 
+#: ../lib/actions.sh:47
+#, sh-format
+msgid "No such backup method: $BM_ARCHIVE_METHOD"
+msgstr "Aucune méthode de sauvegarde du type : $BM_ARCHIVE_METHOD"
+
+#: ../lib/actions.sh:56
+#, sh-format
+msgid "Unable to change the owner of \"$md5file\"."
+msgstr "Impossible de changer le propriétaire du fichier « $md5file »."
+
+#: ../lib/actions.sh:58
+#, sh-format
+msgid "Unable to change file permissions of \"$md5file\"."
+msgstr "Impossible de changer les droits d'accès au fichier « $md5file »."
+
+#: ../lib/actions.sh:90
+msgid "No upload method used."
+msgstr "Aucune méthode de téléchargement utilisée."
+
+#: ../lib/actions.sh:93
+#, sh-format
+msgid "The upload method \"$method\" is not supported; skipping."
+msgstr "La méthode de téléchargement « $method » n'est pas supportée ; ignoré."
+
+#: ../lib/actions.sh:105
+#, sh-format
+msgid "Cleaning $BM_REPOSITORY_ROOT"
+msgstr "Nettoyage de $BM_REPOSITORY_ROOT"
+
+#: ../lib/actions.sh:118
+#, sh-format
+msgid "Running pre-command: $BM_PRE_BACKUP_COMMAND."
+msgstr "Lancement de la précommande : $BM_PRE_BACKUP_COMMAND"
+
+#: ../lib/actions.sh:122
+msgid "Pre-command failed. Stopping the process."
+msgstr "La précommande a échoué. Arrêt du processus."
+
+#: ../lib/actions.sh:127
+#, sh-format
+msgid "Pre-command returned: \"$RET\" (success)."
+msgstr "La pré-commande a retourné : « $RET » (succès)."
+
+#: ../lib/actions.sh:139
+#, sh-format
+msgid "Running post-command: $BM_POST_BACKUP_COMMAND"
+msgstr "Lancement de la post-commande : $BM_POST_BACKUP_COMMAND"
+
+#: ../lib/actions.sh:143
+msgid "Post-command failed."
+msgstr "La post-commande a échoué."
+
+#: ../lib/actions.sh:148
+#, sh-format
+msgid "Post-command returned: \"$RET\" (success)."
+msgstr "La post-commande a retourné : « $RET » (succès)."
+
+#: ../lib/actions.sh:175
+msgid ""
+"The BM_TARBALL_FILETYPE conf key is set to \"zip\" but zip is not installed."
+msgstr "La clef BM_TARBALL_FILETYPE vaut « zip » mais zip n'est pas installé."
+
+#: ../lib/actions.sh:180
+msgid ""
+"The BM_TARBALL_FILETYPE conf key is set to \"bzip2\" but bzip2 is not "
+"installed."
+msgstr ""
+"La clef BM_TARBALL_FILETYPE vaut « bzip2 » mais bzip2 n'est pas installé."
+
+#: ../lib/actions.sh:185
+msgid ""
+"The BM_TARBALL_FILETYPE conf key is set to \"dar\" but dar is not installed."
+msgstr "La clef BM_TARBALL_FILETYPE vaut « dar » mais dar n'est pas installé."
+
+#: ../lib/actions.sh:197
+#, sh-format
+msgid "The repository $BM_REPOSITORY_ROOT does not exist, creating it."
+msgstr "Le dépôt « $BM_REPOSITORY_ROOT » n'existe pas ; création."
+
 #: ../lib/files.sh:72 ../lib/files.sh:87
 msgid "No path given."
 msgstr "Aucun chemin fourni."
@@ -491,108 +504,6 @@
 msgstr ""
 "$file est un doublon de $file_to_create (utilisation d'un lien symbolique)."
 
-#: ../lib/upload-methods.sh:38
-msgid "Using the upload method \"ssh\"."
-msgstr "Utilisation de la méthode de téléchargement « ssh »."
-
-#: ../lib/upload-methods.sh:47 ../lib/upload-methods.sh:85
-msgid "No valid destination found, SSH upload not possible."
-msgstr "Aucune destination valide, téléchargement SSH impossible."
-
-#: ../lib/upload-methods.sh:68
-#, sh-format
-msgid ""
-"Error reported by backup-manager-upload for method \"scp\", check \"$logfile"
-"\"."
-msgstr ""
-"Erreur rapportée par backup-manager-upload pour la méthode « scp », voir "
-"« $logfile »."
-
-#: ../lib/upload-methods.sh:76
-msgid "Using the upload method \"ssh-gpg\"."
-msgstr "Utilisation de la méthode de téléchargement « ssh-gpg »."
-
-#: ../lib/upload-methods.sh:88
-msgid ""
-"No gpg recipient given. Argument is mandatory if upload method ssh-gpg is "
-"used."
-msgstr ""
-"Aucune identité GPG fournie. Cet argument est obligatoire pour utiliser la "
-"méthode « ssh-gpg »."
-
-#: ../lib/upload-methods.sh:105
-#, sh-format
-msgid ""
-"Error reported by backup-manager-upload for method \"ssh-gpg\", check "
-"\"$logfile\"."
-msgstr ""
-"Erreur rapportée par backup-manager-upload pour la méthode « ssh-gpg », voir "
-"« $logfile »."
-
-#: ../lib/upload-methods.sh:112
-msgid "Using the upload method \"ftp\"."
-msgstr "Utilisation de la méthode de téléchargement « ftp »."
-
-#: ../lib/upload-methods.sh:122
-msgid "No valid destination found, FTP upload not possible."
-msgstr "Aucune destination valide, téléchargement FTP impossible."
-
-#: ../lib/upload-methods.sh:139
-#, sh-format
-msgid ""
-"Error reported by backup-manager-upload for method \"ftp\", check \"$logfile"
-"\"."
-msgstr ""
-"Erreur rapportée par backup-manager-upload pour la méthode « ftp », voir "
-"« $logfile »."
-
-#: ../lib/upload-methods.sh:147
-msgid "Using the upload method \"S3\"."
-msgstr "Utilisation de la méthode de téléchargement « S3 »."
-
-#: ../lib/upload-methods.sh:170
-#, sh-format
-msgid ""
-"Error reported by backup-manager-upload for method \"s3\", check \"$logfile"
-"\"."
-msgstr ""
-"Erreur rapportée par backup-manager-upload pour la méthode « s3 », voir "
-"« $logfile »."
-
-#: ../lib/upload-methods.sh:176
-#, sh-format
-msgid "Uploading $directory to ${host}:${BM_UPLOAD_RSYNC_DESTINATION}"
-msgstr ""
-"Téléchargement de $directory vers ${host}:${BM_UPLOAD_RSYNC_DESTINATION}"
-
-#: ../lib/upload-methods.sh:187
-msgid "Need a key to use rsync (set BM_UPLOAD_SSH_USER, BM_UPLOAD_SSH_KEY)."
-msgstr ""
-"Besoin d'une clef pour utiliser rsync (définir BM_UPLOAD_SSH_USER, "
-"BM_UPLOAD_SSH_KEY)."
-
-#: ../lib/upload-methods.sh:198
-#, sh-format
-msgid "Upload of $directory with rsync failed; check $logfile."
-msgstr "Échec du téléchargement de $directory avec rsync ; voir $logfile"
-
-#: ../lib/upload-methods.sh:217
-msgid "No valid destination found, RSYNC upload not possible."
-msgstr "Aucune destination valide, téléchargement RSYNC impossible."
-
-#: ../lib/upload-methods.sh:236
-msgid "No hosts given to the rsync method, set BM_UPLOAD_RSYNC_HOSTS."
-msgstr ""
-"Aucun hôte fourni à la méthode rsync, veuillez définir BM_UPLOAD_RSYNC_HOSTS."
-
-#: ../lib/upload-methods.sh:243
-msgid "Using the upload method \"rsync\"."
-msgstr "Utilisation de la méthode de téléchargement « rsync »."
-
-#: ../lib/upload-methods.sh:250
-msgid "Using the upload method \"rsync-snapshots\"."
-msgstr "Utilisation de la méthode de téléchargement « rsync-snapshots »."
-
 #: ../lib/burning-methods.sh:38
 #, sh-format
 msgid "Device \"/dev/$device\" is mounted on \"$m\", unmounting it."
@@ -801,6 +712,108 @@
 msgid "Burning content of $index"
 msgstr "Gravure du contenu de « $index »."
 
+#: ../lib/upload-methods.sh:38
+msgid "Using the upload method \"ssh\"."
+msgstr "Utilisation de la méthode de téléchargement « ssh »."
+
+#: ../lib/upload-methods.sh:47 ../lib/upload-methods.sh:85
+msgid "No valid destination found, SSH upload not possible."
+msgstr "Aucune destination valide, téléchargement SSH impossible."
+
+#: ../lib/upload-methods.sh:68
+#, sh-format
+msgid ""
+"Error reported by backup-manager-upload for method \"scp\", check \"$logfile"
+"\"."
+msgstr ""
+"Erreur rapportée par backup-manager-upload pour la méthode « scp », voir "
+"« $logfile »."
+
+#: ../lib/upload-methods.sh:76
+msgid "Using the upload method \"ssh-gpg\"."
+msgstr "Utilisation de la méthode de téléchargement « ssh-gpg »."
+
+#: ../lib/upload-methods.sh:88
+msgid ""
+"No gpg recipient given. Argument is mandatory if upload method ssh-gpg is "
+"used."
+msgstr ""
+"Aucune identité GPG fournie. Cet argument est obligatoire pour utiliser la "
+"méthode « ssh-gpg »."
+
+#: ../lib/upload-methods.sh:105
+#, sh-format
+msgid ""
+"Error reported by backup-manager-upload for method \"ssh-gpg\", check "
+"\"$logfile\"."
+msgstr ""
+"Erreur rapportée par backup-manager-upload pour la méthode « ssh-gpg », voir "
+"« $logfile »."
+
+#: ../lib/upload-methods.sh:112
+msgid "Using the upload method \"ftp\"."
+msgstr "Utilisation de la méthode de téléchargement « ftp »."
+
+#: ../lib/upload-methods.sh:122
+msgid "No valid destination found, FTP upload not possible."
+msgstr "Aucune destination valide, téléchargement FTP impossible."
+
+#: ../lib/upload-methods.sh:139
+#, sh-format
+msgid ""
+"Error reported by backup-manager-upload for method \"ftp\", check \"$logfile"
+"\"."
+msgstr ""
+"Erreur rapportée par backup-manager-upload pour la méthode « ftp », voir "
+"« $logfile »."
+
+#: ../lib/upload-methods.sh:147
+msgid "Using the upload method \"S3\"."
+msgstr "Utilisation de la méthode de téléchargement « S3 »."
+
+#: ../lib/upload-methods.sh:170
+#, sh-format
+msgid ""
+"Error reported by backup-manager-upload for method \"s3\", check \"$logfile"
+"\"."
+msgstr ""
+"Erreur rapportée par backup-manager-upload pour la méthode « s3 », voir "
+"« $logfile »."
+
+#: ../lib/upload-methods.sh:176
+#, sh-format
+msgid "Uploading $directory to ${host}:${BM_UPLOAD_RSYNC_DESTINATION}"
+msgstr ""
+"Téléchargement de $directory vers ${host}:${BM_UPLOAD_RSYNC_DESTINATION}"
+
+#: ../lib/upload-methods.sh:187
+msgid "Need a key to use rsync (set BM_UPLOAD_SSH_USER, BM_UPLOAD_SSH_KEY)."
+msgstr ""
+"Besoin d'une clef pour utiliser rsync (définir BM_UPLOAD_SSH_USER, "
+"BM_UPLOAD_SSH_KEY)."
+
+#: ../lib/upload-methods.sh:198
+#, sh-format
+msgid "Upload of $directory with rsync failed; check $logfile."
+msgstr "Échec du téléchargement de $directory avec rsync ; voir $logfile"
+
+#: ../lib/upload-methods.sh:217
+msgid "No valid destination found, RSYNC upload not possible."
+msgstr "Aucune destination valide, téléchargement RSYNC impossible."
+
+#: ../lib/upload-methods.sh:236
+msgid "No hosts given to the rsync method, set BM_UPLOAD_RSYNC_HOSTS."
+msgstr ""
+"Aucun hôte fourni à la méthode rsync, veuillez définir BM_UPLOAD_RSYNC_HOSTS."
+
+#: ../lib/upload-methods.sh:243
+msgid "Using the upload method \"rsync\"."
+msgstr "Utilisation de la méthode de téléchargement « rsync »."
+
+#: ../lib/upload-methods.sh:250
+msgid "Using the upload method \"rsync-snapshots\"."
+msgstr "Utilisation de la méthode de téléchargement « rsync-snapshots »."
+
 #: ../backup-manager:139
 msgid "The -b option must be followed by a valid date (YYYYMMDD)."
 msgstr "L'option -b doit être suivie d'une date valide (AAAAMMJJ)."
@@ -812,3 +825,9 @@
 #: ../backup-manager:214
 msgid "Unable to exec the pre-command"
 msgstr "Impossible d'exécuter la précommande."
+
+#~ msgid "Compressor $compress requires $bzip."
+#~ msgstr "L'archiveur $compress nécessite $bzip."
+
+#~ msgid "Internal error: wrong call to bm_merge_incremental_backups()."
+#~ msgstr "Erreur interne : mauvais appel à bm_merge_incremental_backups()."

Modified: backup-manager/trunk/po/it.po
===================================================================
--- backup-manager/trunk/po/it.po	2006-12-29 13:38:39 UTC (rev 527)
+++ backup-manager/trunk/po/it.po	2007-01-02 13:54:03 UTC (rev 528)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: BM ITALIAN VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-20 16:36+0200\n"
+"POT-Creation-Date: 2007-01-02 12:58+0100\n"
 "PO-Revision-Date: 2006-09-05 12:19+0100\n"
 "Last-Translator: Matteo Frare Barutti <xenon at ngi.it>\n"
 "Language-Team: ITALIAN <xenon at ngi.it>\n"
@@ -22,102 +22,114 @@
 msgid "$file_to_create: ok (${size}M,"
 msgstr "$file_to_create: ok (${size}M,"
 
-#: ../lib/backup-methods.sh:48
+#: ../lib/backup-methods.sh:54
 #, sh-format
 msgid "Unable to purge duplicates of $file_to_create"
 msgstr "Impossibile rimuovere i duplicati di $file_to_create"
 
-#: ../lib/backup-methods.sh:53
+#: ../lib/backup-methods.sh:59
 #, sh-format
 msgid "Unable to change the owner of \"$file_to_create\"."
 msgstr "Impossibile cambiare il proprietario di \"$file_to_create\"."
 
-#: ../lib/backup-methods.sh:55
+#: ../lib/backup-methods.sh:61
 #, sh-format
 msgid "Unable to change file permissions of \"$file_to_create\"."
 msgstr "Impossibile cambiare i permessi di \"$file_to_create\"."
 
-#: ../lib/backup-methods.sh:80
+#: ../lib/backup-methods.sh:72
+#, fuzzy
+msgid "Warning, process interrupted."
+msgstr ""
+"Attenzione, processo interrotto, gli archivi potrebero essere corrotti."
+
+#: ../lib/backup-methods.sh:76
+#, fuzzy, sh-format
+msgid "Removing archive \"$bm_pending_archive\" (build interrupted)."
+msgstr "Rimuovo l'archivio \"$archive\"."
+
+#: ../lib/backup-methods.sh:82
 #, sh-format
+msgid ""
+"Restoring incremental-building details list: \"$bm_pending_incremental_list"
+"\"."
+msgstr ""
+
+#: ../lib/backup-methods.sh:116
+#, sh-format
 msgid "Unable to create \"$target\", check $logfile"
 msgstr "Impossibile creare \"$target\", controllare $logfile"
 
-#: ../lib/backup-methods.sh:94
+#: ../lib/backup-methods.sh:130
 #, sh-format
 msgid "File $file_to_create already exists, skipping."
 msgstr "Il file $file_to_create Ã¨ giÃ  esistente, vado avanti."
 
-#: ../lib/backup-methods.sh:108 ../lib/backup-methods.sh:128
-#: ../lib/backup-methods.sh:149
+#: ../lib/backup-methods.sh:161 ../lib/backup-methods.sh:185
 #, sh-format
 msgid "Unable to exec $command; check $logfile"
 msgstr "Impossibile eseguire $command; verificare $logfile"
 
-#: ../lib/backup-methods.sh:116
-#, sh-format
-msgid "Compressor $compress requires $gzip."
+#: ../lib/backup-methods.sh:167
+#, fuzzy, sh-format
+msgid "Compressor $compress is needed."
 msgstr "Il compressore $compress richiede $gzip."
 
-#: ../lib/backup-methods.sh:136
+#: ../lib/backup-methods.sh:192
 #, sh-format
-msgid "Compressor $compress requires $bzip."
-msgstr "Il compressore $compress richiede $bzip."
-
-#: ../lib/backup-methods.sh:156
-#, sh-format
 msgid "No such compressor supported: $compress."
 msgstr "Nessun compressore supportato: $compress."
 
-#: ../lib/backup-methods.sh:162
+#: ../lib/backup-methods.sh:198
 #, sh-format
 msgid "Unable to find $file_to_create"
 msgstr "Impossibile trovare $file_to_create"
 
-#: ../lib/backup-methods.sh:289
+#: ../lib/backup-methods.sh:325
 msgid "No frequency given, set BM_TARBALLINC_MASTERDATETYPE."
 msgstr "Nessuna frequenza impostata: modificare $BM_TARBALLINC_MASTERDATETYPE."
 
-#: ../lib/backup-methods.sh:300
+#: ../lib/backup-methods.sh:336
 #, sh-format
 msgid "Unknown frequency: $BM_TARBALLINC_MASTERDATETYPE"
 msgstr "Frequenza sconoscita: $BM_TARBALLINC_MASTERDATETYPE"
 
-#: ../lib/backup-methods.sh:328
+#: ../lib/backup-methods.sh:369
 #, sh-format
 msgid "Building master backup for target: \"$dir_name\"."
 msgstr "Creo il master backup per il target: \"$dir_name\"."
 
-#: ../lib/backup-methods.sh:452
+#: ../lib/backup-methods.sh:493
 #, sh-format
 msgid "The archive type \"tar.bz2\" depends on the tool \"$bzip\"."
 msgstr "Il tipo di archivio \"tar.bz2\" dipende dal tool \"$bzip\"."
 
-#: ../lib/backup-methods.sh:459
+#: ../lib/backup-methods.sh:500
 #, sh-format
 msgid "The archive type \"tar.lz\" depends on the tool \"$lzma\"."
 msgstr "Il tipo di archivio \"tar.lz\" dipende dal tool \"$lzma\"."
 
-#: ../lib/backup-methods.sh:466
+#: ../lib/backup-methods.sh:507
 #, sh-format
 msgid "The archive type \"zip\" depends on the tool \"$zip\"."
 msgstr "Il tipo di archivio \"zip\" dipende dal tool \"$zip\"."
 
-#: ../lib/backup-methods.sh:472
+#: ../lib/backup-methods.sh:513
 #, sh-format
 msgid "The archive type \"dar\" depends on the tool \"$dar\"."
 msgstr "Il tipo di archivio \"dar\" dipende dal tool \"$dar\"."
 
-#: ../lib/backup-methods.sh:478 ../lib/backup-methods.sh:579
-#: ../lib/backup-methods.sh:620
+#: ../lib/backup-methods.sh:519 ../lib/backup-methods.sh:619
+#: ../lib/backup-methods.sh:665
 #, sh-format
 msgid "The archive type \"$BM_TARBALL_FILETYPE\" is not supported."
 msgstr "Il tipo di archivio \"$BM_TARBALL_FILETYPE\" non Ã¨ supportato."
 
-#: ../lib/backup-methods.sh:549
+#: ../lib/backup-methods.sh:589
 msgid "The configuration variable \"BM_ENCRYPTION_RECIPIENT\" must be defined."
 msgstr "Deve essere definita la variabile \"BM_ENCRYPTION_RECIPIENT\"."
 
-#: ../lib/backup-methods.sh:555
+#: ../lib/backup-methods.sh:595
 #, sh-format
 msgid ""
 "The encryption is not yet possible with \"$BM_TARBALL_FILETYPE\" archives."
@@ -125,58 +137,68 @@
 "La crittografia non Ã¨ ancora possibile con gli archivi  "
 "\"$BM_TARBALL_FILETYPE\"."
 
-#: ../lib/backup-methods.sh:596
+#: ../lib/backup-methods.sh:637
 #, sh-format
 msgid "The program \"$gpg\" is needed."
 msgstr "E' necessario il programma \"$gpg\"."
 
-#: ../lib/backup-methods.sh:603 ../lib/backup-methods.sh:640
+#: ../lib/backup-methods.sh:646 ../lib/backup-methods.sh:685
 #, sh-format
 msgid "File $file_to_check already exists, skipping."
 msgstr "Il file $file_to_check Ã¨ giÃ  esistente, vado avanti."
 
-#: ../lib/backup-methods.sh:663
+#: ../lib/backup-methods.sh:708
 #, sh-format
 msgid "Target \"$t\" does not exist, skipping."
 msgstr "La destinazione \"$t\" non esiste, vado avanti."
 
-#: ../lib/backup-methods.sh:738 ../lib/backup-methods.sh:773
-#: ../lib/backup-methods.sh:804 ../lib/backup-methods.sh:828
+#: ../lib/backup-methods.sh:783 ../lib/backup-methods.sh:818
+#: ../lib/backup-methods.sh:860 ../lib/backup-methods.sh:884
 #, sh-format
 msgid "Using method \"$method\"."
 msgstr "Utilizzo il metodo \"$method\"."
 
-#: ../lib/backup-methods.sh:762
+#: ../lib/backup-methods.sh:807
 msgid "1 error occurred during the tarball generation."
 msgstr "E' stato riscontrato 1 errore nella creazione del tarball."
 
-#: ../lib/backup-methods.sh:764
+#: ../lib/backup-methods.sh:809
 #, sh-format
 msgid "$nb_err errors occurred during the tarball generation."
 msgstr "Riscontrati $nb_err errori nella generazione del tarball."
 
-#: ../lib/backup-methods.sh:775
+#: ../lib/backup-methods.sh:820
 #, sh-format
 msgid "The \"mysql\" method is chosen, but $mysqldump is not found."
 msgstr "E' stato scelto il metodo \"mysql\" ma $mysqldump non Ã¨ stato trovato."
 
-#: ../lib/backup-methods.sh:806
+#: ../lib/backup-methods.sh:830
 #, sh-format
+msgid "Using existing MySQL client configuration file: $HOME/.my.cnf"
+msgstr ""
+
+#: ../lib/backup-methods.sh:833
+#, sh-format
+msgid "Creating a default MySQL client configuration file: $HOME/.my.cnf"
+msgstr ""
+
+#: ../lib/backup-methods.sh:862
+#, sh-format
 msgid "The \"svn\" method is chosen, but $svnadmin is not found."
 msgstr "E' stato scelto il metodo \"svn\" ma  $svnadmin non Ã¨ stato trovato."
 
-#: ../lib/backup-methods.sh:812
+#: ../lib/backup-methods.sh:868
 #, sh-format
 msgid "SVN repository \"$repository\" is not valid; skipping."
 msgstr "Il repository SVN \"$repository\" non Ã¨ valido, continuo."
 
-#: ../lib/backup-methods.sh:837
+#: ../lib/backup-methods.sh:893
 #, sh-format
 msgid "Not enough args for this archive ($archive), skipping."
 msgstr ""
 "Non sono sufficienti gli args per questo archivio ($archive), proseguo."
 
-#: ../lib/backup-methods.sh:844
+#: ../lib/backup-methods.sh:900
 msgid "Cannot create archive."
 msgstr "Impossibile creare l'archivio."
 
@@ -214,7 +236,7 @@
 msgid "Deprecated boolean, $key is set to \"no\", setting \"false\" instead."
 msgstr "Deprecated boolean, $key is set to \"no\", setting \"false\" instead."
 
-#: ../lib/sanitize.sh:251
+#: ../lib/sanitize.sh:258
 #, sh-format
 msgid ""
 "When validating the configuration file $conffile, $nb_warnings warnings were "
@@ -223,94 +245,6 @@
 "Durante la validazione del file di configurazione $conffile, $nb_warnings "
 "sono stati trovati dei warning."
 
-#: ../lib/actions.sh:44
-msgid "No backup method used."
-msgstr "Nessun metodo di backup specificato."
-
-#: ../lib/actions.sh:47
-#, sh-format
-msgid "No such backup method: $BM_ARCHIVE_METHOD"
-msgstr "Nessun metodo di backup: $BM_ARCHIVE_METHOD"
-
-#: ../lib/actions.sh:56
-#, sh-format
-msgid "Unable to change the owner of \"$md5file\"."
-msgstr "Impossibile cambiare il proprietario di  \"$md5file\"."
-
-#: ../lib/actions.sh:58
-#, sh-format
-msgid "Unable to change file permissions of \"$md5file\"."
-msgstr "Impossibile cambiare i permessi di \"$md5file\"."
-
-#: ../lib/actions.sh:90
-msgid "No upload method used."
-msgstr "Nessun metodo di upload specificato."
-
-#: ../lib/actions.sh:93
-#, sh-format
-msgid "The upload method \"$method\" is not supported; skipping."
-msgstr "Il metodo di upload \"$method\" non Ã¨ supportato; vado avanti."
-
-#: ../lib/actions.sh:105
-#, sh-format
-msgid "Cleaning $BM_REPOSITORY_ROOT"
-msgstr "Pulisco $BM_REPOSITORY_ROOT"
-
-#: ../lib/actions.sh:118
-#, sh-format
-msgid "Running pre-command: $BM_PRE_BACKUP_COMMAND."
-msgstr "Eseguo il pre-command: $BM_PRE_BACKUP_COMMAND."
-
-#: ../lib/actions.sh:122
-msgid "Pre-command failed. Stopping the process."
-msgstr "il pre-command Ã¨ fallito. Termino il processo."
-
-#: ../lib/actions.sh:127
-#, sh-format
-msgid "Pre-command returned: \"$RET\" (success)."
-msgstr "Il pre-command ha restituito: \"$RET\" (operazione completata)"
-
-#: ../lib/actions.sh:139
-#, sh-format
-msgid "Running post-command: $BM_POST_BACKUP_COMMAND"
-msgstr "Eseguo il post-command: $BM_POST_BACKUP_COMMAND"
-
-#: ../lib/actions.sh:143
-msgid "Post-command failed."
-msgstr "il post-command Ã¨ fallito."
-
-#: ../lib/actions.sh:148
-#, sh-format
-msgid "Post-command returned: \"$RET\" (success)."
-msgstr "Il post-command ha restituito: \"$RET\" (operazione completata)"
-
-#: ../lib/actions.sh:175
-msgid ""
-"The BM_TARBALL_FILETYPE conf key is set to \"zip\" but zip is not installed."
-msgstr ""
-"Il parametro di configurazione BM_TARBALL_FILETYPE Ã¨ impostato su \"zip\" ma "
-"zip non Ã¨ installato."
-
-#: ../lib/actions.sh:180
-msgid ""
-"The BM_TARBALL_FILETYPE conf key is set to \"bzip2\" but bzip2 is not "
-"installed."
-msgstr ""
-"Il parametro di configurazione BM_TARBALL_FILETYPE Ã¨ impostato su \"bzip2\" "
-"ma bzip2 non Ã¨ installato."
-
-#: ../lib/actions.sh:185
-msgid ""
-"The BM_TARBALL_FILETYPE conf key is set to \"dar\" but dar is not installed."
-msgstr ""
-"Il parametro di configurazione BM_TARBALL_FILETYPE Ã¨ impostato su \"dar\" ma "
-"dar non Ã¨ installato."
-
-#: ../lib/actions.sh:197
-#, sh-format
-msgid "The repository $BM_REPOSITORY_ROOT does not exist, creating it."
-msgstr "Il repository $BM_REPOSITORY_ROOT non esiste, lo creo."
-
 #: ../lib/md5sum.sh:30
 msgid "Internal error: bad usage of function get_md5sum_from_file()"
 msgstr "Errore interno: utilizzo errato della funzione get_md5sum_from_file()"
@@ -389,12 +323,7 @@
 msgid "Disable the purge process."
 msgstr "Disabilita il porcesso di svoutamento"
 
-#: ../lib/dialog.sh:60
-msgid "Warning, process interrupted, archives may be corrupted."
-msgstr ""
-"Attenzione, processo interrotto, gli archivi potrebero essere corrotti."
-
-#: ../lib/dialog.sh:74 ../lib/dialog.sh:93
+#: ../lib/dialog.sh:62 ../lib/dialog.sh:81
 msgid "Not in interactive mode, cannot continue."
 msgstr "Non si Ã¨ in modalitÃ  interattiva, impossibile continuare."
 
@@ -406,10 +335,94 @@
 msgid "Releasing lock"
 msgstr "Rilascio il Lock"
 
-#: ../lib/archives.sh:31
-msgid "Internal error: wrong call to bm_merge_incremental_backups()."
-msgstr "Errore interno: chiamata errata per bm_merge_incremental_backups()."
+#: ../lib/actions.sh:44
+msgid "No backup method used."
+msgstr "Nessun metodo di backup specificato."
 
+#: ../lib/actions.sh:47
+#, sh-format
+msgid "No such backup method: $BM_ARCHIVE_METHOD"
+msgstr "Nessun metodo di backup: $BM_ARCHIVE_METHOD"
+
+#: ../lib/actions.sh:56
+#, sh-format
+msgid "Unable to change the owner of \"$md5file\"."
+msgstr "Impossibile cambiare il proprietario di  \"$md5file\"."
+
+#: ../lib/actions.sh:58
+#, sh-format
+msgid "Unable to change file permissions of \"$md5file\"."
+msgstr "Impossibile cambiare i permessi di \"$md5file\"."
+
+#: ../lib/actions.sh:90
+msgid "No upload method used."
+msgstr "Nessun metodo di upload specificato."
+
+#: ../lib/actions.sh:93
+#, sh-format
+msgid "The upload method \"$method\" is not supported; skipping."
+msgstr "Il metodo di upload \"$method\" non Ã¨ supportato; vado avanti."
+
+#: ../lib/actions.sh:105
+#, sh-format
+msgid "Cleaning $BM_REPOSITORY_ROOT"
+msgstr "Pulisco $BM_REPOSITORY_ROOT"
+
+#: ../lib/actions.sh:118
+#, sh-format
+msgid "Running pre-command: $BM_PRE_BACKUP_COMMAND."
+msgstr "Eseguo il pre-command: $BM_PRE_BACKUP_COMMAND."
+
+#: ../lib/actions.sh:122
+msgid "Pre-command failed. Stopping the process."
+msgstr "il pre-command Ã¨ fallito. Termino il processo."
+
+#: ../lib/actions.sh:127
+#, sh-format
+msgid "Pre-command returned: \"$RET\" (success)."
+msgstr "Il pre-command ha restituito: \"$RET\" (operazione completata)"
+
+#: ../lib/actions.sh:139
+#, sh-format
+msgid "Running post-command: $BM_POST_BACKUP_COMMAND"
+msgstr "Eseguo il post-command: $BM_POST_BACKUP_COMMAND"
+
+#: ../lib/actions.sh:143
+msgid "Post-command failed."
+msgstr "il post-command Ã¨ fallito."
+
+#: ../lib/actions.sh:148
+#, sh-format
+msgid "Post-command returned: \"$RET\" (success)."
+msgstr "Il post-command ha restituito: \"$RET\" (operazione completata)"
+
+#: ../lib/actions.sh:175
+msgid ""
+"The BM_TARBALL_FILETYPE conf key is set to \"zip\" but zip is not installed."
+msgstr ""
+"Il parametro di configurazione BM_TARBALL_FILETYPE Ã¨ impostato su \"zip\" ma "
+"zip non Ã¨ installato."
+
+#: ../lib/actions.sh:180
+msgid ""
+"The BM_TARBALL_FILETYPE conf key is set to \"bzip2\" but bzip2 is not "
+"installed."
+msgstr ""
+"Il parametro di configurazione BM_TARBALL_FILETYPE Ã¨ impostato su \"bzip2\" "
+"ma bzip2 non Ã¨ installato."
+
+#: ../lib/actions.sh:185
+msgid ""
+"The BM_TARBALL_FILETYPE conf key is set to \"dar\" but dar is not installed."
+msgstr ""
+"Il parametro di configurazione BM_TARBALL_FILETYPE Ã¨ impostato su \"dar\" ma "
+"dar non Ã¨ installato."
+
+#: ../lib/actions.sh:197
+#, sh-format
+msgid "The repository $BM_REPOSITORY_ROOT does not exist, creating it."
+msgstr "Il repository $BM_REPOSITORY_ROOT non esiste, lo creo."
+
 #: ../lib/files.sh:72 ../lib/files.sh:87
 msgid "No path given."
 msgstr "Nessun path specificato."
@@ -494,108 +507,6 @@
 msgid "$file is a duplicate of $file_to_create (using symlink)."
 msgstr "$file Ã¨ un duplicato di $file_to_create (utilizzo un symlink)."
 
-#: ../lib/upload-methods.sh:38
-msgid "Using the upload method \"ssh\"."
-msgstr "Utilizzo il metodo di upload \"ssh\"."
-
-#: ../lib/upload-methods.sh:47 ../lib/upload-methods.sh:85
-msgid "No valid destination found, SSH upload not possible."
-msgstr "Nessuna destinazione valida, impossibile eseguire l'upload via SSH."
-
-#: ../lib/upload-methods.sh:68
-#, sh-format
-msgid ""
-"Error reported by backup-manager-upload for method \"scp\", check \"$logfile"
-"\"."
-msgstr ""
-"Riscontrato errore da backup-manager-upload per il metodo \"scp\", "
-"controllare \"$logfile\"."
-
-#: ../lib/upload-methods.sh:76
-msgid "Using the upload method \"ssh-gpg\"."
-msgstr "Utilizzo il metodo di upload \"ssh-gpg\"."
-
-#: ../lib/upload-methods.sh:88
-msgid ""
-"No gpg recipient given. Argument is mandatory if upload method ssh-gpg is "
-"used."
-msgstr ""
-"Nessun destinatario gpg specificato. L'argomento Ã¨ necessario se si utilizza "
-"il metodo di upload ssh-gpg."
-
-#: ../lib/upload-methods.sh:105
-#, sh-format
-msgid ""
-"Error reported by backup-manager-upload for method \"ssh-gpg\", check "
-"\"$logfile\"."
-msgstr ""
-"Riscontrato errore da backup-manager-upload per il metodo \"ssh-gpg\", "
-"controllare \"$logfile\"."
-
-#: ../lib/upload-methods.sh:112
-msgid "Using the upload method \"ftp\"."
-msgstr "Utilizzo il metodo di upload \"ftp\"."
-
-#: ../lib/upload-methods.sh:122
-msgid "No valid destination found, FTP upload not possible."
-msgstr "Nessuna destinazione valida, impossibile eseguire l'upload via FTP."
-
-#: ../lib/upload-methods.sh:139
-#, sh-format
-msgid ""
-"Error reported by backup-manager-upload for method \"ftp\", check \"$logfile"
-"\"."
-msgstr ""
-"Riscontrato errore da backup-manager-upload per il metodo \"ftp\", "
-"controllare \"$logfile\"."
-
-#: ../lib/upload-methods.sh:147
-msgid "Using the upload method \"S3\"."
-msgstr "Utilizzo il metodo di upload \"S3\"."
-
-#: ../lib/upload-methods.sh:170
-#, sh-format
-msgid ""
-"Error reported by backup-manager-upload for method \"s3\", check \"$logfile"
-"\"."
-msgstr ""
-"Riscontrato errore da backup-manager-upload per il metodo \"s3\", "
-"controllare \"$logfile\"."
-
-#: ../lib/upload-methods.sh:176
-#, sh-format
-msgid "Uploading $directory to ${host}:${BM_UPLOAD_RSYNC_DESTINATION}"
-msgstr ""
-"Faccio l'upload di $directory su ${host}:${BM_UPLOAD_RSYNC_DESTINATION}"
-
-#: ../lib/upload-methods.sh:187
-msgid "Need a key to use rsync (set BM_UPLOAD_SSH_USER, BM_UPLOAD_SSH_KEY)."
-msgstr ""
-"E' necessaria una chiave per utilizzare rsync (impostare BM_UPLOAD_SSH_USER, "
-"BM_UPLOAD_SSH_KEY)."
-
-#: ../lib/upload-methods.sh:198
-#, sh-format
-msgid "Upload of $directory with rsync failed; check $logfile."
-msgstr "Upload di $directory tramite rsync fallito; controllare $logfile."
-
-#: ../lib/upload-methods.sh:217
-msgid "No valid destination found, RSYNC upload not possible."
-msgstr "Nessuna destinazione valida, impossibile eseguire l'upload via RSYNC."
-
-#: ../lib/upload-methods.sh:236
-msgid "No hosts given to the rsync method, set BM_UPLOAD_RSYNC_HOSTS."
-msgstr ""
-"Nessun host specificato per il metodo rsync, impostare BM_UPLOAD_RSYNC_HOSTS."
-
-#: ../lib/upload-methods.sh:243
-msgid "Using the upload method \"rsync\"."
-msgstr "Utilizzo il metodo di upload \"rsync\"."
-
-#: ../lib/upload-methods.sh:250
-msgid "Using the upload method \"rsync-snapshots\"."
-msgstr "Utilizzo il metodo di upload \"rsync-snapshots\"."
-
 #: ../lib/burning-methods.sh:38
 #, sh-format
 msgid "Device \"/dev/$device\" is mounted on \"$m\", unmounting it."
@@ -803,6 +714,108 @@
 msgid "Burning content of $index"
 msgstr "Masterizzo il contenuto di $index"
 
+#: ../lib/upload-methods.sh:38
+msgid "Using the upload method \"ssh\"."
+msgstr "Utilizzo il metodo di upload \"ssh\"."
+
+#: ../lib/upload-methods.sh:47 ../lib/upload-methods.sh:85
+msgid "No valid destination found, SSH upload not possible."
+msgstr "Nessuna destinazione valida, impossibile eseguire l'upload via SSH."
+
+#: ../lib/upload-methods.sh:68
+#, sh-format
+msgid ""
+"Error reported by backup-manager-upload for method \"scp\", check \"$logfile"
+"\"."
+msgstr ""
+"Riscontrato errore da backup-manager-upload per il metodo \"scp\", "
+"controllare \"$logfile\"."
+
+#: ../lib/upload-methods.sh:76
+msgid "Using the upload method \"ssh-gpg\"."
+msgstr "Utilizzo il metodo di upload \"ssh-gpg\"."
+
+#: ../lib/upload-methods.sh:88
+msgid ""
+"No gpg recipient given. Argument is mandatory if upload method ssh-gpg is "
+"used."
+msgstr ""
+"Nessun destinatario gpg specificato. L'argomento Ã¨ necessario se si utilizza "
+"il metodo di upload ssh-gpg."
+
+#: ../lib/upload-methods.sh:105
+#, sh-format
+msgid ""
+"Error reported by backup-manager-upload for method \"ssh-gpg\", check "
+"\"$logfile\"."
+msgstr ""
+"Riscontrato errore da backup-manager-upload per il metodo \"ssh-gpg\", "
+"controllare \"$logfile\"."
+
+#: ../lib/upload-methods.sh:112
+msgid "Using the upload method \"ftp\"."
+msgstr "Utilizzo il metodo di upload \"ftp\"."
+
+#: ../lib/upload-methods.sh:122
+msgid "No valid destination found, FTP upload not possible."
+msgstr "Nessuna destinazione valida, impossibile eseguire l'upload via FTP."
+
+#: ../lib/upload-methods.sh:139
+#, sh-format
+msgid ""
+"Error reported by backup-manager-upload for method \"ftp\", check \"$logfile"
+"\"."
+msgstr ""
+"Riscontrato errore da backup-manager-upload per il metodo \"ftp\", "
+"controllare \"$logfile\"."
+
+#: ../lib/upload-methods.sh:147
+msgid "Using the upload method \"S3\"."
+msgstr "Utilizzo il metodo di upload \"S3\"."
+
+#: ../lib/upload-methods.sh:170
+#, sh-format
+msgid ""
+"Error reported by backup-manager-upload for method \"s3\", check \"$logfile"
+"\"."
+msgstr ""
+"Riscontrato errore da backup-manager-upload per il metodo \"s3\", "
+"controllare \"$logfile\"."
+
+#: ../lib/upload-methods.sh:176
+#, sh-format
+msgid "Uploading $directory to ${host}:${BM_UPLOAD_RSYNC_DESTINATION}"
+msgstr ""
+"Faccio l'upload di $directory su ${host}:${BM_UPLOAD_RSYNC_DESTINATION}"
+
+#: ../lib/upload-methods.sh:187
+msgid "Need a key to use rsync (set BM_UPLOAD_SSH_USER, BM_UPLOAD_SSH_KEY)."
+msgstr ""
+"E' necessaria una chiave per utilizzare rsync (impostare BM_UPLOAD_SSH_USER, "
+"BM_UPLOAD_SSH_KEY)."
+
+#: ../lib/upload-methods.sh:198
+#, sh-format
+msgid "Upload of $directory with rsync failed; check $logfile."
+msgstr "Upload di $directory tramite rsync fallito; controllare $logfile."
+
+#: ../lib/upload-methods.sh:217
+msgid "No valid destination found, RSYNC upload not possible."
+msgstr "Nessuna destinazione valida, impossibile eseguire l'upload via RSYNC."
+
+#: ../lib/upload-methods.sh:236
+msgid "No hosts given to the rsync method, set BM_UPLOAD_RSYNC_HOSTS."
+msgstr ""
+"Nessun host specificato per il metodo rsync, impostare BM_UPLOAD_RSYNC_HOSTS."
+
+#: ../lib/upload-methods.sh:243
+msgid "Using the upload method \"rsync\"."
+msgstr "Utilizzo il metodo di upload \"rsync\"."
+
+#: ../lib/upload-methods.sh:250
+msgid "Using the upload method \"rsync-snapshots\"."
+msgstr "Utilizzo il metodo di upload \"rsync-snapshots\"."
+
 #: ../backup-manager:139
 msgid "The -b option must be followed by a valid date (YYYYMMDD)."
 msgstr "all'opzione -b deve seguire una data valida (AAAAMMGG)."
@@ -815,6 +828,12 @@
 msgid "Unable to exec the pre-command"
 msgstr "Impossibile eseguire il pre-command"
 
+#~ msgid "Compressor $compress requires $bzip."
+#~ msgstr "Il compressore $compress richiede $bzip."
+
+#~ msgid "Internal error: wrong call to bm_merge_incremental_backups()."
+#~ msgstr "Errore interno: chiamata errata per bm_merge_incremental_backups()."
+
 #~ msgid "CDROM burning requires $cdrecord, aborting."
 #~ msgstr ""
 #~ "La masterizzazione su CDROM richiede $cdrecord, annullo l'operazione."

Modified: backup-manager/trunk/po/nl.po
===================================================================
--- backup-manager/trunk/po/nl.po	2006-12-29 13:38:39 UTC (rev 527)
+++ backup-manager/trunk/po/nl.po	2007-01-02 13:54:03 UTC (rev 528)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-20 16:36+0200\n"
+"POT-Creation-Date: 2007-01-02 12:58+0100\n"
 "PO-Revision-Date: 2006-09-06 10:12+0100\n"
 "Last-Translator: Bjorn Wetzels <Bjorn.Wetzels at planet.nl>\n"
 "Language-Team: DUTCH\n"
@@ -20,159 +20,180 @@
 msgid "$file_to_create: ok (${size}M,"
 msgstr "$file_to_create: ok (${size}M,"
 
-#: ../lib/backup-methods.sh:48
+#: ../lib/backup-methods.sh:54
 #, sh-format
 msgid "Unable to purge duplicates of $file_to_create"
 msgstr "Kan duplicaten van $file_to_create niet weggooien"
 
-#: ../lib/backup-methods.sh:53
+#: ../lib/backup-methods.sh:59
 #, sh-format
 msgid "Unable to change the owner of \"$file_to_create\"."
 msgstr "Kan eigenaar van f \"$file_to_create\". niet wijzigen"
 
-#: ../lib/backup-methods.sh:55
+#: ../lib/backup-methods.sh:61
 #, sh-format
 msgid "Unable to change file permissions of \"$file_to_create\"."
 msgstr "Kan bestandsrechten van  \"$file_to_create\" niet wijzigen."
 
-#: ../lib/backup-methods.sh:80
+#: ../lib/backup-methods.sh:72
+#, fuzzy
+msgid "Warning, process interrupted."
+msgstr "Waarschuwing, proces onderbroken, Archieven kunnen corrupt zijn."
+
+#: ../lib/backup-methods.sh:76
+#, fuzzy, sh-format
+msgid "Removing archive \"$bm_pending_archive\" (build interrupted)."
+msgstr "Verwijderen archief \"$archive\"."
+
+#: ../lib/backup-methods.sh:82
 #, sh-format
+msgid ""
+"Restoring incremental-building details list: \"$bm_pending_incremental_list"
+"\"."
+msgstr ""
+
+#: ../lib/backup-methods.sh:116
+#, sh-format
 msgid "Unable to create \"$target\", check $logfile"
 msgstr "Kan doel \"$target\" niet maken, controleer $logfile"
 
-#: ../lib/backup-methods.sh:94
+#: ../lib/backup-methods.sh:130
 #, sh-format
 msgid "File $file_to_create already exists, skipping."
 msgstr "Bestand $file_to_create bestaat reeds, overslaan."
 
-#: ../lib/backup-methods.sh:108 ../lib/backup-methods.sh:128
-#: ../lib/backup-methods.sh:149
+#: ../lib/backup-methods.sh:161 ../lib/backup-methods.sh:185
 #, sh-format
 msgid "Unable to exec $command; check $logfile"
 msgstr "Uitvoeren van commando $command niet mogelijk; controleer $logfile"
 
-#: ../lib/backup-methods.sh:116
-#, sh-format
-msgid "Compressor $compress requires $gzip."
+#: ../lib/backup-methods.sh:167
+#, fuzzy, sh-format
+msgid "Compressor $compress is needed."
 msgstr "Comprimeer-programma $compress benodigt $gzip"
 
-#: ../lib/backup-methods.sh:136
+#: ../lib/backup-methods.sh:192
 #, sh-format
-msgid "Compressor $compress requires $bzip."
-msgstr "Comprimeer-programma $compress benodigt $bzip"
-
-#: ../lib/backup-methods.sh:156
-#, sh-format
 msgid "No such compressor supported: $compress."
 msgstr "$compress wordt niet ondersteund"
 
-#: ../lib/backup-methods.sh:162
+#: ../lib/backup-methods.sh:198
 #, sh-format
 msgid "Unable to find $file_to_create"
 msgstr "Bestand niet gevonden: $file_to_create"
 
-#: ../lib/backup-methods.sh:289
+#: ../lib/backup-methods.sh:325
 msgid "No frequency given, set BM_TARBALLINC_MASTERDATETYPE."
 msgstr "Onbekende frequentie: $BM_TARBALLINC_MASTERDATETYPE"
 
-#: ../lib/backup-methods.sh:300
+#: ../lib/backup-methods.sh:336
 #, sh-format
 msgid "Unknown frequency: $BM_TARBALLINC_MASTERDATETYPE"
 msgstr "Onbekende frequentie: $BM_TARBALLINC_MASTERDATETYPE"
 
-#: ../lib/backup-methods.sh:328
+#: ../lib/backup-methods.sh:369
 #, sh-format
 msgid "Building master backup for target: \"$dir_name\"."
 msgstr "Maken Master Backup voor doel: \"$dir_name\"."
 
-#: ../lib/backup-methods.sh:452
+#: ../lib/backup-methods.sh:493
 #, sh-format
 msgid "The archive type \"tar.bz2\" depends on the tool \"$bzip\"."
 msgstr "Het archieftype \"tar.bz2\" is afhankelijk van de tool \"$bzip\"."
 
-#: ../lib/backup-methods.sh:459
+#: ../lib/backup-methods.sh:500
 #, sh-format
 msgid "The archive type \"tar.lz\" depends on the tool \"$lzma\"."
 msgstr "Het archieftype \"tar.lz\" is afhankelijk van de tool \"$lzma\"."
 
-#: ../lib/backup-methods.sh:466
+#: ../lib/backup-methods.sh:507
 #, sh-format
 msgid "The archive type \"zip\" depends on the tool \"$zip\"."
 msgstr "Het archieftype \"zip\" is afhankelijk van de tool \"$zip\"."
 
-#: ../lib/backup-methods.sh:472
+#: ../lib/backup-methods.sh:513
 #, sh-format
 msgid "The archive type \"dar\" depends on the tool \"$dar\"."
 msgstr "Het archieftype \"dar\" is afhankelijjk van de tool \"$dar\"."
 
-#: ../lib/backup-methods.sh:478 ../lib/backup-methods.sh:579
-#: ../lib/backup-methods.sh:620
+#: ../lib/backup-methods.sh:519 ../lib/backup-methods.sh:619
+#: ../lib/backup-methods.sh:665
 #, sh-format
 msgid "The archive type \"$BM_TARBALL_FILETYPE\" is not supported."
 msgstr "Het bestandstype $BM_TARBALL_FILETYPE wordt niet ondersteund."
 
-#: ../lib/backup-methods.sh:549
+#: ../lib/backup-methods.sh:589
 msgid "The configuration variable \"BM_ENCRYPTION_RECIPIENT\" must be defined."
 msgstr ""
 "De configuratiesleutel \"BM_ENCRYPTION_RECIPIENT\" moet worden gedefinieerd."
 
-#: ../lib/backup-methods.sh:555
+#: ../lib/backup-methods.sh:595
 #, sh-format
 msgid ""
 "The encryption is not yet possible with \"$BM_TARBALL_FILETYPE\" archives."
 msgstr "Encryptie is nog niet mogelijk voor\"$BM_TARBALL_FILETYPE\" archieven"
 
-#: ../lib/backup-methods.sh:596
+#: ../lib/backup-methods.sh:637
 #, sh-format
 msgid "The program \"$gpg\" is needed."
 msgstr "Het programma \"$gpg\" is benodigd."
 
-#: ../lib/backup-methods.sh:603 ../lib/backup-methods.sh:640
+#: ../lib/backup-methods.sh:646 ../lib/backup-methods.sh:685
 #, sh-format
 msgid "File $file_to_check already exists, skipping."
 msgstr "Bestand $file_to_check bestaat reeds, overslaan."
 
-#: ../lib/backup-methods.sh:663
+#: ../lib/backup-methods.sh:708
 #, sh-format
 msgid "Target \"$t\" does not exist, skipping."
 msgstr "Doel: \"$t\" bestaat niet, overslaan."
 
-#: ../lib/backup-methods.sh:738 ../lib/backup-methods.sh:773
-#: ../lib/backup-methods.sh:804 ../lib/backup-methods.sh:828
+#: ../lib/backup-methods.sh:783 ../lib/backup-methods.sh:818
+#: ../lib/backup-methods.sh:860 ../lib/backup-methods.sh:884
 #, sh-format
 msgid "Using method \"$method\"."
 msgstr "Gebruik Methode\"$method\"."
 
-#: ../lib/backup-methods.sh:762
+#: ../lib/backup-methods.sh:807
 msgid "1 error occurred during the tarball generation."
 msgstr "1 fout voorgekomen tijdens het maken van de tarball"
 
-#: ../lib/backup-methods.sh:764
+#: ../lib/backup-methods.sh:809
 #, sh-format
 msgid "$nb_err errors occurred during the tarball generation."
 msgstr "$nb_err fouten voorgekomen tijdens het maken van de tarball"
 
-#: ../lib/backup-methods.sh:775
+#: ../lib/backup-methods.sh:820
 #, sh-format
 msgid "The \"mysql\" method is chosen, but $mysqldump is not found."
 msgstr "De \"mysql\" methode is gekozen, maar $mysqldump is niet gevonden."
 
-#: ../lib/backup-methods.sh:806
+#: ../lib/backup-methods.sh:830
 #, sh-format
+msgid "Using existing MySQL client configuration file: $HOME/.my.cnf"
+msgstr ""
+
+#: ../lib/backup-methods.sh:833
+#, sh-format
+msgid "Creating a default MySQL client configuration file: $HOME/.my.cnf"
+msgstr ""
+
+#: ../lib/backup-methods.sh:862
+#, sh-format
 msgid "The \"svn\" method is chosen, but $svnadmin is not found."
 msgstr "De \"svn\" methode is gekozen, maar $svnadmin is niet gevonden."
 
-#: ../lib/backup-methods.sh:812
+#: ../lib/backup-methods.sh:868
 #, sh-format
 msgid "SVN repository \"$repository\" is not valid; skipping."
 msgstr "SVN verzameling \"$repository\" is niet geldig; overslaan."
 
-#: ../lib/backup-methods.sh:837
+#: ../lib/backup-methods.sh:893
 #, sh-format
 msgid "Not enough args for this archive ($archive), skipping."
 msgstr "Niet genoeg argumenten meegegeven voor archief ($archive), overslaan."
 
-#: ../lib/backup-methods.sh:844
+#: ../lib/backup-methods.sh:900
 msgid "Cannot create archive."
 msgstr "Kan archief niet maken"
 
@@ -207,7 +228,7 @@
 msgid "Deprecated boolean, $key is set to \"no\", setting \"false\" instead."
 msgstr "Verouderde boolean, $key is ingesteld op \"no\", Gebruik nu \"false"
 
-#: ../lib/sanitize.sh:251
+#: ../lib/sanitize.sh:258
 #, sh-format
 msgid ""
 "When validating the configuration file $conffile, $nb_warnings warnings were "
@@ -216,94 +237,6 @@
 "Tijdens het valideren van het configuratiebestand $conffile zijn "
 "$nb_warnings waarchuwing(en)  gevonden"
 
-#: ../lib/actions.sh:44
-msgid "No backup method used."
-msgstr "Geen backup methode gebruikt."
-
-#: ../lib/actions.sh:47
-#, sh-format
-msgid "No such backup method: $BM_ARCHIVE_METHOD"
-msgstr "Backup methode bestaat niet: $BM_ARCHIVE_METHOD"
-
-#: ../lib/actions.sh:56
-#, sh-format
-msgid "Unable to change the owner of \"$md5file\"."
-msgstr "Niet mogelijk om eigenaar van bestand  \"$md5file\" te wijzigen"
-
-#: ../lib/actions.sh:58
-#, sh-format
-msgid "Unable to change file permissions of \"$md5file\"."
-msgstr "Niet mogelijk om bestandsrechten te veranderen van \"$md5file\"."
-
-#: ../lib/actions.sh:90
-msgid "No upload method used."
-msgstr "Geen upload methode gebruikt."
-
-#: ../lib/actions.sh:93
-#, sh-format
-msgid "The upload method \"$method\" is not supported; skipping."
-msgstr "De Upload methode \"$method\" Wordt niet ondersteund; overslaan."
-
-#: ../lib/actions.sh:105
-#, sh-format
-msgid "Cleaning $BM_REPOSITORY_ROOT"
-msgstr "Opschonen $BM_REPOSITORY_ROOT"
-
-#: ../lib/actions.sh:118
-#, sh-format
-msgid "Running pre-command: $BM_PRE_BACKUP_COMMAND."
-msgstr "Uitvoeren van  pre-commando: $BM_PRE_BACKUP_COMMAND."
-
-#: ../lib/actions.sh:122
-msgid "Pre-command failed. Stopping the process."
-msgstr "Pre-commando fout. Stoppen van proces."
-
-#: ../lib/actions.sh:127
-#, sh-format
-msgid "Pre-command returned: \"$RET\" (success)."
-msgstr "Pre-commando retourneerde: \"$RET\" (success)."
-
-#: ../lib/actions.sh:139
-#, sh-format
-msgid "Running post-command: $BM_POST_BACKUP_COMMAND"
-msgstr "Uitvoeren post-commando: $BM_POST_BACKUP_COMMAND"
-
-#: ../lib/actions.sh:143
-msgid "Post-command failed."
-msgstr "Post-commando fout."
-
-#: ../lib/actions.sh:148
-#, sh-format
-msgid "Post-command returned: \"$RET\" (success)."
-msgstr "Post-commando retourneerde: \"$RET\" (success)."
-
-#: ../lib/actions.sh:175
-msgid ""
-"The BM_TARBALL_FILETYPE conf key is set to \"zip\" but zip is not installed."
-msgstr ""
-"De BM_TARBALL_FILETYPE configuratiesleutel is ingesteld op  \"zip\" maar zip "
-"is niet geinstalleerd."
-
-#: ../lib/actions.sh:180
-msgid ""
-"The BM_TARBALL_FILETYPE conf key is set to \"bzip2\" but bzip2 is not "
-"installed."
-msgstr ""
-"De BM_TARBALL_FILETYPE configuratiesleutel is ingesteld op  \"bzip2\" maar "
-"bzip2 is niet geinstalleerd."
-
-#: ../lib/actions.sh:185
-msgid ""
-"The BM_TARBALL_FILETYPE conf key is set to \"dar\" but dar is not installed."
-msgstr ""
-"De BM_TARBALL_FILETYPE configuratiesleutel is ingesteld op  \"dar\" maar dar "
-"is niet geinstalleerd."
-
-#: ../lib/actions.sh:197
-#, sh-format
-msgid "The repository $BM_REPOSITORY_ROOT does not exist, creating it."
-msgstr "$BM_REPOSITORY_ROOT bestaat niet, maken"
-
 #: ../lib/md5sum.sh:30
 msgid "Internal error: bad usage of function get_md5sum_from_file()"
 msgstr "Interne error: fout gebruik van functie get_md5sum_from_file()"
@@ -382,11 +315,7 @@
 msgid "Disable the purge process."
 msgstr "Schakel het verwijder proces uit."
 
-#: ../lib/dialog.sh:60
-msgid "Warning, process interrupted, archives may be corrupted."
-msgstr "Waarschuwing, proces onderbroken, Archieven kunnen corrupt zijn."
-
-#: ../lib/dialog.sh:74 ../lib/dialog.sh:93
+#: ../lib/dialog.sh:62 ../lib/dialog.sh:81
 msgid "Not in interactive mode, cannot continue."
 msgstr "Niet in interactive modus, kan niet verder gaan."
 
@@ -398,10 +327,94 @@
 msgid "Releasing lock"
 msgstr "Vergrendeling vrijgeven"
 
-#: ../lib/archives.sh:31
-msgid "Internal error: wrong call to bm_merge_incremental_backups()."
-msgstr "Interne fout: verkeerde call naar bm_merge_incremental_backups()."
+#: ../lib/actions.sh:44
+msgid "No backup method used."
+msgstr "Geen backup methode gebruikt."
 
+#: ../lib/actions.sh:47
+#, sh-format
+msgid "No such backup method: $BM_ARCHIVE_METHOD"
+msgstr "Backup methode bestaat niet: $BM_ARCHIVE_METHOD"
+
+#: ../lib/actions.sh:56
+#, sh-format
+msgid "Unable to change the owner of \"$md5file\"."
+msgstr "Niet mogelijk om eigenaar van bestand  \"$md5file\" te wijzigen"
+
+#: ../lib/actions.sh:58
+#, sh-format
+msgid "Unable to change file permissions of \"$md5file\"."
+msgstr "Niet mogelijk om bestandsrechten te veranderen van \"$md5file\"."
+
+#: ../lib/actions.sh:90
+msgid "No upload method used."
+msgstr "Geen upload methode gebruikt."
+
+#: ../lib/actions.sh:93
+#, sh-format
+msgid "The upload method \"$method\" is not supported; skipping."
+msgstr "De Upload methode \"$method\" Wordt niet ondersteund; overslaan."
+
+#: ../lib/actions.sh:105
+#, sh-format
+msgid "Cleaning $BM_REPOSITORY_ROOT"
+msgstr "Opschonen $BM_REPOSITORY_ROOT"
+
+#: ../lib/actions.sh:118
+#, sh-format
+msgid "Running pre-command: $BM_PRE_BACKUP_COMMAND."
+msgstr "Uitvoeren van  pre-commando: $BM_PRE_BACKUP_COMMAND."
+
+#: ../lib/actions.sh:122
+msgid "Pre-command failed. Stopping the process."
+msgstr "Pre-commando fout. Stoppen van proces."
+
+#: ../lib/actions.sh:127
+#, sh-format
+msgid "Pre-command returned: \"$RET\" (success)."
+msgstr "Pre-commando retourneerde: \"$RET\" (success)."
+
+#: ../lib/actions.sh:139
+#, sh-format
+msgid "Running post-command: $BM_POST_BACKUP_COMMAND"
+msgstr "Uitvoeren post-commando: $BM_POST_BACKUP_COMMAND"
+
+#: ../lib/actions.sh:143
+msgid "Post-command failed."
+msgstr "Post-commando fout."
+
+#: ../lib/actions.sh:148
+#, sh-format
+msgid "Post-command returned: \"$RET\" (success)."
+msgstr "Post-commando retourneerde: \"$RET\" (success)."
+
+#: ../lib/actions.sh:175
+msgid ""
+"The BM_TARBALL_FILETYPE conf key is set to \"zip\" but zip is not installed."
+msgstr ""
+"De BM_TARBALL_FILETYPE configuratiesleutel is ingesteld op  \"zip\" maar zip "
+"is niet geinstalleerd."
+
+#: ../lib/actions.sh:180
+msgid ""
+"The BM_TARBALL_FILETYPE conf key is set to \"bzip2\" but bzip2 is not "
+"installed."
+msgstr ""
+"De BM_TARBALL_FILETYPE configuratiesleutel is ingesteld op  \"bzip2\" maar "
+"bzip2 is niet geinstalleerd."
+
+#: ../lib/actions.sh:185
+msgid ""
+"The BM_TARBALL_FILETYPE conf key is set to \"dar\" but dar is not installed."
+msgstr ""
+"De BM_TARBALL_FILETYPE configuratiesleutel is ingesteld op  \"dar\" maar dar "
+"is niet geinstalleerd."
+
+#: ../lib/actions.sh:197
+#, sh-format
+msgid "The repository $BM_REPOSITORY_ROOT does not exist, creating it."
+msgstr "$BM_REPOSITORY_ROOT bestaat niet, maken"
+
 #: ../lib/files.sh:72 ../lib/files.sh:87
 msgid "No path given."
 msgstr "Geen Pad opgegeven"
@@ -484,106 +497,6 @@
 msgid "$file is a duplicate of $file_to_create (using symlink)."
 msgstr "$file is een duplicaat van $file_to_create (door symlink)"
 
-#: ../lib/upload-methods.sh:38
-msgid "Using the upload method \"ssh\"."
-msgstr "Gebruik Upload Methode \"ssh\"."
-
-#: ../lib/upload-methods.sh:47 ../lib/upload-methods.sh:85
-msgid "No valid destination found, SSH upload not possible."
-msgstr "Geen geldige doellokatie opgegeven, SSH upload niet mogelijk."
-
-#: ../lib/upload-methods.sh:68
-#, sh-format
-msgid ""
-"Error reported by backup-manager-upload for method \"scp\", check \"$logfile"
-"\"."
-msgstr ""
-"Fouten gemeld door backup-manager-upload voor methode \"scp\", controleer "
-"\"$logfile\"."
-
-#: ../lib/upload-methods.sh:76
-msgid "Using the upload method \"ssh-gpg\"."
-msgstr "Gebruik Upload Methode \"ssh-gpg\"."
-
-#: ../lib/upload-methods.sh:88
-msgid ""
-"No gpg recipient given. Argument is mandatory if upload method ssh-gpg is "
-"used."
-msgstr ""
-"Geen gpg ontvanger opgegeven. Argument is verplicht wanneer ssh-gpg als "
-"upload methode is aangegeven."
-
-#: ../lib/upload-methods.sh:105
-#, sh-format
-msgid ""
-"Error reported by backup-manager-upload for method \"ssh-gpg\", check "
-"\"$logfile\"."
-msgstr ""
-"Fouten gemeld door backup-manager-upload voor methode \"ssh-gpg\", "
-"controleer \"$logfile\"."
-
-#: ../lib/upload-methods.sh:112
-msgid "Using the upload method \"ftp\"."
-msgstr "Gebruik Upload Methode \"ftp\"."
-
-#: ../lib/upload-methods.sh:122
-msgid "No valid destination found, FTP upload not possible."
-msgstr "Geen geldig doel opgegeven, FTP upload niet mogelijk."
-
-#: ../lib/upload-methods.sh:139
-#, sh-format
-msgid ""
-"Error reported by backup-manager-upload for method \"ftp\", check \"$logfile"
-"\"."
-msgstr ""
-"Fouten gemeld door backup-manager-upload voor methode \"ftp\", controleer "
-"\"$logfile\"."
-
-#: ../lib/upload-methods.sh:147
-msgid "Using the upload method \"S3\"."
-msgstr "Gebruik Upload Methode \"S3\"."
-
-#: ../lib/upload-methods.sh:170
-#, sh-format
-msgid ""
-"Error reported by backup-manager-upload for method \"s3\", check \"$logfile"
-"\"."
-msgstr ""
-"Fouten gemeld door backup-manager-upload voor methode \"s3\", controleer "
-"\"$logfile\"."
-
-#: ../lib/upload-methods.sh:176
-#, sh-format
-msgid "Uploading $directory to ${host}:${BM_UPLOAD_RSYNC_DESTINATION}"
-msgstr "Uploaden $directory naar ${host}:${BM_UPLOAD_RSYNC_DESTINATION}"
-
-#: ../lib/upload-methods.sh:187
-msgid "Need a key to use rsync (set BM_UPLOAD_SSH_USER, BM_UPLOAD_SSH_KEY)."
-msgstr ""
-"Sleutel nodig voor rsync (stel in: BM_UPLOAD_SSH_USER, BM_UPLOAD_SSH_KEY)"
-
-#: ../lib/upload-methods.sh:198
-#, sh-format
-msgid "Upload of $directory with rsync failed; check $logfile."
-msgstr "Uploaden van map $directory met rsync fout; controleer $logfile."
-
-#: ../lib/upload-methods.sh:217
-msgid "No valid destination found, RSYNC upload not possible."
-msgstr "Geen geldig doel opgegeven, RSYNC upload niet mogelijk."
-
-#: ../lib/upload-methods.sh:236
-msgid "No hosts given to the rsync method, set BM_UPLOAD_RSYNC_HOSTS."
-msgstr ""
-"Geen Hosts opgegeven voor rsync methode, stel in: BM_UPLOAD_RSYNC_HOSTS."
-
-#: ../lib/upload-methods.sh:243
-msgid "Using the upload method \"rsync\"."
-msgstr "Gebruik Upload Methode \"rsync\"."
-
-#: ../lib/upload-methods.sh:250
-msgid "Using the upload method \"rsync-snapshots\"."
-msgstr "Gebruik Upload Methode \"rsync-snapshots\"."
-
 #: ../lib/burning-methods.sh:38
 #, sh-format
 msgid "Device \"/dev/$device\" is mounted on \"$m\", unmounting it."
@@ -787,6 +700,106 @@
 msgid "Burning content of $index"
 msgstr "Branden inhoud van $index"
 
+#: ../lib/upload-methods.sh:38
+msgid "Using the upload method \"ssh\"."
+msgstr "Gebruik Upload Methode \"ssh\"."
+
+#: ../lib/upload-methods.sh:47 ../lib/upload-methods.sh:85
+msgid "No valid destination found, SSH upload not possible."
+msgstr "Geen geldige doellokatie opgegeven, SSH upload niet mogelijk."
+
+#: ../lib/upload-methods.sh:68
+#, sh-format
+msgid ""
+"Error reported by backup-manager-upload for method \"scp\", check \"$logfile"
+"\"."
+msgstr ""
+"Fouten gemeld door backup-manager-upload voor methode \"scp\", controleer "
+"\"$logfile\"."
+
+#: ../lib/upload-methods.sh:76
+msgid "Using the upload method \"ssh-gpg\"."
+msgstr "Gebruik Upload Methode \"ssh-gpg\"."
+
+#: ../lib/upload-methods.sh:88
+msgid ""
+"No gpg recipient given. Argument is mandatory if upload method ssh-gpg is "
+"used."
+msgstr ""
+"Geen gpg ontvanger opgegeven. Argument is verplicht wanneer ssh-gpg als "
+"upload methode is aangegeven."
+
+#: ../lib/upload-methods.sh:105
+#, sh-format
+msgid ""
+"Error reported by backup-manager-upload for method \"ssh-gpg\", check "
+"\"$logfile\"."
+msgstr ""
+"Fouten gemeld door backup-manager-upload voor methode \"ssh-gpg\", "
+"controleer \"$logfile\"."
+
+#: ../lib/upload-methods.sh:112
+msgid "Using the upload method \"ftp\"."
+msgstr "Gebruik Upload Methode \"ftp\"."
+
+#: ../lib/upload-methods.sh:122
+msgid "No valid destination found, FTP upload not possible."
+msgstr "Geen geldig doel opgegeven, FTP upload niet mogelijk."
+
+#: ../lib/upload-methods.sh:139
+#, sh-format
+msgid ""
+"Error reported by backup-manager-upload for method \"ftp\", check \"$logfile"
+"\"."
+msgstr ""
+"Fouten gemeld door backup-manager-upload voor methode \"ftp\", controleer "
+"\"$logfile\"."
+
+#: ../lib/upload-methods.sh:147
+msgid "Using the upload method \"S3\"."
+msgstr "Gebruik Upload Methode \"S3\"."
+
+#: ../lib/upload-methods.sh:170
+#, sh-format
+msgid ""
+"Error reported by backup-manager-upload for method \"s3\", check \"$logfile"
+"\"."
+msgstr ""
+"Fouten gemeld door backup-manager-upload voor methode \"s3\", controleer "
+"\"$logfile\"."
+
+#: ../lib/upload-methods.sh:176
+#, sh-format
+msgid "Uploading $directory to ${host}:${BM_UPLOAD_RSYNC_DESTINATION}"
+msgstr "Uploaden $directory naar ${host}:${BM_UPLOAD_RSYNC_DESTINATION}"
+
+#: ../lib/upload-methods.sh:187
+msgid "Need a key to use rsync (set BM_UPLOAD_SSH_USER, BM_UPLOAD_SSH_KEY)."
+msgstr ""
+"Sleutel nodig voor rsync (stel in: BM_UPLOAD_SSH_USER, BM_UPLOAD_SSH_KEY)"
+
+#: ../lib/upload-methods.sh:198
+#, sh-format
+msgid "Upload of $directory with rsync failed; check $logfile."
+msgstr "Uploaden van map $directory met rsync fout; controleer $logfile."
+
+#: ../lib/upload-methods.sh:217
+msgid "No valid destination found, RSYNC upload not possible."
+msgstr "Geen geldig doel opgegeven, RSYNC upload niet mogelijk."
+
+#: ../lib/upload-methods.sh:236
+msgid "No hosts given to the rsync method, set BM_UPLOAD_RSYNC_HOSTS."
+msgstr ""
+"Geen Hosts opgegeven voor rsync methode, stel in: BM_UPLOAD_RSYNC_HOSTS."
+
+#: ../lib/upload-methods.sh:243
+msgid "Using the upload method \"rsync\"."
+msgstr "Gebruik Upload Methode \"rsync\"."
+
+#: ../lib/upload-methods.sh:250
+msgid "Using the upload method \"rsync-snapshots\"."
+msgstr "Gebruik Upload Methode \"rsync-snapshots\"."
+
 #: ../backup-manager:139
 msgid "The -b option must be followed by a valid date (YYYYMMDD)."
 msgstr "-b optie moet gevolgd worden door Valide datum (YYYYMMDD)."
@@ -799,6 +812,12 @@
 msgid "Unable to exec the pre-command"
 msgstr "Pre-commando uitvoeren niet mogelijk"
 
+#~ msgid "Compressor $compress requires $bzip."
+#~ msgstr "Comprimeer-programma $compress benodigt $bzip"
+
+#~ msgid "Internal error: wrong call to bm_merge_incremental_backups()."
+#~ msgstr "Interne fout: verkeerde call naar bm_merge_incremental_backups()."
+
 #~ msgid "CDROM burning requires $cdrecord, aborting."
 #~ msgstr "CDROM Branden vereist $cdrecord, afbreken."
 

Modified: backup-manager/trunk/po/vi.po
===================================================================
--- backup-manager/trunk/po/vi.po	2006-12-29 13:38:39 UTC (rev 527)
+++ backup-manager/trunk/po/vi.po	2007-01-02 13:54:03 UTC (rev 528)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: backup-manager 0.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-20 16:36+0200\n"
+"POT-Creation-Date: 2007-01-02 12:58+0100\n"
 "PO-Revision-Date: 2006-09-15 15:47+0930\n"
 "Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN at googlegroups.com>\n"
@@ -21,161 +21,182 @@
 msgid "$file_to_create: ok (${size}M,"
 msgstr "$file_to_create: Ä‘Æ°á»£c (${size}M,"
 
-#: ../lib/backup-methods.sh:48
+#: ../lib/backup-methods.sh:54
 #, sh-format
 msgid "Unable to purge duplicates of $file_to_create"
 msgstr "KhÃ´ng thá»ƒ táº©y cÃ¡c báº£n sao cá»§a táºp tin Â« $file_to_create Â»"
 
-#: ../lib/backup-methods.sh:53
+#: ../lib/backup-methods.sh:59
 #, sh-format
 msgid "Unable to change the owner of \"$file_to_create\"."
 msgstr "KhÃ´ng thá»ƒ thay Ä‘á»•i ngÆ°á»i sá»Ÿ há»¯u táºp tin Â« $file_to_create Â»."
 
-#: ../lib/backup-methods.sh:55
+#: ../lib/backup-methods.sh:61
 #, sh-format
 msgid "Unable to change file permissions of \"$file_to_create\"."
 msgstr "KhÃ´ng thá»ƒ thay Ä‘á»•i quyá»n háº¡n cá»§a táºp tin Â« $file_to_create Â»."
 
-#: ../lib/backup-methods.sh:80
+#: ../lib/backup-methods.sh:72
+#, fuzzy
+msgid "Warning, process interrupted."
+msgstr "Cáº£nh bÃ¡o : tiáº¿n trÃ¬nh bá»‹ ngáº¯t thÃ¬ kho cÃ³ thá»ƒ bá»‹ há»ng."
+
+#: ../lib/backup-methods.sh:76
+#, fuzzy, sh-format
+msgid "Removing archive \"$bm_pending_archive\" (build interrupted)."
+msgstr "Äang gá»¡ bá» kho nÃ©n Â« $archive Â»."
+
+#: ../lib/backup-methods.sh:82
 #, sh-format
+msgid ""
+"Restoring incremental-building details list: \"$bm_pending_incremental_list"
+"\"."
+msgstr ""
+
+#: ../lib/backup-methods.sh:116
+#, sh-format
 msgid "Unable to create \"$target\", check $logfile"
 msgstr ""
 "KhÃ´ng thá»ƒ táº¡o Ä‘Ãch Â« $target Â», hÃ£y kiá»ƒm tra láº¡i táºp tin báº£n ghi Â« $logfile Â»"
 
-#: ../lib/backup-methods.sh:94
+#: ../lib/backup-methods.sh:130
 #, sh-format
 msgid "File $file_to_create already exists, skipping."
 msgstr "Táºp tin Â« $file_to_create Â» Ä‘Ã£ cÃ³ nÃªn bá» qua."
 
-#: ../lib/backup-methods.sh:108 ../lib/backup-methods.sh:128
-#: ../lib/backup-methods.sh:149
+#: ../lib/backup-methods.sh:161 ../lib/backup-methods.sh:185
 #, sh-format
 msgid "Unable to exec $command; check $logfile"
 msgstr ""
 "KhÃ´ng thá»ƒ thá»±c hiá»‡n lá»‡nh Â« $command Â»; hÃ£y kiá»ƒm tra láº¡i táºp tin báº£n ghi Â« "
 "$logfile Â»"
 
-#: ../lib/backup-methods.sh:116
-#, sh-format
-msgid "Compressor $compress requires $gzip."
+#: ../lib/backup-methods.sh:167
+#, fuzzy, sh-format
+msgid "Compressor $compress is needed."
 msgstr "Bá»™ nÃ©n Â« $compress Â» cáº§n thiáº¿t $gzip."
 
-#: ../lib/backup-methods.sh:136
+#: ../lib/backup-methods.sh:192
 #, sh-format
-msgid "Compressor $compress requires $bzip."
-msgstr "Bá»™ nÃ©n Â« $compress Â» cáº§n thiáº¿t $bzip."
-
-#: ../lib/backup-methods.sh:156
-#, sh-format
 msgid "No such compressor supported: $compress."
 msgstr "KhÃ´ng há»— trá»£ bá»™ nÃ©n nhÆ° váºy: $compress."
 
-#: ../lib/backup-methods.sh:162
+#: ../lib/backup-methods.sh:198
 #, sh-format
 msgid "Unable to find $file_to_create"
 msgstr "KhÃ´ng tÃ¬m tháº¥y táºp tin Â« $file_to_create Â»"
 
-#: ../lib/backup-methods.sh:289
+#: ../lib/backup-methods.sh:325
 msgid "No frequency given, set BM_TARBALLINC_MASTERDATETYPE."
 msgstr "ChÆ°a nháºp táº§n sá»‘, Ä‘áº·t $BM_TARBALLINC_MASTERDATETYPE"
 
-#: ../lib/backup-methods.sh:300
+#: ../lib/backup-methods.sh:336
 #, sh-format
 msgid "Unknown frequency: $BM_TARBALLINC_MASTERDATETYPE"
 msgstr "KhÃ´ng biáº¿t táº§n sá»‘ : $BM_TARBALLINC_MASTERDATETYPE"
 
-#: ../lib/backup-methods.sh:328
+#: ../lib/backup-methods.sh:369
 #, sh-format
 msgid "Building master backup for target: \"$dir_name\"."
 msgstr "Äang xÃ¢y dá»±ng báº£n sao lÆ°u chÃnh cho Ä‘Ãch: Â« $dir_name Â»."
 
-#: ../lib/backup-methods.sh:452
+#: ../lib/backup-methods.sh:493
 #, sh-format
 msgid "The archive type \"tar.bz2\" depends on the tool \"$bzip\"."
 msgstr "Kiá»ƒu kho nÃ©n Â« tar.bz2 Â» phá»¥ thuá»™c vÃ o cÃ´ng cá»¥ Â« $bzip Â»."
 
-#: ../lib/backup-methods.sh:459
+#: ../lib/backup-methods.sh:500
 #, sh-format
 msgid "The archive type \"tar.lz\" depends on the tool \"$lzma\"."
 msgstr "Kiá»ƒu kho nÃ©n Â« tar.lz Â» phá»¥ thuá»™c vÃ o cÃ´ng cá»¥ Â« $lzma Â»."
 
-#: ../lib/backup-methods.sh:466
+#: ../lib/backup-methods.sh:507
 #, sh-format
 msgid "The archive type \"zip\" depends on the tool \"$zip\"."
 msgstr "Kiá»ƒu kho nÃ©n Â« zip Â» phá»¥ thuá»™c vÃ o cÃ´ng cá»¥ Â« $zip Â»."
 
-#: ../lib/backup-methods.sh:472
+#: ../lib/backup-methods.sh:513
 #, sh-format
 msgid "The archive type \"dar\" depends on the tool \"$dar\"."
 msgstr "Kiá»ƒu kho nÃ©n Â« dar Â» phá»¥ thuá»™c vÃ o cÃ´ng cá»¥ Â« $dar Â»."
 
-#: ../lib/backup-methods.sh:478 ../lib/backup-methods.sh:579
-#: ../lib/backup-methods.sh:620
+#: ../lib/backup-methods.sh:519 ../lib/backup-methods.sh:619
+#: ../lib/backup-methods.sh:665
 #, sh-format
 msgid "The archive type \"$BM_TARBALL_FILETYPE\" is not supported."
 msgstr "KhÃ´ng há»— trá»£ kiá»ƒu kho nÃ©n Â« $BM_TARBALL_FILETYPE Â»."
 
-#: ../lib/backup-methods.sh:549
+#: ../lib/backup-methods.sh:589
 msgid "The configuration variable \"BM_ENCRYPTION_RECIPIENT\" must be defined."
 msgstr "Pháº£i xÃ¡c Ä‘á»‹nh biáº¿n cáº¥u hÃ¬nh Â« $BM_ENCRYPTION_RECIPIENT Â»."
 
-#: ../lib/backup-methods.sh:555
+#: ../lib/backup-methods.sh:595
 #, sh-format
 msgid ""
 "The encryption is not yet possible with \"$BM_TARBALL_FILETYPE\" archives."
 msgstr "ChÆ°a cÃ³ kháº£ nÄƒng máºt mÃ£ hoÃ¡ kho nÃ©n kiá»ƒu Â« $BM_TARBALL_FILETYPE Â»."
 
-#: ../lib/backup-methods.sh:596
+#: ../lib/backup-methods.sh:637
 #, sh-format
 msgid "The program \"$gpg\" is needed."
 msgstr "Cáº§n thiáº¿t chÆ°Æ¡ng trÃ¬nh Â« $gpg Â»."
 
-#: ../lib/backup-methods.sh:603 ../lib/backup-methods.sh:640
+#: ../lib/backup-methods.sh:646 ../lib/backup-methods.sh:685
 #, sh-format
 msgid "File $file_to_check already exists, skipping."
 msgstr "Táºp tin Â« $file_to_check Â» Ä‘Ã£ cÃ³ nÃªn bá» qua."
 
-#: ../lib/backup-methods.sh:663
+#: ../lib/backup-methods.sh:708
 #, sh-format
 msgid "Target \"$t\" does not exist, skipping."
 msgstr "KhÃ´ng cÃ³ Ä‘Ãch Â« $t Â» nÃªn bá» qua."
 
-#: ../lib/backup-methods.sh:738 ../lib/backup-methods.sh:773
-#: ../lib/backup-methods.sh:804 ../lib/backup-methods.sh:828
+#: ../lib/backup-methods.sh:783 ../lib/backup-methods.sh:818
+#: ../lib/backup-methods.sh:860 ../lib/backup-methods.sh:884
 #, sh-format
 msgid "Using method \"$method\"."
 msgstr "Äang dÃ¹ng phÆ°Æ¡ng phÃ¡p Â« $method Â»."
 
-#: ../lib/backup-methods.sh:762
+#: ../lib/backup-methods.sh:807
 msgid "1 error occurred during the tarball generation."
 msgstr "Gáº·p 1 lá»—i trong tiáº¿n trÃ¬nh táº¡o ra kho nÃ©n Â« .tar Â»."
 
-#: ../lib/backup-methods.sh:764
+#: ../lib/backup-methods.sh:809
 #, sh-format
 msgid "$nb_err errors occurred during the tarball generation."
 msgstr "Gáº·p $nb_err lá»—i trong tiáº¿n trÃ¬nh táº¡o ra kho nÃ©n Â« .tar Â»."
 
-#: ../lib/backup-methods.sh:775
+#: ../lib/backup-methods.sh:820
 #, sh-format
 msgid "The \"mysql\" method is chosen, but $mysqldump is not found."
 msgstr "PhÆ°Æ¡ng phÃ¡p Â« mysql Â» Ä‘Ã£ chá»n cÃ²n khÃ´ng tÃ¬m tháº¥y $mysqldump."
 
-#: ../lib/backup-methods.sh:806
+#: ../lib/backup-methods.sh:830
 #, sh-format
+msgid "Using existing MySQL client configuration file: $HOME/.my.cnf"
+msgstr ""
+
+#: ../lib/backup-methods.sh:833
+#, sh-format
+msgid "Creating a default MySQL client configuration file: $HOME/.my.cnf"
+msgstr ""
+
+#: ../lib/backup-methods.sh:862
+#, sh-format
 msgid "The \"svn\" method is chosen, but $svnadmin is not found."
 msgstr "PhÆ°Æ¡ng phÃ¡p Â« svn Â» Ä‘Ã£ chá»n cÃ²n khÃ´ng tÃ¬m tháº¥y $svnadmin."
 
-#: ../lib/backup-methods.sh:812
+#: ../lib/backup-methods.sh:868
 #, sh-format
 msgid "SVN repository \"$repository\" is not valid; skipping."
 msgstr "Kho SVN Â« $repository Â» khÃ´ng há»£p lá»‡ nÃªn bá» qua."
 
-#: ../lib/backup-methods.sh:837
+#: ../lib/backup-methods.sh:893
 #, sh-format
 msgid "Not enough args for this archive ($archive), skipping."
 msgstr "KhÃ´ng Ä‘á»§ Ä‘á»‘i sá»‘ cho kho nÃ y ($archive) nÃªn bá» qua."
 
-#: ../lib/backup-methods.sh:844
+#: ../lib/backup-methods.sh:900
 msgid "Cannot create archive."
 msgstr "KhÃ´ng thá»ƒ táº¡o kho."
 
@@ -213,7 +234,7 @@
 "Biá»ƒu thá»±c bun bá»‹ pháº£n Ä‘á»‘i, khÃ³a Â« $key Â» Ä‘Æ°á»£c láºp thÃ nh Â« nÃ³ Â» (khÃ´ng) nÃªn "
 "láºp nÃ³ thÃ nh Â« false Â» (sai) thay tháº¿."
 
-#: ../lib/sanitize.sh:251
+#: ../lib/sanitize.sh:258
 #, sh-format
 msgid ""
 "When validating the configuration file $conffile, $nb_warnings warnings were "
@@ -221,94 +242,6 @@
 msgstr ""
 "Gáº·p $nb_warnings cáº£nh bÃ¡o khi há»£p lá»‡ hÃ³a táºp tin cáº¥u hÃ¬nh Â« $conffile Â»."
 
-#: ../lib/actions.sh:44
-msgid "No backup method used."
-msgstr "ChÆ°a dÃ¹ng phÆ°Æ¡ng phÃ¡p sao lÆ°u."
-
-#: ../lib/actions.sh:47
-#, sh-format
-msgid "No such backup method: $BM_ARCHIVE_METHOD"
-msgstr "KhÃ´ng cÃ³ phÆ°Æ¡ng phÃ¡p sao lÆ°u nhÆ° váºy: $BM_ARCHIVE_METHOD"
-
-#: ../lib/actions.sh:56
-#, sh-format
-msgid "Unable to change the owner of \"$md5file\"."
-msgstr "KhÃ´ng thá»ƒ thay Ä‘á»•i ngÆ°á»i sá»Ÿ há»¯u táºp tin Â« $md5file Â»."
-
-#: ../lib/actions.sh:58
-#, sh-format
-msgid "Unable to change file permissions of \"$md5file\"."
-msgstr "KhÃ´ng thá»ƒ thay Ä‘á»•i quyá»n háº¡n cá»§a táºp tin Â« $md5file Â»."
-
-#: ../lib/actions.sh:90
-msgid "No upload method used."
-msgstr "ChÆ°a dÃ¹ng phÆ°Æ¡ng phÃ¡p táº£i lÃªn."
-
-#: ../lib/actions.sh:93
-#, sh-format
-msgid "The upload method \"$method\" is not supported; skipping."
-msgstr "KhÃ´ng há»— trá»£ phÆ°Æ¡ng phÃ¡p táº£i lÃªn Â« $method Â» nÃªn bá» qua."
-
-#: ../lib/actions.sh:105
-#, sh-format
-msgid "Cleaning $BM_REPOSITORY_ROOT"
-msgstr "Äang xÃ³a sáº¡ch Â« $BM_REPOSITORY_ROOT Â»"
-
-#: ../lib/actions.sh:118
-#, sh-format
-msgid "Running pre-command: $BM_PRE_BACKUP_COMMAND."
-msgstr "Äang cháº¡y tiá»n lá»‡nh: $BM_PRE_BACKUP_COMMAND."
-
-#: ../lib/actions.sh:122
-msgid "Pre-command failed. Stopping the process."
-msgstr "Tiá»n lá»‡nh bá»‹ lá»—i nÃªn ngá»«ng tiáº¿n trÃ¬nh."
-
-#: ../lib/actions.sh:127
-#, sh-format
-msgid "Pre-command returned: \"$RET\" (success)."
-msgstr "Tiá»n lá»‡nh Ä‘Ã£ tráº£ láº¡i: Â« $RET Â» (thÃ nh cÃ´ng)."
-
-#: ../lib/actions.sh:139
-#, sh-format
-msgid "Running post-command: $BM_POST_BACKUP_COMMAND"
-msgstr "Äang cháº¡y háºu lá»‡nh: $BM_POST_BACKUP_COMMAND"
-
-#: ../lib/actions.sh:143
-msgid "Post-command failed."
-msgstr "Háºu lá»‡nh bá»‹ lá»—i."
-
-#: ../lib/actions.sh:148
-#, sh-format
-msgid "Post-command returned: \"$RET\" (success)."
-msgstr "Háºu lá»‡nh Ä‘Ã£ tráº£ láº¡i: Â« $RET Â» (thÃ nh cÃ´ng)."
-
-#: ../lib/actions.sh:175
-msgid ""
-"The BM_TARBALL_FILETYPE conf key is set to \"zip\" but zip is not installed."
-msgstr ""
-"KhÃ³a cáº¥u hÃ¬nh Â« BM_TARBALL_FILETYPE Â» Ä‘Æ°á»£c Ä‘áº·t thÃ nh Â« zip Â» nhÆ°ng chÆ°a cÃ i "
-"Ä‘áº·t pháº§n má»m zip."
-
-#: ../lib/actions.sh:180
-msgid ""
-"The BM_TARBALL_FILETYPE conf key is set to \"bzip2\" but bzip2 is not "
-"installed."
-msgstr ""
-"KhÃ³a cáº¥u hÃ¬nh Â« BM_TARBALL_FILETYPE Â» Ä‘Æ°á»£c Ä‘áº·t thÃ nh Â« bzip Â» nhÆ°ng chÆ°a cÃ i "
-"Ä‘áº·t pháº§n má»m bzip."
-
-#: ../lib/actions.sh:185
-msgid ""
-"The BM_TARBALL_FILETYPE conf key is set to \"dar\" but dar is not installed."
-msgstr ""
-"KhÃ³a cáº¥u hÃ¬nh Â« BM_TARBALL_FILETYPE Â» Ä‘Æ°á»£c Ä‘áº·t thÃ nh Â« dar Â» nhÆ°ng chÆ°a cÃ i "
-"Ä‘áº·t pháº§n má»m dar."
-
-#: ../lib/actions.sh:197
-#, sh-format
-msgid "The repository $BM_REPOSITORY_ROOT does not exist, creating it."
-msgstr "KhÃ´ng cÃ³ kho Â« $BM_REPOSITORY_ROOT Â» nÃªn Ä‘ang táº¡o nÃ³."
-
 #: ../lib/md5sum.sh:30
 msgid "Internal error: bad usage of function get_md5sum_from_file()"
 msgstr "Lá»—i ná»™i bá»™ : dÃ¹ng sai hÃ m Â« get_md5sum_from_file() Â»"
@@ -387,11 +320,7 @@
 msgid "Disable the purge process."
 msgstr "Táº¯t tiáº¿n trÃ¬nh táº©y."
 
-#: ../lib/dialog.sh:60
-msgid "Warning, process interrupted, archives may be corrupted."
-msgstr "Cáº£nh bÃ¡o : tiáº¿n trÃ¬nh bá»‹ ngáº¯t thÃ¬ kho cÃ³ thá»ƒ bá»‹ há»ng."
-
-#: ../lib/dialog.sh:74 ../lib/dialog.sh:93
+#: ../lib/dialog.sh:62 ../lib/dialog.sh:81
 msgid "Not in interactive mode, cannot continue."
 msgstr "KhÃ´ng pháº£i trong cháº¿ Ä‘á»™ tÆ°Æ¡ng tÃ¡c nÃªn khÃ´ng thá»ƒ tiáº¿p tá»¥c."
 
@@ -403,10 +332,94 @@
 msgid "Releasing lock"
 msgstr "Äang nháº£ khÃ³a"
 
-#: ../lib/archives.sh:31
-msgid "Internal error: wrong call to bm_merge_incremental_backups()."
-msgstr "Lá»—i ná»™i bá»™ : cuá»™c gá»i sai cho Â« bm_merge_incremental_backups() Â»."
+#: ../lib/actions.sh:44
+msgid "No backup method used."
+msgstr "ChÆ°a dÃ¹ng phÆ°Æ¡ng phÃ¡p sao lÆ°u."
 
+#: ../lib/actions.sh:47
+#, sh-format
+msgid "No such backup method: $BM_ARCHIVE_METHOD"
+msgstr "KhÃ´ng cÃ³ phÆ°Æ¡ng phÃ¡p sao lÆ°u nhÆ° váºy: $BM_ARCHIVE_METHOD"
+
+#: ../lib/actions.sh:56
+#, sh-format
+msgid "Unable to change the owner of \"$md5file\"."
+msgstr "KhÃ´ng thá»ƒ thay Ä‘á»•i ngÆ°á»i sá»Ÿ há»¯u táºp tin Â« $md5file Â»."
+
+#: ../lib/actions.sh:58
+#, sh-format
+msgid "Unable to change file permissions of \"$md5file\"."
+msgstr "KhÃ´ng thá»ƒ thay Ä‘á»•i quyá»n háº¡n cá»§a táºp tin Â« $md5file Â»."
+
+#: ../lib/actions.sh:90
+msgid "No upload method used."
+msgstr "ChÆ°a dÃ¹ng phÆ°Æ¡ng phÃ¡p táº£i lÃªn."
+
+#: ../lib/actions.sh:93
+#, sh-format
+msgid "The upload method \"$method\" is not supported; skipping."
+msgstr "KhÃ´ng há»— trá»£ phÆ°Æ¡ng phÃ¡p táº£i lÃªn Â« $method Â» nÃªn bá» qua."
+
+#: ../lib/actions.sh:105
+#, sh-format
+msgid "Cleaning $BM_REPOSITORY_ROOT"
+msgstr "Äang xÃ³a sáº¡ch Â« $BM_REPOSITORY_ROOT Â»"
+
+#: ../lib/actions.sh:118
+#, sh-format
+msgid "Running pre-command: $BM_PRE_BACKUP_COMMAND."
+msgstr "Äang cháº¡y tiá»n lá»‡nh: $BM_PRE_BACKUP_COMMAND."
+
+#: ../lib/actions.sh:122
+msgid "Pre-command failed. Stopping the process."
+msgstr "Tiá»n lá»‡nh bá»‹ lá»—i nÃªn ngá»«ng tiáº¿n trÃ¬nh."
+
+#: ../lib/actions.sh:127
+#, sh-format
+msgid "Pre-command returned: \"$RET\" (success)."
+msgstr "Tiá»n lá»‡nh Ä‘Ã£ tráº£ láº¡i: Â« $RET Â» (thÃ nh cÃ´ng)."
+
+#: ../lib/actions.sh:139
+#, sh-format
+msgid "Running post-command: $BM_POST_BACKUP_COMMAND"
+msgstr "Äang cháº¡y háºu lá»‡nh: $BM_POST_BACKUP_COMMAND"
+
+#: ../lib/actions.sh:143
+msgid "Post-command failed."
+msgstr "Háºu lá»‡nh bá»‹ lá»—i."
+
+#: ../lib/actions.sh:148
+#, sh-format
+msgid "Post-command returned: \"$RET\" (success)."
+msgstr "Háºu lá»‡nh Ä‘Ã£ tráº£ láº¡i: Â« $RET Â» (thÃ nh cÃ´ng)."
+
+#: ../lib/actions.sh:175
+msgid ""
+"The BM_TARBALL_FILETYPE conf key is set to \"zip\" but zip is not installed."
+msgstr ""
+"KhÃ³a cáº¥u hÃ¬nh Â« BM_TARBALL_FILETYPE Â» Ä‘Æ°á»£c Ä‘áº·t thÃ nh Â« zip Â» nhÆ°ng chÆ°a cÃ i "
+"Ä‘áº·t pháº§n má»m zip."
+
+#: ../lib/actions.sh:180
+msgid ""
+"The BM_TARBALL_FILETYPE conf key is set to \"bzip2\" but bzip2 is not "
+"installed."
+msgstr ""
+"KhÃ³a cáº¥u hÃ¬nh Â« BM_TARBALL_FILETYPE Â» Ä‘Æ°á»£c Ä‘áº·t thÃ nh Â« bzip Â» nhÆ°ng chÆ°a cÃ i "
+"Ä‘áº·t pháº§n má»m bzip."
+
+#: ../lib/actions.sh:185
+msgid ""
+"The BM_TARBALL_FILETYPE conf key is set to \"dar\" but dar is not installed."
+msgstr ""
+"KhÃ³a cáº¥u hÃ¬nh Â« BM_TARBALL_FILETYPE Â» Ä‘Æ°á»£c Ä‘áº·t thÃ nh Â« dar Â» nhÆ°ng chÆ°a cÃ i "
+"Ä‘áº·t pháº§n má»m dar."
+
+#: ../lib/actions.sh:197
+#, sh-format
+msgid "The repository $BM_REPOSITORY_ROOT does not exist, creating it."
+msgstr "KhÃ´ng cÃ³ kho Â« $BM_REPOSITORY_ROOT Â» nÃªn Ä‘ang táº¡o nÃ³."
+
 #: ../lib/files.sh:72 ../lib/files.sh:87
 msgid "No path given."
 msgstr "ChÆ°a nháºp Ä‘Æ°á»ng dáº«n."
@@ -494,112 +507,6 @@
 "Táºp tin Â« $file Â» lÃ  báº£n sao cá»§a táºp tin Â« $file_to_create Â» (dÃ¹ng liÃªn káº¿t "
 "tÆ°á»£ng trÆ°ng)."
 
-#: ../lib/upload-methods.sh:38
-msgid "Using the upload method \"ssh\"."
-msgstr "Äang dÃ¹ng phÆ°Æ¡ng phÃ¡p táº£i lÃªn Â« ssh Â»."
-
-#: ../lib/upload-methods.sh:47 ../lib/upload-methods.sh:85
-msgid "No valid destination found, SSH upload not possible."
-msgstr "KhÃ´ng tÃ¬m tháº¥y Ä‘Ãch há»£p lá»‡ nÃªn khÃ´ng thá»ƒ táº£i lÃªn báº±ng SSH."
-
-#: ../lib/upload-methods.sh:68
-#, sh-format
-msgid ""
-"Error reported by backup-manager-upload for method \"scp\", check \"$logfile"
-"\"."
-msgstr ""
-"Lá»—i Ä‘Æ°á»£c thÃ´ng bÃ¡o bá»Ÿi tiáº¿n trÃ¬nh táº£i lÃªn Â« backup-manager-upload Â» Ä‘á»‘i vá»›i "
-"phÆ°Æ¡ng phÃ¡p Â« scp Â», hÃ£y kiá»ƒm tra táºp tin báº£n ghi Â« $logfile Â»."
-
-#: ../lib/upload-methods.sh:76
-msgid "Using the upload method \"ssh-gpg\"."
-msgstr "Äang dÃ¹ng phÆ°Æ¡ng phÃ¡p táº£i lÃªn Â« ssh-gpg Â»."
-
-#: ../lib/upload-methods.sh:88
-msgid ""
-"No gpg recipient given. Argument is mandatory if upload method ssh-gpg is "
-"used."
-msgstr ""
-"ChÆ°a nháºp ngÆ°á»i nháºn gpg. Äá»‘i sá»‘ báº¯t buá»™c pháº£i nháºp náº¿u phÆ°Æ¡ng phÃ¡p táº£i lÃªn "
-"Â« ssh-gpg Â» Ä‘Æ°á»£c dÃ¹ng."
-
-#: ../lib/upload-methods.sh:105
-#, sh-format
-msgid ""
-"Error reported by backup-manager-upload for method \"ssh-gpg\", check "
-"\"$logfile\"."
-msgstr ""
-"Lá»—i Ä‘Æ°á»£c thÃ´ng bÃ¡o bá»Ÿi tiáº¿n trÃ¬nh táº£i lÃªn Â« backup-manager-upload Â» Ä‘á»‘i vá»›i "
-"phÆ°Æ¡ng phÃ¡p Â« ssh-gpg Â», hÃ£y kiá»ƒm tra táºp tin báº£n ghi Â« $logfile Â»."
-
-#: ../lib/upload-methods.sh:112
-msgid "Using the upload method \"ftp\"."
-msgstr "Äang dÃ¹ng phÆ°Æ¡ng phÃ¡p táº£i lÃªn Â« ftp Â»."
-
-#: ../lib/upload-methods.sh:122
-msgid "No valid destination found, FTP upload not possible."
-msgstr "KhÃ´ng tÃ¬m tháº¥y Ä‘Ãch há»£p lá»‡ nÃªn khÃ´ng thá»ƒ táº£i lÃªn báº±ng FTP."
-
-#: ../lib/upload-methods.sh:139
-#, sh-format
-msgid ""
-"Error reported by backup-manager-upload for method \"ftp\", check \"$logfile"
-"\"."
-msgstr ""
-"Lá»—i Ä‘Æ°á»£c thÃ´ng bÃ¡o bá»Ÿi tiáº¿n trÃ¬nh táº£i lÃªn Â« backup-manager-upload Â» Ä‘á»‘i vá»›i "
-"phÆ°Æ¡ng phÃ¡p Â« ftp Â», hÃ£y kiá»ƒm tra táºp tin báº£n ghi Â« $logfile Â»."
-
-#: ../lib/upload-methods.sh:147
-msgid "Using the upload method \"S3\"."
-msgstr "Äang dÃ¹ng phÆ°Æ¡ng phÃ¡p táº£i lÃªn Â« S3 Â»."
-
-#: ../lib/upload-methods.sh:170
-#, sh-format
-msgid ""
-"Error reported by backup-manager-upload for method \"s3\", check \"$logfile"
-"\"."
-msgstr ""
-"Lá»—i Ä‘Æ°á»£c thÃ´ng bÃ¡o bá»Ÿi tiáº¿n trÃ¬nh táº£i lÃªn Â« backup-manager-upload Â» Ä‘á»‘i vá»›i "
-"phÆ°Æ¡ng phÃ¡p Â« s3 Â», hÃ£y kiá»ƒm tra táºp tin báº£n ghi Â« $logfile Â»."
-
-#: ../lib/upload-methods.sh:176
-#, sh-format
-msgid "Uploading $directory to ${host}:${BM_UPLOAD_RSYNC_DESTINATION}"
-msgstr ""
-"Äang táº£i thÆ° má»¥c Â« $directory Â» lÃªn mÃ¡y Â« ${host} Â»:"
-"${BM_UPLOAD_RSYNC_DESTINATION}"
-
-#: ../lib/upload-methods.sh:187
-msgid "Need a key to use rsync (set BM_UPLOAD_SSH_USER, BM_UPLOAD_SSH_KEY)."
-msgstr ""
-"Cáº§n thiáº¿t khÃ³a Ä‘á»ƒ cháº¡y tiáº¿n trÃ¬nh Ä‘á»“ng bá»™ hoÃ¡ rsync (Ä‘áº·t Â« "
-"BM_UPLOAD_SSH_USER, BM_UPLOAD_SSH_KEY Â»)"
-
-#: ../lib/upload-methods.sh:198
-#, sh-format
-msgid "Upload of $directory with rsync failed; check $logfile."
-msgstr ""
-"Lá»—i táº£i lÃªn thÆ° má»¥c Â« $directory Â» báº±ng rsync; hÃ£y kiá»ƒm tra láº¡i táºp tin báº£n "
-"ghi Â« $logfile Â»."
-
-#: ../lib/upload-methods.sh:217
-msgid "No valid destination found, RSYNC upload not possible."
-msgstr "KhÃ´ng tÃ¬m tháº¥y Ä‘Ãch há»£p lá»‡ nÃªn khÃ´ng thá»ƒ táº£i lÃªn báº±ng RSYNC."
-
-#: ../lib/upload-methods.sh:236
-msgid "No hosts given to the rsync method, set BM_UPLOAD_RSYNC_HOSTS."
-msgstr ""
-"ChÆ°a xÃ¡c Ä‘á»‹nh mÃ¡y Ä‘á»‘i vá»›i phÆ°Æ¡ng phÃ¡p rsync, hÃ£y Ä‘áº·t Â« BM_UPLOAD_RSYNC_HOSTS "
-"Â»."
-
-#: ../lib/upload-methods.sh:243
-msgid "Using the upload method \"rsync\"."
-msgstr "Äang dÃ¹ng phÆ°Æ¡ng phÃ¡p táº£i lÃªn Â« rsync Â»."
-
-#: ../lib/upload-methods.sh:250
-msgid "Using the upload method \"rsync-snapshots\"."
-msgstr "Äang dÃ¹ng phÆ°Æ¡ng phÃ¡p táº£i lÃªn Â« rsync-snapshots Â»."
-
 #: ../lib/burning-methods.sh:38
 #, sh-format
 msgid "Device \"/dev/$device\" is mounted on \"$m\", unmounting it."
@@ -814,6 +721,112 @@
 msgid "Burning content of $index"
 msgstr "Äang ghi ná»™i dung cá»§a Â« $index Â»"
 
+#: ../lib/upload-methods.sh:38
+msgid "Using the upload method \"ssh\"."
+msgstr "Äang dÃ¹ng phÆ°Æ¡ng phÃ¡p táº£i lÃªn Â« ssh Â»."
+
+#: ../lib/upload-methods.sh:47 ../lib/upload-methods.sh:85
+msgid "No valid destination found, SSH upload not possible."
+msgstr "KhÃ´ng tÃ¬m tháº¥y Ä‘Ãch há»£p lá»‡ nÃªn khÃ´ng thá»ƒ táº£i lÃªn báº±ng SSH."
+
+#: ../lib/upload-methods.sh:68
+#, sh-format
+msgid ""
+"Error reported by backup-manager-upload for method \"scp\", check \"$logfile"
+"\"."
+msgstr ""
+"Lá»—i Ä‘Æ°á»£c thÃ´ng bÃ¡o bá»Ÿi tiáº¿n trÃ¬nh táº£i lÃªn Â« backup-manager-upload Â» Ä‘á»‘i vá»›i "
+"phÆ°Æ¡ng phÃ¡p Â« scp Â», hÃ£y kiá»ƒm tra táºp tin báº£n ghi Â« $logfile Â»."
+
+#: ../lib/upload-methods.sh:76
+msgid "Using the upload method \"ssh-gpg\"."
+msgstr "Äang dÃ¹ng phÆ°Æ¡ng phÃ¡p táº£i lÃªn Â« ssh-gpg Â»."
+
+#: ../lib/upload-methods.sh:88
+msgid ""
+"No gpg recipient given. Argument is mandatory if upload method ssh-gpg is "
+"used."
+msgstr ""
+"ChÆ°a nháºp ngÆ°á»i nháºn gpg. Äá»‘i sá»‘ báº¯t buá»™c pháº£i nháºp náº¿u phÆ°Æ¡ng phÃ¡p táº£i lÃªn "
+"Â« ssh-gpg Â» Ä‘Æ°á»£c dÃ¹ng."
+
+#: ../lib/upload-methods.sh:105
+#, sh-format
+msgid ""
+"Error reported by backup-manager-upload for method \"ssh-gpg\", check "
+"\"$logfile\"."
+msgstr ""
+"Lá»—i Ä‘Æ°á»£c thÃ´ng bÃ¡o bá»Ÿi tiáº¿n trÃ¬nh táº£i lÃªn Â« backup-manager-upload Â» Ä‘á»‘i vá»›i "
+"phÆ°Æ¡ng phÃ¡p Â« ssh-gpg Â», hÃ£y kiá»ƒm tra táºp tin báº£n ghi Â« $logfile Â»."
+
+#: ../lib/upload-methods.sh:112
+msgid "Using the upload method \"ftp\"."
+msgstr "Äang dÃ¹ng phÆ°Æ¡ng phÃ¡p táº£i lÃªn Â« ftp Â»."
+
+#: ../lib/upload-methods.sh:122
+msgid "No valid destination found, FTP upload not possible."
+msgstr "KhÃ´ng tÃ¬m tháº¥y Ä‘Ãch há»£p lá»‡ nÃªn khÃ´ng thá»ƒ táº£i lÃªn báº±ng FTP."
+
+#: ../lib/upload-methods.sh:139
+#, sh-format
+msgid ""
+"Error reported by backup-manager-upload for method \"ftp\", check \"$logfile"
+"\"."
+msgstr ""
+"Lá»—i Ä‘Æ°á»£c thÃ´ng bÃ¡o bá»Ÿi tiáº¿n trÃ¬nh táº£i lÃªn Â« backup-manager-upload Â» Ä‘á»‘i vá»›i "
+"phÆ°Æ¡ng phÃ¡p Â« ftp Â», hÃ£y kiá»ƒm tra táºp tin báº£n ghi Â« $logfile Â»."
+
+#: ../lib/upload-methods.sh:147
+msgid "Using the upload method \"S3\"."
+msgstr "Äang dÃ¹ng phÆ°Æ¡ng phÃ¡p táº£i lÃªn Â« S3 Â»."
+
+#: ../lib/upload-methods.sh:170
+#, sh-format
+msgid ""
+"Error reported by backup-manager-upload for method \"s3\", check \"$logfile"
+"\"."
+msgstr ""
+"Lá»—i Ä‘Æ°á»£c thÃ´ng bÃ¡o bá»Ÿi tiáº¿n trÃ¬nh táº£i lÃªn Â« backup-manager-upload Â» Ä‘á»‘i vá»›i "
+"phÆ°Æ¡ng phÃ¡p Â« s3 Â», hÃ£y kiá»ƒm tra táºp tin báº£n ghi Â« $logfile Â»."
+
+#: ../lib/upload-methods.sh:176
+#, sh-format
+msgid "Uploading $directory to ${host}:${BM_UPLOAD_RSYNC_DESTINATION}"
+msgstr ""
+"Äang táº£i thÆ° má»¥c Â« $directory Â» lÃªn mÃ¡y Â« ${host} Â»:"
+"${BM_UPLOAD_RSYNC_DESTINATION}"
+
+#: ../lib/upload-methods.sh:187
+msgid "Need a key to use rsync (set BM_UPLOAD_SSH_USER, BM_UPLOAD_SSH_KEY)."
+msgstr ""
+"Cáº§n thiáº¿t khÃ³a Ä‘á»ƒ cháº¡y tiáº¿n trÃ¬nh Ä‘á»“ng bá»™ hoÃ¡ rsync (Ä‘áº·t Â« "
+"BM_UPLOAD_SSH_USER, BM_UPLOAD_SSH_KEY Â»)"
+
+#: ../lib/upload-methods.sh:198
+#, sh-format
+msgid "Upload of $directory with rsync failed; check $logfile."
+msgstr ""
+"Lá»—i táº£i lÃªn thÆ° má»¥c Â« $directory Â» báº±ng rsync; hÃ£y kiá»ƒm tra láº¡i táºp tin báº£n "
+"ghi Â« $logfile Â»."
+
+#: ../lib/upload-methods.sh:217
+msgid "No valid destination found, RSYNC upload not possible."
+msgstr "KhÃ´ng tÃ¬m tháº¥y Ä‘Ãch há»£p lá»‡ nÃªn khÃ´ng thá»ƒ táº£i lÃªn báº±ng RSYNC."
+
+#: ../lib/upload-methods.sh:236
+msgid "No hosts given to the rsync method, set BM_UPLOAD_RSYNC_HOSTS."
+msgstr ""
+"ChÆ°a xÃ¡c Ä‘á»‹nh mÃ¡y Ä‘á»‘i vá»›i phÆ°Æ¡ng phÃ¡p rsync, hÃ£y Ä‘áº·t Â« BM_UPLOAD_RSYNC_HOSTS "
+"Â»."
+
+#: ../lib/upload-methods.sh:243
+msgid "Using the upload method \"rsync\"."
+msgstr "Äang dÃ¹ng phÆ°Æ¡ng phÃ¡p táº£i lÃªn Â« rsync Â»."
+
+#: ../lib/upload-methods.sh:250
+msgid "Using the upload method \"rsync-snapshots\"."
+msgstr "Äang dÃ¹ng phÆ°Æ¡ng phÃ¡p táº£i lÃªn Â« rsync-snapshots Â»."
+
 #: ../backup-manager:139
 msgid "The -b option must be followed by a valid date (YYYYMMDD)."
 msgstr "TÃ¹y chá»n Â« -b Â» pháº£i cÃ³ má»™t ngÃ y thÃ¡ng há»£p lá»‡ theo sau (NNNNTTnn)."
@@ -825,3 +838,9 @@
 #: ../backup-manager:214
 msgid "Unable to exec the pre-command"
 msgstr "KhÃ´ng thá»ƒ thá»±c hiá»‡n tiá»n lá»‡nh"
+
+#~ msgid "Compressor $compress requires $bzip."
+#~ msgstr "Bá»™ nÃ©n Â« $compress Â» cáº§n thiáº¿t $bzip."
+
+#~ msgid "Internal error: wrong call to bm_merge_incremental_backups()."
+#~ msgstr "Lá»—i ná»™i bá»™ : cuá»™c gá»i sai cho Â« bm_merge_incremental_backups() Â»."

