Changeset 662

Timestamp:

01/07/09 14:26:36 (15 years ago)

Author:

franck

Message:

Fix recursive backups observed on big blogs
Admin form reviewed

Location:

plugins/autoBackup

Files:

• _admin.php (modified) (1 diff)
• _define.php (modified) (3 diffs)
• index.php (modified) (4 diffs)
• locales/_pot (deleted)
• locales/fr/main.po (modified) (5 diffs)

plugins/autoBackup/_admin.php

@@ -16 +16 @@
           $core->auth->check('usage,contentadmin',$core->blog->id));
 
-
-
 ?>

plugins/autoBackup/_define.php

@@ -15 +15 @@
      /* Name */               "Auto Backup",
      /* Description*/         "Make backups automatically",
-     /* Author */             "k-net, brol, Oum",
-     /* Version */            '1.1.6',
-     /* Permissions */        'null'
+     /* Author */             "k-net, brol, Oum, Franck Paul",
+     /* Version */            '1.1.7',
+     /* Permissions */        'usage,contentadmin'
 );
 
-
 class autoBackup {
      
@@ -27 +26 @@
           global $core;
           
+          // Get current config from database
           if ($core->blog->settings->autobackup_config) {
                $config = unserialize($core->blog->settings->autobackup_config);
           }
+          // If no config or badly formatted, set a fresh one
           if (!isset($config) || !is_array($config)) {
                $config = array();
           }
-          
+
+          // Set default options if undefined:
+
+          // Filepath of import-export needed class
+          // Franck Paul : Is there any solution to detect it automatically (in order to avoid to ask it to the final user)?
           if (!isset($config['importexportclasspath'])) $config['importexportclasspath'] = realpath($core->plugins->moduleRoot('importExport').'/inc/flat/class.db.export.php');
+
+          // Backup on file group:
           if (!isset($config['backup_onfile'])) $config['backup_onfile'] = false;
-          if (!isset($config['backup_onemail'])) $config['backup_onemail'] = false;
           if (!isset($config['backup_onfile_repository'])) $config['backup_onfile_repository'] = $core->blog->public_path;
           if (!isset($config['backup_onfile_compress_gzip'])) $config['backup_onfile_compress_gzip'] = false;
           if (!isset($config['backup_onfile_deleteprev'])) $config['backup_onfile_deleteprev'] = false;
+
+          // Backup sent by mail group:
+          if (!isset($config['backup_onemail'])) $config['backup_onemail'] = false;
           if (!isset($config['backup_onemail_adress'])) $config['backup_onemail_adress'] = '';
           if (!isset($config['backup_onemail_compress_gzip'])) $config['backup_onemail_compress_gzip'] = true;
           if (!isset($config['backup_onemail_header_from'])) $config['backup_onemail_header_from'] = $core->blog->name.' <your@email.com>';
+
+          // Backup characteristics:
           if (!isset($config['backuptype'])) $config['backuptype'] = 'full';
           if (!isset($config['backupblogid'])) $config['backupblogid'] = $core->blog->id;
           if (!isset($config['interval'])) $config['interval'] = 3600*24;
+
+          // Last backups done:
           if (!isset($config['backup_onfile_last'])) $config['backup_onfile_last'] = array('date' => 0, 'file' => '');
           if (!isset($config['backup_onemail_last'])) $config['backup_onemail_last'] = array('date' => 0);
           
-          #self::setConfig($config);
+          // Running backup flag:
+          if (!isset($config['backup_running'])) $config['backup_running'] = false;
           
           return $config;
@@ -66 +80 @@
           
           global $core;
-           
+          
+          // Get last or default config
           $config = self::getConfig();
-          
-          $time = time();
-          
-          $backup_onfile = $config['backup_onfile'] && $config['backup_onfile_last']['date'] + $config['interval'] <= $time;
-          $backup_onemail = $config['backup_onemail'] && $config['backup_onemail_last']['date'] + $config['interval'] <= $time;
-          
-          if ($config['interval'] > 0 && ($backup_onfile || $backup_onemail)) {
-               
-               $backupname = ($config['backuptype'] != 'full' ? $config['backupblogid'] : 'blog').'-backup-'.date('Ymd-H\hi').'.txt';
-               $backupname .= $config['backup_onfile_compress_gzip'] ? '.gz' : '';
-               
-               if ($backup_onfile) {
-                    $file = $config['backup_onfile_repository'].'/'.$backupname;
-               } else {
-                    $file = dirname(__FILE__).'/tmp.txt';
-               }
-               
-               if ($config['backuptype'] == 'full') {
-                    $backup_content = self::backup_full($file);
-               } elseif ($config['backupblogid'] == $core->blog->id) {
-                    $backup_content = self::backup_blog($file, $config['backupblogid']);
-               }
-               
-               if (!empty($backup_content)) {
+
+          if ($config['interval'] > 0) {
+               
+               // Should we start new backup?
+               $time = time();
+               $backup_onfile = $config['backup_onfile'] && (($config['backup_onfile_last']['date'] + $config['interval']) <= $time);
+               $backup_onemail = $config['backup_onemail'] && (($config['backup_onemail_last']['date'] + $config['interval']) <= $time);
+               
+               if ($backup_onfile || $backup_onemail) {
                     
-                    // Create backup file
-                    if ($backup_onfile) {
-                         
-                         if (is_file($file)) {
-                              // Encode content with gzip if needed
-                              if ($config['backup_onfile_compress_gzip'] && is_writable($file)) {
-                                   file_put_contents($file, gzencode(file_get_contents($file), 9));
+                    // Is there already backup running?
+                    // We assume that the running backup must not take more than half of the interval
+                    if ($config['backup_running']) {
+                         if ($backup_onfile && (($time - $config['backup_onfile_last']['date']) >= ($config['interval']/2))) {
+                              // Previous backup on file started more than half of interval ago, we cancelled it
+                              $config['backup_running'] = false;
+                         }
+                         if ($backup_onemail && (($time - $config['backup_onemail_last']['date']) >= ($config['interval']/2))) {
+                              // Previous backup by email started more than half of interval ago, we cancelled it
+                              $config['backup_running'] = false;
+                         }
+                    }
+
+                    if (!$config['backup_running']) {
+
+                         // We must do the backup, register that it is running from now
+                         self::setConfig($config);
+
+                         // Set the according filename
+                         $backupname = ($config['backuptype'] != 'full' ? $config['backupblogid'] : 'blog').'-backup-'.date('Ymd-H\hi').'.txt';
+                         $backupname .= $config['backup_onfile_compress_gzip'] ? '.gz' : '';
+
+                         if ($backup_onfile) {
+                              $file = $config['backup_onfile_repository'].'/'.$backupname;
+                         } else {
+                              $file = dirname(__FILE__).'/tmp.txt';
+                         }
+
+                         if ($config['backuptype'] == 'full') {
+                              $backup_content = self::backup_full($file);
+                         } elseif ($config['backupblogid'] == $core->blog->id) {
+                              $backup_content = self::backup_blog($file, $config['backupblogid']);
+                         }
+
+                         if (!empty($backup_content)) {
+
+                              // Create backup file
+                              if ($backup_onfile) {
+
+                                   if (is_file($file)) {
+                                        // Encode content with gzip if needed
+                                        if ($config['backup_onfile_compress_gzip'] && is_writable($file)) {
+                                             file_put_contents($file, gzencode(file_get_contents($file), 9));
+                                        }
+
+                                        if ($config['backup_onfile_deleteprev'] && is_file($config['backup_onfile_repository'].'/'.$config['backup_onfile_last']['file'])) {
+                                             @unlink($config['backup_onfile_repository'].'/'.$config['backup_onfile_last']['file']);
+                                        }
+                                        $config['backup_onfile_last']['date'] = $time;
+                                        $config['backup_onfile_last']['file'] = $file;
+                                   }
                               }
+
+                              // Send backup email
+                              if ($backup_onemail) {
+                                   $backup_content = file_get_contents($file);
+
+                                   if ($config['backup_onemail_compress_gzip']) {
+                                        $backup_content = gzencode($backup_content, 9);
+                                        // Add .gz if it ain't already done
+                                        $backupname .= $config['backup_onfile_compress_gzip'] ? '' : '.gz';
+                                   }
+
+                                   require_once dirname(__FILE__).'/class.mime_mail.php';
+                                   $email = new mime_mail(
+                                        $config['backup_onemail_adress'],
+                                        sprintf(__('Auto Backup : %s'),$core->blog->name),
+                                        sprintf(__('This is an automatically sent message from your blog %s.'), $core->blog->name)."\n".
+                                        sprintf(__('You will find attached the backup file created on %s.'), date('r', $time)),
+                                        $config['backup_onemail_header_from']);
+                                   $email->attach($backup_content, $backupname, 'application/octet-stream', $encoding='utf-8');
+                                   if ($email->send()) {
+                                        $config['backup_onemail_last']['date'] = $time;
+                                   }
+                              }
+
+                              // Let's delete the temporary file
+                              if (!$backup_onfile) {
+                                   unlink($file);
+                              }
+
+                              // The backup is no more running
+                              $config['backup_running'] = false;
                               
-                              if ($config['backup_onfile_deleteprev'] && is_file($config['backup_onfile_repository'].'/'.$config['backup_onfile_last']['file'])) {
-                                   @unlink($config['backup_onfile_repository'].'/'.$config['backup_onfile_last']['file']);
-                              }
-                              $config['backup_onfile_last']['date'] = $time;
-                              $config['backup_onfile_last']['file'] = $file;
+                              // Register the new config
+                              self::setConfig($config);
                          }
                     }
-                    
-                    // Send backup email
-                    if ($backup_onemail) {
-                         $backup_content = file_get_contents($file);
-                         
-                         if ($config['backup_onemail_compress_gzip']) {
-                              $backup_content = gzencode($backup_content, 9);
-                              // Add .gz if it ain't already done
-                              $backupname .= $config['backup_onfile_compress_gzip'] ? '' : '.gz';
-                         }
-                         
-                         require_once dirname(__FILE__).'/class.mime_mail.php';
-                         $email = new mime_mail(
-                              $config['backup_onemail_adress'],
-                              sprintf(__('Auto Backup : %s'),$core->blog->name),
-                              sprintf(__('This is an automatically sent message from your blog %s.'), $core->blog->name)."\n".
-                              sprintf(__('You will find attached the backup file created on %s.'), date('r', $time)),
-                              $config['backup_onemail_header_from']);
-                         $email->attach($backup_content, $backupname, 'application/octet-stream', $encoding='utf-8');
-                         if ($email->send()) {
-                              $config['backup_onemail_last']['date'] = $time;
-                         }
-                    }
-                    
-                    // Let's delete the temporary file
-                    if (!$backup_onfile) {
-                         unlink($file);
-                    }
-                    
-                    self::setConfig($config);
                }
           }

plugins/autoBackup/index.php

@@ -14 +14 @@
 if (!defined('DC_CONTEXT_ADMIN')) { exit; }
 
-
 $config = autoBackup::getConfig();
 
-if (isset($_POST['saveconfig'])) {
+// Saving new configuration
+if (!empty($_POST['saveconfig'])) {
+
      $config['importexportclasspath'] = $_POST['importexportclasspath'];
      $config['backup_onfile'] = isset($_POST['backup_onfile']);
@@ -28 +29 @@
      $config['backup_onemail_header_from'] = $_POST['backup_onemail_header_from'];
      $config['backuptype'] = $core->auth->isSuperAdmin() && $_POST['backuptype'] == 'full' ? 'full' : 'blog';
-     $config['backupblogid'] = $core->blog->id;#$_POST['backupblogid'];
+     $config['backupblogid'] = $core->blog->id;
      $config['interval'] = (int) $_POST['interval'];
-     autoBackup::setConfig($config);
+     $config['backup_running'] = false;
+
+     try
+     {
+          autoBackup::setConfig($config);
+          $msg = __('Configuration successfully updated.');
+     }
+     catch (Exception $e)
+     {
+          $core->error->add($e->getMessage());
+     }
 }
 
@@ -38 +49 @@
 <title><?php echo __('Auto Backup'); ?></title>
   <?php echo dcPage::jsPageTabs($part); ?>
-<script type="text/javascript">
-//<![CDATA[
-function toogle_backuptype(id) {
-     if (id != undefined && id == 0) {
-          //document.getElementById('backupblogid').disabled = 'disabled';
-          document.getElementById('backupblogid_label').style.color = '#999';
-     } else {
-          //document.getElementById('backupblogid').disabled = '';
-          document.getElementById('backupblogid_label').style.color = '#000';
-     }
-}
-//]]>
-</script>
 </head>
 
 <body>
-<?php
-echo '<h2>'.__('Auto Backup').'</h2>';
+<h2><?php echo html::escapeHTML($core->blog->name); ?> &gt; <?php echo __('Auto Backup'); ?></h2>
 
-/*
-$blogs_list = array();
-foreach ($core->blogs as $k=>$v) {
-     if ($core->auth->check('admin',$k)) {
-          $blogs_list[html::escapeHTML($v['name']).' ('.$k.')'] = $k;
-     }
-}
-//*/
+<?php 
+// Display message if any
+if (!empty($msg)) echo '<p class="message">'.$msg.'</p>';
 
+// Set export type
 $backuptypes = $core->auth->isSuperAdmin() ? array(__('All content export') => 'full', __('Blog export') => 'blog') : array(__('Blog export') => 'blog');
 
+// Set export interval list
 $intervals = array(
      __('disable') =>     0,
@@ -77 +71 @@
      '14 '.__('days') =>  3600*24*14,
      );
+// Add custom interval if any
 if (!in_array($config['interval'], array(0, 3600*6, 3600*12, 3600*24, 3600*24*2, 3600*24*7, 3600*24*14))) {
      $intervals[$config['interval'].' '.__('seconds')] = $config['interval'];
 }
+?>
 
-echo
-'<div id="settings" title="'.__('Settings').'" class="multi-part">'.
-'<p>'.__('Auto Backup allows you to create backups automatically and often.').'<br />'.
-__('It uses the Import/Export plugin to work.').'</p>'.
+<div id="settings" title="<?php echo __('Settings'); ?>" class="multi-part">
 
+     <p><?php __('Auto Backup allows you to create backups automatically and often.') ?><br />
+          <?php __('It uses the Import/Export plugin to work.') ?></p>
 
-'<form action="'.$p_url.'" method="post">'.
+     <form method="post" action="plugin.php">
+     <fieldset>
+          <legend><?php echo __('Plugin configuration'); ?></legend>
+          <p class="field">
+               <label class="classic" for="importexportclasspath"><?php echo __('Import/Export plugin class path:'); ?></label>
+               <?php echo form::field('importexportclasspath',40,255,$config['importexportclasspath']); ?>
+               <?php echo (is_file($config['importexportclasspath']) ? '' : '<span style="color:#C00"><strong>'.__('Warning: this file doesn\'t exist!').'</strong></span>'); ?>
+          </p>
+     </fieldset>
 
-'<fieldset>'.
+     <fieldset>
+          <legend><?php echo __('General options'); ?></legend>
+          <p class="field">
+               <label class="classic" for="backuptype"><?php echo __('Backup type:'); ?></label>
+               <?php echo form::combo('backuptype',$backuptypes,$config['backuptype']); ?>
+          </p>
+          <p class="field">
+               <label class="classic" for="interval"><?php echo __('Create a new backup every:'); ?></label>
+               <?php echo form::combo('interval',$intervals,$config['interval']); ?>
+          </p>
+     </fieldset>
 
-'<p><label>'.__('Import/Export plugin class path :').' '.
-form::field('importexportclasspath',40,255,$config['importexportclasspath']).'</label>'.
-(is_file($config['importexportclasspath']) ? '' : '<span style="color:#C00"><strong>'.__('Warning: this file doesn\'t exist!').'</strong></span>').
-'</p>'.
+     <fieldset>
+          <legend><?php echo __('File options'); ?></legend>
+          <p class="field">
+               <?php echo form::checkbox('backup_onfile',1,$config['backup_onfile']) ?>
+               <label class="classic" for="backup_onfile"><strong><?php echo __('Backup on file'); ?></strong></label>
+          </p>
+          <p class="field">
+               <label class="classic" for="backup_onfile_repository"><?php echo __('Repository path:'); ?></label>
+               <?php echo form::field('backup_onfile_repository',40,255,$config['backup_onfile_repository']); ?>
+          </p>
+          <p class="field">
+               <?php echo form::checkbox('backup_onfile_compress_gzip',1,$config['backup_onfile_compress_gzip']); ?>
+               <label class="classic" for="backup_onfile_compress_gzip"><?php echo __('Compress data with gzip'); ?></label>
+          </p>
+          <p class="field">
+               <?php echo form::checkbox('backup_onfile_deleteprev',1,$config['backup_onfile_deleteprev']); ?>
+               <label class="classic" for="backup_onfile_deleteprev"><?php echo __('After creating the backup file, delete the previous one.'); ?></label>
+          </p>
+     </fieldset>
 
-'<p><label class="classic">'.form::checkbox('backup_onfile',1,$config['backup_onfile']).' '.
-'<strong>'.__('Backup on file').'</strong></label><br />'.
-'<label class="classic">'.__('Repository path :').' '.
-form::field('backup_onfile_repository',40,255,$config['backup_onfile_repository']).'</label><br />'.
-'<label class="classic">'.form::checkbox('backup_onfile_compress_gzip',1,$config['backup_onfile_compress_gzip']).' '.
-__('Compress data with gzip').'</label><br />'.
-'<label class="classic">'.form::checkbox('backup_onfile_deleteprev',1,$config['backup_onfile_deleteprev']).' '.
-__('After creating the backup file, delete the previous one.').'</label></p>'.
+     <fieldset>
+          <legend><?php echo __('Mail options'); ?></legend>
+          <p class="field">
+               <?php echo form::checkbox('backup_onemail',1,$config['backup_onemail']); ?>
+               <label class="classic" for="backup_onemail"><strong><?php echo __('Backup by email'); ?></strong></label>
+          </p>
+          <p class="field">
+               <label class="classic" for="backup_onemail_adress"><?php echo __('Email address:'); ?></label>
+               <?php echo form::field('backup_onemail_adress',30,255,$config['backup_onemail_adress']); ?>
+          </p>
+          <p class="field">
+               <?php echo form::checkbox('backup_onemail_compress_gzip',1,$config['backup_onemail_compress_gzip']); ?>
+               <label class="classic" for="backup_onemail_compress_gzip"><?php echo __('Compress data with gzip'); ?></label>
+          </p>
+          <p class="field">
+               <label class="classic" for="backup_onemail_header_from"><?php echo __('Email <em>From</em> header:'); ?></label>
+               <?php echo form::field('backup_onemail_header_from',30,255,$config['backup_onemail_header_from']); ?>
+          </p>
+     </fieldset>
 
-'<p><label class="classic">'.form::checkbox('backup_onemail',1,$config['backup_onemail']).' '.
-'<strong>'.__('Backup by email').'</strong></label><br />'.
-'<label class="classic">'.__('Email address :').' '.
-form::field('backup_onemail_adress',15,255,$config['backup_onemail_adress']).'</label><br />'.
-'<label class="classic">'.form::checkbox('backup_onemail_compress_gzip',1,$config['backup_onemail_compress_gzip']).' '.
-__('Compress data with gzip').'</label><br />'.
-'<label class="classic">'.__('Email <em>From</em> header :').' '.
-form::field('backup_onemail_header_from',30,255,$config['backup_onemail_header_from']).'</label>
-</p>'.
+     <p><input type="hidden" name="p" value="autoBackup" />
+     <?php echo $core->formNonce(); ?>
+     <input type="submit" name="saveconfig" value="<?php echo __('Save configuration'); ?>" />
+     </p>
+     </form>
 
-'<p><label class="classic">'.__('Backup type :').' '.
-form::combo('backuptype',$backuptypes,$config['backuptype'],'','',false,' onchange="javascript:toogle_backuptype(this.options.selectedIndex)"').'</label>&nbsp; '.
-'<label id="backupblogid_label" class="classic"'.($config['backuptype'] == 'full' && $core->auth->isSuperAdmin() ? ' style="color:#999"' : '').'>'.__('Blog :').' '.
-#form::combo('backupblogid',$blogs_list,$config['backupblogid'],'','',$config['backuptype'] == 'full').
-'<strong>'.$core->blog->id.'</strong>'.
-'</label></p>'.
+     <h3><?php echo __('Last backups'); ?></h3>
 
-'<p><label class="classic">'.__('Create a new backup every :').' '.
-form::combo('interval',$intervals,$config['interval']).'</label></p>'.
+     <p><?php echo __('Last backup on file:'); ?>&nbsp;
+     <?php echo ($config['backup_onfile_last']['date'] > 0 ? date('r', $config['backup_onfile_last']['date']) : '<em>'.__('never').'</em>'); ?><br />
+     <?php echo __('File name:'); ?>&nbsp;<abbr title="<?php echo html::escapeHTML($config['backup_onfile_last']['file']); ?>">
+     <?php echo  html::escapeHTML(basename($config['backup_onfile_last']['file'])); ?></abbr></p>
 
+     <p><?php echo __('Last backup by email:'); ?>&nbsp;
+     <?php echo ($config['backup_onemail_last']['date'] > 0 ? date('r', $config['backup_onemail_last']['date']) : '<em>'.__('never').'</em>'); ?></p>
+</div>
 
-'<p><input type="submit" name="saveconfig" value="'.__('Save').'" /></p>'.
-'<p>'.$core->formNonce().'</p>'.
-'</fieldset>'.
-'</form>'.
+<div id="about" title="<?php echo __('About'); ?>" class="multi-part">
+     <h2 style="background: url(index.php?pf=autoBackup/icon.png) no-repeat 0 0.25em; padding: 5px 0 5px 22px; margin-left: 20px;"><?php echo __('Auto Backup'); ?></h2>
+     <ul style="list-style: none; line-height: 30px; font-weight: bold;">
+          <li><?php echo __('Created by'); ?> : <a href="http://www.k-netweb.net/">k-net</a></li>
+          <li><?php echo __('Help, support and sources'); ?> : <a href="http://lab.dotclear.org/wiki/plugin/autoBackup">http://lab.dotclear.org/wiki/plugin/autoBackup</a></li>
+     </ul>
+</div>
 
-
-'<p>&nbsp;</p>'.
-'<h3>'.__('Last backups').'</h3>'.
-
-'<p>'.__('Last backup on file :').'&nbsp; '.($config['backup_onfile_last']['date'] > 0 ? date('r', $config['backup_onfile_last']['date']) : '<em>'.__('never').'</em>').'<br />'.
-__('File name :').'&nbsp; <abbr title="'.html::escapeHTML($config['backup_onfile_last']['file']).'">'.html::escapeHTML(basename($config['backup_onfile_last']['file'])).'</abbr>'.'</p>'.
-
-'<p>'.__('Last backup by email :').'&nbsp; '.($config['backup_onemail_last']['date'] > 0 ? date('r', $config['backup_onemail_last']['date']) : '<em>'.__('never').'</em>').'</p>'.
-'</div>';
-
-echo
-'<div id="about" title="'.__('About').'" class="multi-part">'.
-'<h2 style="background: url(index.php?pf=autoBackup/icon.png) no-repeat 0 0.25em; padding: 5px 0 5px 22px; margin-left: 20px;">'.__('Auto Backup').'</h2>'.
-'<ul style="list-style: none; line-height: 30px; font-weight: bold;"><li>version 1.1.6</li>'.
-'<li>'.__('Created by').' : <a href="http://www.k-netweb.net/">k-net</a></li>'.
-'<li>'.__('Help and Support').' : -</li>'.
-'<li>'.__('Sources').' : <a href="http://code.google.com/p/dcplugins/source/browse/autoBackup">http://code.google.com/p/dcplugins/source/browse/autoBackup</a></li></ul>'.
-'</div>';
-
-?>
 </body>
 </html>

plugins/autoBackup/locales/fr/main.po

@@ -1 +1 @@
 # -- BEGIN LICENSE BLOCK ----------------------------------
 # This file is part of autoBackup, a plugin for Dotclear.
-# 
+#
 # Copyright (c) 2008 k-net
 # http://www.k-netweb.net/
-# 
+#
 # Licensed under the GPL version 2.0 license.
 # A copy of this license is available in LICENSE file or at
 # http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # -- END LICENSE BLOCK ------------------------------------
+msgid ""
+msgstr ""
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-01-07 14:14+0100\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: Franck Paul <carnet.franck.paul@gmail.com>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
 
-msgid ""
-msgstr "Content-Type: text/plain; charset=UTF-8\n"
-
-#: plugins/autoBackup/_admin.php
 msgid "Auto Backup"
 msgstr "Auto Backup"
 
-#: plugins/autoBackup/_define.php
-msgid "Make backups automatically"
-msgstr "Faites de sauvegardes automatiques"
+#, php-format
+msgid "Auto Backup : %s"
+msgstr "Auto Backup : %s"
 
-msgid "Auto Backup : backup file from %s"
-msgstr "Auto Backup : fichier de sauvegarde de %s"
-
+#, php-format
 msgid "This is an automatically sent message from your blog %s."
 msgstr "Ceci est un message envoyé automatiquement depuis votre blog %s."
 
+#, php-format
 msgid "You will find attached the backup file created on %s."
 msgstr "Vous trouverez ci joint le fichier de sauvegarde datant de %s."
 
-#: plugins/autoBackup/index.php
+msgid "Configuration successfully updated."
+msgstr "La configuration a été correctement enregistrée."
+
+msgid "All content export"
+msgstr "Export de tout le contenu"
+
+msgid "Blog export"
+msgstr "Export du blog"
+
 msgid "disable"
 msgstr "désactiver"
@@ -36 +50 @@
 msgid "hours"
 msgstr "heures"
-
-msgid "days"
-msgstr "jours"
 
 msgid "seconds"
@@ -52 +63 @@
 msgstr "Il utilise le plugin Import/Export pour fonctionner."
 
-msgid "Import/Export plugin class path :"
+msgid "Plugin configuration"
+msgstr "Configuration de l'extension"
+
+msgid "Import/Export plugin class path:"
 msgstr "Chemin de la classe du plugin Import/Export :"
 
@@ -58 +72 @@
 msgstr "Attention : ce fichier n'existe pas !"
 
+msgid "General options"
+msgstr "Options générales"
+
+msgid "Backup type:"
+msgstr "Type de sauvegarde :"
+
+msgid "Create a new backup every:"
+msgstr "Créer une nouvelle sauvegarde tous les :"
+
+msgid "File options"
+msgstr "Options fichier"
+
 msgid "Backup on file"
 msgstr "Sauvegarder sur fichier"
 
-msgid "Repository path :"
+msgid "Repository path:"
 msgstr "Chemin vers le dépôt :"
+
+msgid "Compress data with gzip"
+msgstr "Compresser les données avec gzip"
 
 msgid "After creating the backup file, delete the previous one."
 msgstr "Après la création du fichier de la sauvegarde, supprimer le précédent."
 
+msgid "Mail options"
+msgstr "Option par email"
+
 msgid "Backup by email"
 msgstr "Sauvegarder par email"
 
-msgid "Email address :"
+msgid "Email address:"
 msgstr "Adresse email :"
 
-msgid "Compress data with gzip"
-msgstr "Compresser les données avec gzip"
-
-msgid "Email <em>From</em> header :"
+msgid "Email <em>From</em> header:"
 msgstr "En-tête <em>From</em> de l'email :"
 
-msgid "Backup type :"
-msgstr "Type de sauvegarde :"
-
-msgid "All content export"
-msgstr "Export de tout le contenu"
-
-msgid "Blog export"
-msgstr "Export d'un blog"
-
-msgid "Blog :"
-msgstr "Blog :"
-
-msgid "Create a new backup every :"
-msgstr "Créer une nouvelle sauvegarde tous les :"
-
-msgid "Save"
-msgstr "Enregistrer"
+msgid "Save configuration"
+msgstr "Enregistrer la configuration"
 
 msgid "Last backups"
 msgstr "Dernières sauvegardes"
 
-msgid "Last backup on file :"
+msgid "Last backup on file:"
 msgstr "Dernière sauvegarde sur fichier :"
 
@@ -106 +120 @@
 msgstr "jamais"
 
-msgid "File name :"
-msgstr "Nom du fichier :"
+msgid "Last backup by email:"
+msgstr "Dernière sauvegarde par email :"
 
-msgid "Last backup by email :"
-msgstr "Dernière sauvegarde par email :"
+msgid "About"
+msgstr "À propos de"
 
 msgid "Created by"
 msgstr "Créé par"
 
-msgid "Help and Support"
-msgstr "Aide et Support"
+msgid "Help, support and sources"
+msgstr "Aide, support et sources"
 
-msgid "Sources"
-msgstr "Sources"
+#~ msgid "File name :"
+#~ msgstr "Nom du fichier :"
+#~ msgid "Make backups automatically"
+#~ msgstr "Faites de sauvegardes automatiques"
+#~ msgid "Auto Backup : backup file from %s"
+#~ msgstr "Auto Backup : fichier de sauvegarde de %s"
+#~ msgid "days"
+#~ msgstr "jours"
+#~ msgid "Blog :"
+#~ msgstr "Blog :"
+#~ msgid "Save"
+#~ msgstr "Enregistrer"
+#~ msgid "Help and Support"
+#~ msgstr "Aide et Support"
+#~ msgid "Sources"
+#~ msgstr "Sources"
+