From 558040a0600a7216daf74b8237d5640cff36d3d8 Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Thu, 21 Jul 2011 09:05:33 +0000
Subject: [PATCH] Fix: Display issues

---
 build/makepack-dolibarr.pl    | 10 +++++-----
 htdocs/compta/bank/rappro.php |  7 +++----
 htdocs/langs/ca_ES/admin.lang |  4 ++--
 htdocs/langs/es_ES/admin.lang |  4 ++--
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl
index a5b37ef97de..825da0e5258 100644
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -2,7 +2,7 @@
 #----------------------------------------------------------------------------
 # \file         build/makepack-dolibarr.pl
 # \brief        Dolibarr package builder (tgz, zip, rpm, deb, exe, aps)
-# \version      $Id: makepack-dolibarr.pl,v 1.117 2011/07/26 23:25:59 eldy Exp $
+# \version      $Id: makepack-dolibarr.pl,v 1.116 2011/07/26 22:53:13 eldy Exp $
 # \author       (c)2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
 #----------------------------------------------------------------------------
 
@@ -34,7 +34,7 @@ $FILENAMESNAPSHOT="$PROJECT-snapshot";
 $FILENAMETGZ="$PROJECT-$MAJOR.$MINOR.$BUILD";
 $FILENAMEZIP="$PROJECT-$MAJOR.$MINOR.$BUILD";
 $FILENAMERPM="$PROJECT-$MAJOR.$MINOR.$BUILD-$RPMSUBVERSION";
-$FILENAMEDEB="${PROJECT}_${MAJOR}.${MINOR}.${BUILD}";
+$FILENAMEDEB="$PROJECT_$MAJOR.$MINOR.$BUILD";
 $FILENAMEAPS="$PROJECT-$MAJOR.$MINOR.$BUILD.app";
 $FILENAMEEXEDOLIWAMP="$PROJECT-$MAJOR.$MINOR.$BUILD";
 if (-d "/usr/src/redhat") {
@@ -48,7 +48,7 @@ if (-d "/usr/src/RPM") {
 
 
 use vars qw/ $REVISION $VERSION /;
-$REVISION='$Revision: 1.117 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1;
+$REVISION='$Revision: 1.116 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1;
 $VERSION="1.0 (build $REVISION)";
 
 
@@ -458,8 +458,8 @@ if ($nboftargetok) {
             # now newbuild is 0-1 or 0-4 for example
             print "Version is $MAJOR.$MINOR.$newbuild\n";
 
-    		print "Remove target ${FILENAMEDEB}_all.deb...\n";
-    		unlink("$DESTI/${FILENAMEDEB}_all.deb");
+    		print "Remove target $FILENAMEDEB.deb...\n";
+    		unlink("$DESTI/$FILENAMEDEB.deb");
 
             #rmdir "$BUILDROOT/$PROJECT.tmp";
     		$ret=`rm -fr $BUILDROOT/$PROJECT.tmp`;
diff --git a/htdocs/compta/bank/rappro.php b/htdocs/compta/bank/rappro.php
index cfe6b3e7cdc..f44ccfb4894 100644
--- a/htdocs/compta/bank/rappro.php
+++ b/htdocs/compta/bank/rappro.php
@@ -14,15 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  *       \file       htdocs/compta/bank/rappro.php
  *       \ingroup    banque
  *       \brief      Page to reconciliate bank transactions
- *       \version    $Id: rappro.php,v 1.67 2011/07/26 23:16:47 eldy Exp $
+ *       \version    $Id: rappro.php,v 1.68 2011/07/31 22:23:16 eldy Exp $
  */
 
 require("./pre.inc.php");
@@ -403,5 +402,5 @@ else
 
 $db->close();
 
-llxFooter('$Date: 2011/07/26 23:16:47 $ - $Revision: 1.67 $');
+llxFooter('$Date: 2011/07/31 22:23:16 $ - $Revision: 1.68 $');
 ?>
diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang
index 87a8cd1edcc..d04d2711843 100644
--- a/htdocs/langs/ca_ES/admin.lang
+++ b/htdocs/langs/ca_ES/admin.lang
@@ -109,8 +109,8 @@ PHPServerOffsetWithGreenwich=Offset amb Greenwich (segons)
 ClientOffsetWithGreenwich=Offset client/navegador amb Greenwich (segons)
 DaylingSavingTime=Horari d'estiu (usuari)
 CurrentHour=Hora PHP (servidor)
-CompanyTZ=Zona Horària empresa (seu central)
-CompanyHour=Hora empresa (seu central)
+CompanyTZ=Zona Horària empresa (casa mare)
+CompanyHour=Hora empresa (casa mare)
 CurrentSessionTimeOut=Time out sessió actual
 OSEnv=Entorn SO
 Box=Panell
diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang
index eb268695a5c..841addc52af 100644
--- a/htdocs/langs/es_ES/admin.lang
+++ b/htdocs/langs/es_ES/admin.lang
@@ -109,8 +109,8 @@ PHPServerOffsetWithGreenwich=Offset servidor con Greenwich (segundos)
 ClientOffsetWithGreenwich=Offset cliente/navegador con Greenwich (segundos)
 DaylingSavingTime=Horario de verano (usuario)
 CurrentHour=Hora PHP (servidor)
-CompanyTZ=Zona Horaria empresa (sede central)
-CompanyHour=Hora empresa (sede central)
+CompanyTZ=Zona Horaria empresa (casa madre)
+CompanyHour=Hora empresa (casa madre)
 CurrentSessionTimeOut=Time out sesión actual
 OSEnv=Entorno SO
 Box=Panel