merge r3381 from branch 2.0 to trunk

feature 1020 added: ability to subscribe to Piwigo Announcement Newsletter from
Piwigo itself. Admins can perform this action at the end of installation or on
administration panel index.

git-svn-id: http://piwigo.org/svn/trunk@3382 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall 2009-05-31 19:46:59 +00:00
commit 654ce203d3
8 changed files with 63 additions and 3 deletions

View file

@ -648,4 +648,8 @@ $lang['Downloads'] = 'Downloads';
$lang['Released on'] = 'Released on';
$lang['Number of downloads'] = 'Number of downloads';
// --------- Starting below: New or revised $lang ---- from Colibri (2.1)
$lang['Piwigo Announcements Newsletter'] = 'Piwigo Announcements Newsletter';
$lang['Subscribe to Piwigo Announcements Newsletter'] = 'Keep in touch with Piwigo project, subscribe to Piwigo Announcement Newsletter. You will receive emails when a new release is available (sometimes including a security bug fix, it\'s important to know and upgrade) and when major events happen to the project. Only a few emails a year.';
$lang['Subscribe %s'] = 'Subscribe %s';
$lang['Subscribe %s to Piwigo Announcements Newsletter'] = 'Subscribe %s to Piwigo Announcements Newsletter';
?>

View file

@ -647,4 +647,9 @@ $lang['Downloads'] = 'Téléchargements';
$lang['Released on'] = 'Ajouté le';
$lang['Number of downloads'] = 'Nombre de téléchargements';
// --------- Starting below: New or revised $lang ---- from Colibri (2.1)
$lang['Piwigo Announcements Newsletter'] = 'Newsletter Piwigo';
$lang['Subscribe to Piwigo Announcements Newsletter'] = 'Restez en contact avec le projet Piwigo, abonnez-vous à la newsletter. Vous recevrez un email lorsqu\'une nouvelle version sera disponible (parfois un bug de sécurité est corrigé, il est important d\'être au courant et de mettre à jour) ou qu\'un événement majeur surviendra sur le projet. Seulement quelques messages par an.';
$lang['Subscribe %s'] = 'Abonner %s';
$lang['Subscribe %s to Piwigo Announcements Newsletter'] = 'Abonner %s à la newsletter Piwigo';
?>