Update to trunk

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/branches/Branch-2.2@5563 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/gui/brestore/brestore-fr.glade b/gui/brestore/brestore-fr.glade
index a83af4b5158bd428b7f36121ee6c683d348ccd70..78bdcff8d8a50cd0286ad7e5aa700bb703405b08 100644 (file)
--- a/gui/brestore/brestore-fr.glade
+++ b/gui/brestore/brestore-fr.glade
@@ -3069,7 +3069,7 @@ http://user:pass@director/cgi-bin/bweb/bconsole.pl</property>
                              <child>
                                <widget class="GtkLabel" id="label57">
                                  <property name="visible">True</property>
-                                 <property name="label" translatable="yes">Ajouter un suffix :</property>
+                                 <property name="label" translatable="yes">Ajouter un suffixe :</property>
                                  <property name="use_underline">False</property>
                                  <property name="use_markup">False</property>
                                  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -3194,7 +3194,7 @@ http://user:pass@director/cgi-bin/bweb/bconsole.pl</property>
                              <child>
                                <widget class="GtkLabel" id="label56">
                                  <property name="visible">True</property>
-                                 <property name="label" translatable="yes">Supprimer un prefix :</property>
+                                 <property name="label" translatable="yes">Supprimer un prefixe :</property>
                                  <property name="use_underline">False</property>
                                  <property name="use_markup">False</property>
                                  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -3223,7 +3223,7 @@ http://user:pass@director/cgi-bin/bweb/bconsole.pl</property>
                                <widget class="GtkEntry" id="entry_add_prefix">
                                  <property name="visible">True</property>
                                  <property name="sensitive">False</property>
-                                 <property name="tooltip" translatable="yes">Ajouter un prefix au path destination (/etc -&gt; /tmp/etc)</property>
+                                 <property name="tooltip" translatable="yes">Ajouter un prefixe au path destination (/etc -&gt; /tmp/etc)</property>
                                  <property name="can_focus">True</property>
                                  <property name="editable">True</property>
                                  <property name="visibility">True</property>
@@ -3245,7 +3245,7 @@ http://user:pass@director/cgi-bin/bweb/bconsole.pl</property>
                              <child>
                                <widget class="GtkLabel" id="label58">
                                  <property name="visible">True</property>
-                                 <property name="label" translatable="yes">Ajouter un prefix :</property>
+                                 <property name="label" translatable="yes">Ajouter un prefixe :</property>
                                  <property name="use_underline">False</property>
                                  <property name="use_markup">False</property>
                                  <property name="justify">GTK_JUSTIFY_LEFT</property>

diff --git a/gui/debian/changelog b/gui/debian/changelog
index b9f2dffcdb6b8a17a9717cf8acd6c6836f903216..7ef970909050761b7c816498ff59551eab790ec7 100644 (file)
--- a/gui/debian/changelog
+++ b/gui/debian/changelog
@@ -1,9 +1,10 @@
-bweb (2.2.0-2) stable; urgency=low
+bweb (2.2.1-1) stable; urgency=low
   
-  * WARNING: 2.2.0-2 version don't support bacula 2.0.X anymore
+  * WARNING: 2.2.1-1 version don't support bacula 2.0.X anymore
+    we use update recyclepool= instead of SQL query in media update
+
   * cleanup brestore
   * update brestore_xxx only when job is in (T, f, A)
-  * use update recyclepool= instead of SQL query 
   * fix Media.LocationId update during label barcodes 
 
  -- Eric Bollengier <eric@eb.homelinux.org>  Mon,  20 Aug 2007 15:15:47 +0000