| [vhffs-dev] Patch licence/license - suite et fin ? |
[ Thread Index | Date Index | More vhffs.org/vhffs-dev Archives ]
Cyril Brulebois <cyril.brulebois@xxxxxxxxxxxxxxxx> (10/06/2006): > Et pour finir, un gros patch pour tous les Licence/License (quelle que > soit la casse). ATTENTION ! Il y a un champ 'licence' dans la table > 'vhffs_largefile'. À vous de voir si vous voulez y retoucher, et dans > l'affirmative, comment ce faire lors d'une mise à jour. ;-) Comme convenu avec Florent, j'ai refait le patch en question en ne touchant pas à la SQL. Sauf erreur de ma part, il n'y a qu'un UPDATE dans du code Perl, et un fichier SQL. Le second patch corrige un petit truc pas joli, un point après un retour à la ligne dans deux fichiers Perl, et met à jour le template (vhffs.pot) ainsi que la traduction française. Cordialement, -- Cyril Brulebois
Index: vhffs-api/LICENSE
===================================================================
--- vhffs-api/LICENSE (révision 210)
+++ vhffs-api/LICENSE (copie de travail)
@@ -1,2 +1,2 @@
-See LICENCE file in the vhffs-doc to get the licence
+See LICENSE file in the vhffs-doc to get the license
Index: vhffs-api/src/Vhffs/Note.pm
===================================================================
--- vhffs-api/src/Vhffs/Note.pm (révision 210)
+++ vhffs-api/src/Vhffs/Note.pm (copie de travail)
@@ -2,7 +2,7 @@
#Vhffs::Note written by sod` <dieu AT gunnm DOT org>
-# This software is free software, please read LICENCE file
+# This software is free software, please read LICENSE file
use Vhffs::Constants;
Index: vhffs-api/src/Vhffs/Services/DNS.pm
===================================================================
--- vhffs-api/src/Vhffs/Services/DNS.pm (révision 210)
+++ vhffs-api/src/Vhffs/Services/DNS.pm (copie de travail)
@@ -2,7 +2,7 @@
# Vhffs::Services::DNS
# This file is a part of VHFFS4 program. It is used to manage domain name server (DNS)
-# Please respect the licence of this program.
+# Please respect the license of this program.
# Author: soda < dieu at gunnm dot org >
Index: vhffs-api/src/Vhffs/Services/Mysql.pm
===================================================================
--- vhffs-api/src/Vhffs/Services/Mysql.pm (révision 210)
+++ vhffs-api/src/Vhffs/Services/Mysql.pm (copie de travail)
@@ -1,7 +1,7 @@
#!/usr/bin/perl
# This file is a part of VHFFS4 platofmrm
-# Please respect the licence
+# Please respect the license
# Author: soda < dieu at gunnm dot org>
Index: vhffs-api/src/Vhffs/Services/Postgres.pm
===================================================================
--- vhffs-api/src/Vhffs/Services/Postgres.pm (révision 210)
+++ vhffs-api/src/Vhffs/Services/Postgres.pm (copie de travail)
@@ -1,7 +1,7 @@
#!/usr/bin/perl
# This file is a part of VHFFS4 platofmrm
-# Please respect the licence
+# Please respect the license
# Author: soda < dieu at gunnm dot org>
Index: vhffs-api/src/Vhffs/Services/Svn.pm
===================================================================
--- vhffs-api/src/Vhffs/Services/Svn.pm (révision 210)
+++ vhffs-api/src/Vhffs/Services/Svn.pm (copie de travail)
@@ -2,7 +2,7 @@
# This file is a part of VHFFS4 Hosting Platform
-# Please respect the licence of this file and the whole software
+# Please respect the license of this file and the whole software
# Author: soda < dieu at gunnm dot org>
Index: vhffs-api/src/Vhffs/Services/LargeFile.pm
===================================================================
--- vhffs-api/src/Vhffs/Services/LargeFile.pm (révision 210)
+++ vhffs-api/src/Vhffs/Services/LargeFile.pm (copie de travail)
@@ -2,7 +2,7 @@
# This file is a part of VHFFS4 Hosting Platform
-# Please respect the licence of this file and the whole software
+# Please respect the license of this file and the whole software
# Author: soda < dieu at gunnm dot org>
@@ -174,16 +174,18 @@
my $self = shift;
my ( $query , $handle );
- $self->{'licence'} = "unknown licence" if( ! defined $self->{'licence'} );
+ $self->{'license'} = "unknown license" if( ! defined $self->{'license'} );
$self->{'password'} = "" if( ! defined $self->{'password'} );
$self->{'hash'} = "" if( ! defined $self->{'hash'} );
$self->{'size'} = "unknown type" if( ! defined $self->{'type'} );
$self->{'username'} = "" if( ! defined $self->{'username'} );
$self->{'end_date'} = "NULL" if( ! defined $self->{'end_date'} );
+ # WARNING! For compatibility reasons and to keep upgrades easy, the wrong
+ # spelling "licence" for the SQL field is *NOT* fixed.
$query = "UPDATE vhffs_largefile SET
size = '".$self->{'size'}."',
- licence = '".$self->{'licence'}."',
+ licence = '".$self->{'license'}."',
username = '".$self->{'username'}."',
password = '".$self->{'password'}."',
hash = '".$self->{'hash'}."'
@@ -209,20 +211,20 @@
return( $self->{'filename'} );
}
-sub set_licence
+sub set_license
{
my $self = shift;
- my $licence = shift;
- $self->{'licence'} = quotemeta( $licence );
+ my $license = shift;
+ $self->{'license'} = quotemeta( $license );
return 1;
}
-sub get_licence
+sub get_license
{
my $self = shift;
- return( Vhffs::Functions::stripslashes( $self->{'licence'} ) );
+ return( Vhffs::Functions::stripslashes( $self->{'license'} ) );
}
sub set_size
@@ -469,7 +471,7 @@
Manage hosted files in VHFFS platform. Methods returns negative
values if error or positive value (most of case 1).
The object contains at least type and filename. After, you can add
-licence or size informations.
+license or size informations.
The username and password properties are present only if the
administrator want use an FTP server for each files. For example, for
@@ -492,9 +494,9 @@
get_filename()
-get_licence()
+get_license()
-set_licence( "mylicence" )
+set_license( "mylicense" )
set_size( "100" )
Index: vhffs-api/src/Vhffs/Services/Cvs.pm
===================================================================
--- vhffs-api/src/Vhffs/Services/Cvs.pm (révision 210)
+++ vhffs-api/src/Vhffs/Services/Cvs.pm (copie de travail)
@@ -2,7 +2,7 @@
# This file is a part of VHFFS4 Hosting Platform
-# Please respect the licence of this file and the whole software
+# Please respect the license of this file and the whole software
# Author: soda < dieu at gunnm dot org>
Index: vhffs-api/src/Vhffs/Services/Mailing.pm
===================================================================
--- vhffs-api/src/Vhffs/Services/Mailing.pm (révision 210)
+++ vhffs-api/src/Vhffs/Services/Mailing.pm (copie de travail)
@@ -1,7 +1,7 @@
#!/usr/bin/perl
# This file is a part of VHFFS4 software, a hosting platform suite
-# Please respect the licence of this file and whole program
+# Please respect the license of this file and whole program
# Author : soda < god at gunnm dot org >
Index: vhffs-api/src/Vhffs/Services/MailUser.pm
===================================================================
--- vhffs-api/src/Vhffs/Services/MailUser.pm (révision 210)
+++ vhffs-api/src/Vhffs/Services/MailUser.pm (copie de travail)
@@ -1,7 +1,7 @@
#!/usr/bin/perl
# This file is a part of VHFFS4 software, a hosting platform suite
-# Please respect the licence of this file and whole program
+# Please respect the license of this file and whole program
# Author : soda < dieu at gunnm dot org >
Index: vhffs-api/src/Vhffs/Services/Mail.pm
===================================================================
--- vhffs-api/src/Vhffs/Services/Mail.pm (révision 210)
+++ vhffs-api/src/Vhffs/Services/Mail.pm (copie de travail)
@@ -1,7 +1,7 @@
#!/usr/bin/perl
# This file is a part of VHFFS4 software, a hosting platform suite
-# Please respect the licence of this file and whole program
+# Please respect the license of this file and whole program
# Author : soda < dieu at gunnm dot org >
Index: vhffs-api/src/Vhffs/Services/Httpd.pm
===================================================================
--- vhffs-api/src/Vhffs/Services/Httpd.pm (révision 210)
+++ vhffs-api/src/Vhffs/Services/Httpd.pm (copie de travail)
@@ -3,7 +3,7 @@
# This file is a part of VHFFS4
# It is used to manage Web Area in VHFFS hosting platform
-# Please respect the licence of this file, and the whole VHFFS software.
+# Please respect the license of this file, and the whole VHFFS software.
# Author: soda < dieu at gunnm dot org>
Index: vhffs-api/src/Vhffs/Misc/Mailings.pm
===================================================================
--- vhffs-api/src/Vhffs/Misc/Mailings.pm (révision 210)
+++ vhffs-api/src/Vhffs/Misc/Mailings.pm (copie de travail)
@@ -1,7 +1,7 @@
#!/usr/bin/perl -w
# This file is a part of the VHFFS plateform
-# Please respect the entire licence of VHFFS
+# Please respect the entire license of VHFFS
#
# Author : Julien Delange < dieu at gunnm dot org >
Index: vhffs-api/src/Vhffs/Panel/LargeFile.pm
===================================================================
--- vhffs-api/src/Vhffs/Panel/LargeFile.pm (révision 210)
+++ vhffs-api/src/Vhffs/Panel/LargeFile.pm (copie de travail)
@@ -75,7 +75,7 @@
my $filename = shift;
my $size = shift;
my $type = shift;
- my $licence = shift;
+ my $license = shift;
my $hash = shift;
my $description = shift;
my $user = shift;
@@ -91,7 +91,7 @@
$file->set_user( $user );
$file->set_group( $group );
return undef if( $file->fetch > 0 );
- return undef if( $file->set_licence( $licence ) < 0 );
+ return undef if( $file->set_license( $license ) < 0 );
return undef if ( $file->set_size( $size ) < 0 );
return undef if ( $file->set_type( $type ) < 0 );
return undef if ( $file->set_hash( $hash ) < 0 );
@@ -105,7 +105,7 @@
return undef if ( Vhffs::Acl::add_acl( $group , $file , Vhffs::Constants::ACL_VIEW , $vhffs ) < 0 );
return undef if( $file->fetch < 0 );
- return undef if( $file->set_licence( $licence ) < 0 );
+ return undef if( $file->set_license( $license ) < 0 );
if( defined $hash )
{
$file->set_hash( $hash );
Index: vhffs-api/src/Vhffs/Stats.pm
===================================================================
--- vhffs-api/src/Vhffs/Stats.pm (révision 210)
+++ vhffs-api/src/Vhffs/Stats.pm (copie de travail)
@@ -2,7 +2,7 @@
#Vhffs::ACL written by sod` <dieu AT gunnm DOT org>
-# This software is free software, please read LICENCE file
+# This software is free software, please read LICENSE file
package Vhffs::Stats;
#General perl modules
Index: vhffs-api/src/Vhffs/Acl.pm
===================================================================
--- vhffs-api/src/Vhffs/Acl.pm (révision 210)
+++ vhffs-api/src/Vhffs/Acl.pm (copie de travail)
@@ -2,7 +2,7 @@
#Vhffs::ACL written by sod` <dieu AT gunnm DOT org>
-# This software is free software, please read LICENCE file
+# This software is free software, please read LICENSE file
use Vhffs::Constants;
Index: vhffs-backend/LICENSE
===================================================================
--- vhffs-backend/LICENSE (révision 210)
+++ vhffs-backend/LICENSE (copie de travail)
@@ -1,2 +1,2 @@
-See LICENCE file in the vhffs-doc module to get
-more informations about the licence of Vhffs
+See LICENSE file in the vhffs-doc module to get
+more informations about the license of Vhffs
Index: vhffs-backend/src/pgsql/create_largefile.sql
===================================================================
--- vhffs-backend/src/pgsql/create_largefile.sql (révision 210)
+++ vhffs-backend/src/pgsql/create_largefile.sql (copie de travail)
@@ -12,6 +12,9 @@
START 10000
CACHE 1;
+-- WARNING: 'license' is not spelled correctly in the next table.
+-- To keep ugrades easy, we don't correct this. Please forgive.
+
CREATE TABLE vhffs_largefile
(
file_id SERIAL,
Index: vhffs-panel/public/largefile.pl
===================================================================
--- vhffs-panel/public/largefile.pl (révision 210)
+++ vhffs-panel/public/largefile.pl (copie de travail)
@@ -79,7 +79,7 @@
$template->param( TEXT_TYPE => gettext("File type") );
$template->param( TEXT_SIZE => gettext("Size") );
$template->param( TEXT_HASH => gettext("Hash") );
- $template->param( TEXT_LICENCE => gettext("License of this file") );
+ $template->param( TEXT_LICENSE => gettext("License of this file") );
$template->param( VALUE_TYPE => gettext("File type") );
$template->param( VALUE_SIZE => gettext("Size") );
@@ -92,7 +92,7 @@
{
$template->param( VALUE_HASH => $file->get_hash );
}
- $template->param( VALUE_LICENCE => $file->get_licence );
+ $template->param( VALUE_LICENSE => $file->get_license );
$template->param( VALUE_SIZE => $file->get_size );
$template->param( VALUE_TYPE => $file->get_type );
Index: vhffs-panel/public/group.pl
===================================================================
--- vhffs-panel/public/group.pl (révision 210)
+++ vhffs-panel/public/group.pl (copie de travail)
@@ -172,7 +172,7 @@
$subtemplate = new HTML::Template( filename => $templatedir."/public/misc/largefile-part.tmpl" );
$subtemplate->param( FILENAME => $_->get_filename );
$subtemplate->param( TYPE => $_->get_type );
- $subtemplate->param( LICENCE => $_->get_description );
+ $subtemplate->param( LICENSE => $_->get_description );
$subtemplate->param( DOWNLOAD => "Download this file" );
$subtemplate->param( GROUPNAME => $_->get_group->get_groupname );
$output .= $subtemplate->output;
Index: vhffs-panel/largefile/prefs.pl
===================================================================
--- vhffs-panel/largefile/prefs.pl (révision 210)
+++ vhffs-panel/largefile/prefs.pl (copie de travail)
@@ -87,8 +87,8 @@
$template->param( TEXT_FILENAME => gettext("Filename") );
$template->param( VALUE_FILENAME => $file->get_filename() );
- $template->param( TEXT_LICENCE => gettext("License") );
- $template->param( VALUE_LICENCE => $file->get_licence() );
+ $template->param( TEXT_LICENSE => gettext("License") );
+ $template->param( VALUE_LICENSE => $file->get_license() );
$template->param( TEXT_FILESIZE => gettext("Size") );
$template->param( VALUE_FILESIZE => $file->get_size() );
Index: vhffs-panel/largefile/create.pl
===================================================================
--- vhffs-panel/largefile/create.pl (révision 210)
+++ vhffs-panel/largefile/create.pl (copie de travail)
@@ -34,7 +34,7 @@
$template->param( FILENAME => gettext("Filename") );
$template->param( SIZE => gettext("Size (in Mo)") );
$template->param( TYPE => gettext("Filetype (extension, ...)") );
-$template->param( LICENCE => gettext("License") );
+$template->param( LICENSE => gettext("License") );
$template->param( GROUP => $group->get_groupname );
$template->param( GROUP_NAME => gettext("Group for this new file") );
$template->param( HASH => gettext("Hash") );
Index: vhffs-panel/largefile/submit.pl
===================================================================
--- vhffs-panel/largefile/submit.pl (révision 210)
+++ vhffs-panel/largefile/submit.pl (copie de travail)
@@ -31,7 +31,7 @@
my $size = $cgi->param('size');
my $type = $cgi->param('type');
my $description = $cgi->param("description");
-my $licence = $cgi->param("licence");
+my $license = $cgi->param("license");
my $hash = $cgi->param("hash");
my $message;
my $file;
@@ -39,7 +39,7 @@
my $templatedir = $vhffs->get_config->get_templatedir;
-if( ( ! defined $filename ) || ( ! defined $size ) || ( ! defined $type ) || ( ! defined $licence ) || ( ! defined $description ))
+if( ( ! defined $filename ) || ( ! defined $size ) || ( ! defined $type ) || ( ! defined $license ) || ( ! defined $description ))
{
$message = gettext( "CGI Error !");
}
@@ -47,7 +47,7 @@
{
$message = gettext("Filename is too short. Must contains at least 3 caracters");
}
-elsif( length( $licence ) < 3 )
+elsif( length( $license ) < 3 )
{
$message = gettext( "License is too short. Please tell us about legal aspects concerning the use of this new file." );
}
@@ -55,7 +55,7 @@
{
$message = gettext( "Size is only a number (in Mo)" );
}
-elsif( defined ( $file = Vhffs::Panel::LargeFile::create_largefile($vhffs,$filename,$size,$type,$licence,$hash,$description,$user,$group ) ) )
+elsif( defined ( $file = Vhffs::Panel::LargeFile::create_largefile($vhffs,$filename,$size,$type,$license,$hash,$description,$user,$group ) ) )
{
$file->set_description( $description );
$file->commit;
Index: vhffs-panel/templates/largefile/prefs.tmpl
===================================================================
--- vhffs-panel/templates/largefile/prefs.tmpl (révision 210)
+++ vhffs-panel/templates/largefile/prefs.tmpl (copie de travail)
@@ -5,7 +5,7 @@
<li><tmpl_var name="TEXT_FILENAME">: <tmpl_var name="VALUE_FILENAME">
<li><tmpl_var name="TEXT_FILETYPE">: <tmpl_var name="VALUE_FILETYPE">
<li><tmpl_var name="TEXT_FILESIZE">: <tmpl_var name="VALUE_FILESIZE">
- <li><tmpl_var name="TEXT_LICENCE">: <tmpl_var name="VALUE_LICENCE">
+ <li><tmpl_var name="TEXT_LICENSE">: <tmpl_var name="VALUE_LICENSE">
</ul>
Index: vhffs-panel/templates/largefile/create.tmpl
===================================================================
--- vhffs-panel/templates/largefile/create.tmpl (révision 210)
+++ vhffs-panel/templates/largefile/create.tmpl (copie de travail)
@@ -29,10 +29,10 @@
<input type="text" name="type" id="type"/>
</p>
<p>
- <label for="LICENCE">
- <TMPL_VAR NAME="LICENCE">:
+ <label for="LICENSE">
+ <TMPL_VAR NAME="LICENSE">:
</label>
- <textarea name="licence" id="licence"/></textarea>
+ <textarea name="license" id="license"/></textarea>
</p>
<p>
<label for="hash">
Index: vhffs-panel/templates/public/largefile.tmpl
===================================================================
--- vhffs-panel/templates/public/largefile.tmpl (révision 210)
+++ vhffs-panel/templates/public/largefile.tmpl (copie de travail)
@@ -18,7 +18,7 @@
<li><tmpl_var name="TEXT_TYPE">: <tmpl_var name="VALUE_TYPE"></li>
<li><tmpl_var name="TEXT_SIZE">: <tmpl_var name="VALUE_SIZE"></li>
<li><tmpl_var name="TEXT_HASH">: <tmpl_var name="VALUE_HASH"></li>
- <li><tmpl_var name="TEXT_LICENCE">: <tmpl_var name="VALUE_LICENCE"></li>
+ <li><tmpl_var name="TEXT_LICENSE">: <tmpl_var name="VALUE_LICENSE"></li>
</ul>
<h2><tmpl_var name="TEXT_MIRRORS"></h2>
Index: vhffs-panel/templates/public/misc/largefile-part.tmpl
===================================================================
--- vhffs-panel/templates/public/misc/largefile-part.tmpl (révision 210)
+++ vhffs-panel/templates/public/misc/largefile-part.tmpl (copie de travail)
@@ -1,7 +1,7 @@
<li>
<tmpl_var name="FILENAME">
<tmpl_var name="TYPE">
-<tmpl_var name="LICENCE">
+<tmpl_var name="LICENSE">
<a href="largefile.pl?filename=<tmpl_var name="FILENAME">&groupname=<tmpl_var name="GROUPNAME">">
<tmpl_var name="DOWNLOAD">
</a>
Index: vhffs-tools/src/vhffs-quota
===================================================================
--- vhffs-tools/src/vhffs-quota (révision 210)
+++ vhffs-tools/src/vhffs-quota (copie de travail)
@@ -2,7 +2,7 @@
#This is a part of VHFFS distribution
-#Please respect the licence and my dog
+#Please respect the license and my dog
#Use some VHFFS modules, it can be useful
Index: vhffs-listengine/src/listengine.pl
===================================================================
--- vhffs-listengine/src/listengine.pl (révision 210)
+++ vhffs-listengine/src/listengine.pl (copie de travail)
@@ -1,10 +1,10 @@
#!/usr/bin/perl
#
# This is listengine, the list software for VHFFS
-# This software is free software, so, please respect this work and its licence
+# This software is free software, so, please respect this work and its license
# Special thanks to myself, my cat, my mother and my girlfriend who hangs in my dream
-# Feel free to copy it, use it, print it, ... according to its licence
-# Licence may be GPL, maybe BSD. We don't know, but it's sure it's free :-)
+# Feel free to copy it, use it, print it, ... according to its license
+# License may be GPL, maybe BSD. We don't know, but it's sure it's free :-)
#
# Written by soda <soda at gunnm dot org>
Index: working/vhffs-trunk/vhffs-intl/src/fr/fr.pot
===================================================================
--- working.orig/vhffs-trunk/vhffs-intl/src/fr/fr.pot 2006-06-12 02:53:53.000000000 +0200
+++ working/vhffs-trunk/vhffs-intl/src/fr/fr.pot 2006-06-12 02:55:20.000000000 +0200
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: fr\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-07 15:44+0200\n"
+"POT-Creation-Date: 2006-06-12 02:54+0200\n"
"PO-Revision-Date: 2006-04-26 11:41+0200\n"
"Last-Translator: Christophe Benz <christophebenz@xxxxxxxx>\n"
"Language-Team: <fr@xxxxxx>\n"
@@ -3527,12 +3527,11 @@
#, perl-format
msgid ""
"The prefix of your databases is constant, so the names of your databases "
-"will be %s_DBNAME<br>. One user will be created, which will be called %"
-"s_DBNAME"
+"will be %s_DBNAME<br>One user will be created, which will be called %s_DBNAME"
msgstr ""
-"Le prefixe de votre base de données est constant. Le nom de votre base "
-"dedonnées sera %s_NOMDELABASE<br>. Un utilisateur sera créé et s'appelera "
-"%s_NOMDELABASE"
+"Le préfixe de votre base de données est constant. Le nom de votre base de "
+"données sera %s_NOMDELABASE<br>Un utilisateur sera créé et s'appellera %"
+"s_NOMDELABASE"
#: ../vhffs-panel/svn/svn_submit.pl:45
msgid ""
Index: working/vhffs-trunk/vhffs-panel/mysql/create.pl
===================================================================
--- working.orig/vhffs-trunk/vhffs-panel/mysql/create.pl 2006-06-12 02:53:53.000000000 +0200
+++ working/vhffs-trunk/vhffs-panel/mysql/create.pl 2006-06-12 02:54:14.000000000 +0200
@@ -31,7 +31,7 @@
my $template = new HTML::Template( filename => $templatedir."/mysql/create.tmpl" );
$template->param( TITLE => gettext("Create a MySQL database") );
-$template->param( INFOS => sprintf( gettext("The prefix of your databases is constant, so the names of your databases will be %s_DBNAME<br>. One user will be created, which will be called %s_DBNAME") , $groupname, $groupname, $groupname) );
+$template->param( INFOS => sprintf( gettext("The prefix of your databases is constant, so the names of your databases will be %s_DBNAME<br>One user will be created, which will be called %s_DBNAME") , $groupname, $groupname, $groupname) );
$template->param( GROUP_NAME => gettext("Group owning this database") );
$template->param( DB_NAME_PREFIX => $groupname."_" );
$template->param( DB_NAME => gettext("MySQL database name ") );
Index: working/vhffs-trunk/vhffs-panel/pgsql/create.pl
===================================================================
--- working.orig/vhffs-trunk/vhffs-panel/pgsql/create.pl 2006-06-12 02:53:53.000000000 +0200
+++ working/vhffs-trunk/vhffs-panel/pgsql/create.pl 2006-06-12 02:54:14.000000000 +0200
@@ -36,7 +36,7 @@
$template->param( GROUP_NAME => gettext("Group owning this database") );
$template->param( GROUPNAME => $groupname );
-$template->param( INFOS => sprintf( gettext("The prefix of your databases is constant, so the names of your databases will be %s_DBNAME<br>. One user will be created, which will be called %s_DBNAME") , $groupname, $groupname, $groupname) );
+$template->param( INFOS => sprintf( gettext("The prefix of your databases is constant, so the names of your databases will be %s_DBNAME<br>One user will be created, which will be called %s_DBNAME") , $groupname, $groupname, $groupname) );
$template->param( GROUP => $group->get_groupname );
$template->param( SEND => gettext("Send") );
Index: working/vhffs-trunk/vhffs-intl/src/vhffs.pot
===================================================================
--- working.orig/vhffs-trunk/vhffs-intl/src/vhffs.pot 2006-06-12 02:54:25.000000000 +0200
+++ working/vhffs-trunk/vhffs-intl/src/vhffs.pot 2006-06-12 02:54:28.000000000 +0200
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-07 16:01+0200\n"
+"POT-Creation-Date: 2006-06-12 02:54+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -1541,7 +1541,7 @@
msgstr ""
#: ../vhffs-panel/lost.pl:27
-msgid "Give me a new password... "
+msgid "Give me a new password"
msgstr ""
#: ../vhffs-panel/public/allwebsites.pl:58
@@ -2618,10 +2618,6 @@
msgid "Owner of this group"
msgstr ""
-#: ../vhffs-panel/lost.pl:27
-msgid "PLEASE!!!"
-msgstr ""
-
#: ../vhffs-panel/login.pl:90
msgid "Panel Access"
msgstr ""
@@ -3444,8 +3440,7 @@
#, perl-format
msgid ""
"The prefix of your databases is constant, so the names of your databases "
-"will be %s_DBNAME<br>. One user will be created, which will be called %"
-"s_DBNAME"
+"will be %s_DBNAME<br>One user will be created, which will be called %s_DBNAME"
msgstr ""
#: ../vhffs-panel/svn/svn_submit.pl:45
Attachment:
pgpDetRz7TFx7.pgp
Description: PGP signature
| Mail converted by MHonArc 2.6.19+ | http://listengine.tuxfamily.org/ |