[pkg-horde] [SCM] Debian Horde Packages repository: ingo1 package branch, upstream+patches, updated. 19b26ab1c339611d508fab5875cfe42de967204c

[Mathieu Parent]

The following commit has been merged in the upstream+patches branch:
commit 19b26ab1c339611d508fab5875cfe42de967204c
Merge: 9f484a4099acc03a45bc5750644e3ee5647a0a25 8bdc8f8b3e1ef30cb9a063b775791c216eee4c40
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Sat Jan 28 22:40:44 2012 +0100

    Merge branch 'upstream' into upstream+patches

diff --combined config/prefs.php.dist
index c92a753,d0e0348..2fc8ba4
--- a/config/prefs.php.dist
+++ b/config/prefs.php.dist
@@@ -1,12 -1,12 +1,12 @@@
  <?php
  /**
-  * $Horde: ingo/config/prefs.php.dist,v 1.30.10.3 2008/06/15 21:14:38 chuck Exp $
+  * $Horde: ingo/config/prefs.php.dist,v 1.30.10.4 2010/07/06 09:49:33 jan Exp $
   *
   * See horde/config/prefs.php for documentation on the structure of this file.
   */
  
  // Make sure that INGO_STORAGE_* constants are defined.
 -require_once dirname(__FILE__) . '/../lib/Storage.php';
 +require_once HORDE_BASE . '/ingo/lib/Storage.php';
  
  // This preference group will only be displayed if the configured
  // Ingo_Script:: driver can create script files.
@@@ -29,7 -29,7 +29,7 @@@ $_prefs['auto_update'] = array
      'locked' => false,
      'shared' => false,
      'type' => 'checkbox',
-     'desc' => _("Automatically update the script after each change?")
+     'desc' => _("Automatically activate the script after each change?")
  );
  
  // End script preferences

-- 
Debian Horde Packages repository: ingo1 package