feature 2406 added: if the user wants a new album in the upload form, the album

is created before the start of the upload. The ergonomy is now simpler, the
page is smaller and cleaner.

bug 2373 fixed: now that album is created before upload, uploadify.php gets the
category_id and the level: as soon as it is uploaded (function add_uploaded_file)
the photo gets its final privacy level and is directly associated to the album.
This way, we can have an error on a photo without making orphan all photos of
the same upload group.

feature 2405 added: as soon as a photo is uploaded, its thumbnail is displayed
in the "Uploaded Photos" fieldset, without waiting for other photos to be
uploaded. The latest photos comes first.

I have slighlty changed the integration of colorbox in core. Now we have 2
styles available and by default, we use style2 (overlay in black, title and
control icons outside the popup). It is also used for zooming on bulk manager
in unit mode.

display change: on each uploading photos, instead of showing the transfer
speed, we display the transfer progression in %

bug fixed: the color of the "Start Upload" button was not correct because the
button was not a submit button but a simple type=button.

language: "Upload" button becomes "Start Upload" button.


git-svn-id: http://piwigo.org/svn/trunk@11962 68402e56-0260-453c-a942-63ccdbb3a9ee

2 files changed, 7 insertions, 2 deletions

diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php
index 34e89e169..fdca61475 100644
--- a/language/en_UK/admin.lang.php
+++ b/language/en_UK/admin.lang.php
@@ -251,7 +251,7 @@ $lang['Download'] = 'Download';
 $lang['Download,'] = 'Download,';
 $lang['Downloads'] = "Downloads";
 $lang['Drag to re-order'] = "Click-and-drag to re-order";
-$lang['Drop into album'] = 'Drop into album';
+$lang['Drop into album'] = 'Select an album';
 $lang['duplicates'] = 'duplicates';
 $lang['Edit album permissions'] = "Edit album permissions";
 $lang['edit album permissions'] = "edit album permissions";
@@ -843,4 +843,7 @@ $lang['Height'] = 'Height';
 $lang['Follow Orientation'] = 'Follow Orientation';
 $lang['If you want to regenerate thumbnails, please go to the <a href="%s">Batch Manager</a>.'] = 'If you want to regenerate thumbnails, please go to the <a href="%s">Batch Manager</a>.';
 $lang['Graphics Library'] = 'Graphics Library';
+$lang['... or '] = '... or ';
+$lang['Create'] = 'Create';
+$lang['Start Upload'] = 'Start Upload';
 ?>
diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php
index a56bb0181..65312b680 100644
--- a/language/fr_FR/admin.lang.php
+++ b/language/fr_FR/admin.lang.php
@@ -852,5 +852,7 @@ $lang['Activate icon "new" next to albums and pictures'] = 'Afficher l\'icône "
 $lang['You can\'t define a default photo order because you have a custom setting in your local configuration.'] = 'Vous ne pouvez définir l\'ordre par défaut des photos car vous avez un paramètre personnalisé dans votre configuration locale.';
 $lang['You have specified <i>$conf[\'order_by\']</i> in your local configuration file, this parameter in deprecated, please remove it or rename it into <i>$conf[\'order_by_custom\']</i> !'] = 'Vous avez spécifié <i>$conf[\'order_by\']</i> dans votre fichier de configuration, ce paramètre est obsolète, veuillez le supprimer ou le renommer en <i>$conf[\'order_by_custom\']</i> !';
 $lang['Add a criteria'] = 'Ajouter un critère';
-
+$lang['... or '] = '... ou bien ';
+$lang['Create'] = 'Créer';
+$lang['Start Upload'] = 'Démarrer le transfert';
 ?>
\ No newline at end of file