- modification: localized labels in Administration>Pictures>Caddie

- translation: bug fixed on special categories title in French

- translation: all help pages were translated in french


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

4 files changed, 30 insertions, 14 deletions

diff --git a/language/en_UK.iso-8859-1/admin.lang.php b/language/en_UK.iso-8859-1/admin.lang.php
index 7bea8580a..6038c0175 100644
--- a/language/en_UK.iso-8859-1/admin.lang.php
+++ b/language/en_UK.iso-8859-1/admin.lang.php
@@ -46,6 +46,7 @@ $lang['Add'] = 'Add';
 $lang['Associated'] = 'Associated';
 $lang['Association to categories'] = 'Association to categories';
 $lang['Batch management'] = 'Batch management';
+$lang['Caddie management'] = 'Caddie management';
 $lang['Caddie'] = 'Caddie';
 $lang['Categories authorized thanks to group associations'] = 'Categories authorized thanks to group associations';
 $lang['Check for upgrade failed for unknown reasons.'] = 'Check for upgrade failed for unknown reasons.';
@@ -59,12 +60,15 @@ $lang['Deletions'] = 'Deletions';
 $lang['Deny selected groups'] = 'Deny selected groups';
 $lang['Deny selected users'] = 'Deny selected users';
 $lang['Description'] = 'Description';
+$lang['Display options'] = 'Display options';
 $lang['Dissociated'] = 'Dissociated';
 $lang['Does not represent'] = 'Does not represent';
 $lang['Edit all picture informations'] = 'Edit all picture informations';
+$lang['Elements'] = 'Elements';
 $lang['Empty caddie'] = 'Empty caddie';
 $lang['Environment'] = 'Environment';
 $lang['Expand all categories'] = 'Expand all categories';
+$lang['Form'] = 'Form';
 $lang['Gallery description'] = 'Gallery description';
 $lang['Gallery title'] = 'Gallery title';
 $lang['Grant selected groups'] = 'Grant selected groups';
@@ -120,6 +124,7 @@ $lang['Representation of categories'] = 'Representation of categories';
 $lang['Representative'] = 'Representative';
 $lang['Represents'] = 'Represents';
 $lang['Save order'] = 'Save order';
+$lang['Select at least one category'] = 'Select at least one category';
 $lang['Select at least one picture'] = 'Select at least one picture';
 $lang['Select at least one user'] = 'Select at least one user';
 $lang['Show info'] = 'Show info';
@@ -143,8 +148,8 @@ $lang['You are running the latest version of PhpWebGallery.'] = 'You are running
 $lang['You cannot move a category in its own sub category'] = 'You cannot move a category in its own sub category';
 $lang['You need to confirm deletion'] = 'You need to confirm deletion';
 $lang['actions'] = 'actions';
-$lang['all'] = 'all';
-$lang['ascending'] = 'ascending';
+$lang['add keywords'] = 'add keywords';
+$lang['associate to category'] = 'associate to category';
 $lang['associate to group'] = 'associate to group';
 $lang['author'] = 'author';
 $lang['authorized'] = 'Authorized';
@@ -171,22 +176,26 @@ $lang['conf_general_title'] = 'Main configuration';
 $lang['conf_nb_comment_page_error'] = 'The number of comments a page must be between 5 and 50 included.';
 $lang['config'] = 'Configuration';
 $lang['confirm'] = 'confirm';
+$lang['creation date'] = 'creation date';
 $lang['date'] = 'date';
 $lang['delete category'] = 'delete category';
-$lang['descending'] = 'descending';
 $lang['description'] = 'description';
+$lang['dissociate from category'] = 'dissociate from category';
 $lang['dissociate from group'] = 'dissociate from group';
 $lang['down'] = 'Move down';
 $lang['edit category permissions'] = 'edit category permissions';
 $lang['edit'] = 'Edit';
 $lang['editcat_confirm'] = 'Category informations updated successfully.';
 $lang['editcat_uploadable'] = 'Authorize upload';
+$lang['elements per line'] = 'elements per line';
+$lang['elements per page'] = 'elements per page';
 $lang['elements'] = 'elements';
 $lang['file'] = 'file';
 $lang['filesize'] = 'filesize';
 $lang['first element added on %s'] = 'first element added on %s';
 $lang['forbidden'] = 'Forbidden';
 $lang['general'] = 'General';
+$lang['global mode'] = 'global mode';
 $lang['group "%s" added'] = 'group "%s" added';
 $lang['group "%s" deleted'] = 'group "%s" deleted';
 $lang['group'] = 'group';
@@ -248,6 +257,7 @@ $lang['remote_site_uncorrect_url'] = 'Remote site url must start by http or http
 $lang['remote_site_update'] = 'update';
 $lang['remote_site_update_hint'] = 'read remote listing.xml and updates database';
 $lang['remote_sites'] = 'Remote sites';
+$lang['remove keyword'] = 'remove keyword';
 $lang['selection'] = 'selection';
 $lang['set to'] = 'set to';
 $lang['singly represented'] = 'singly represented';
@@ -262,6 +272,7 @@ $lang['synchronize metadata'] = 'synchronize metadata';
 $lang['synchronize'] = 'synchronize';
 $lang['target'] = 'target';
 $lang['thumbnail'] = 'thumbnail';
+$lang['title'] = 'title';
 $lang['title_cat_options'] = 'Categories options';
 $lang['title_categories'] = 'Categories management';
 $lang['title_configuration'] = 'PhpWebGallery configuration';
@@ -297,6 +308,7 @@ $lang['tn_stats_nb'] = 'number of miniaturized pictures';
 $lang['tn_stats_total'] = 'total time';
 $lang['tn_thisformat'] = 'for this file format';
 $lang['tn_width'] = 'width';
+$lang['unit mode'] = 'unit mode';
 $lang['unlocked'] = 'Unlocked';
 $lang['unset'] = 'unset';
 $lang['up'] = 'Move up';
diff --git a/language/en_UK.iso-8859-1/common.lang.php b/language/en_UK.iso-8859-1/common.lang.php
index 7dddd87ed..8e4c0ef91 100644
--- a/language/en_UK.iso-8859-1/common.lang.php
+++ b/language/en_UK.iso-8859-1/common.lang.php
@@ -100,7 +100,6 @@ $lang['User comments'] = 'User comments';
 $lang['Username'] = 'Username';
 $lang['Visits'] = 'Visits';
 $lang['Webmaster'] = 'Webmaster';
-$lang['about'] = 'about';
 $lang['about_page_title'] = 'About PhpWebGallery';
 $lang['access_forbiden'] = 'You are not authorized to access this page';
 $lang['add to caddie'] = 'add to caddie';
@@ -154,7 +153,6 @@ $lang['gallery_locked_message'] = 'The gallery is locked for maintenance. Please
 $lang['generation_time'] = 'Page generated in';
 $lang['guest'] = 'guest';
 $lang['hello'] = 'Hello';
-$lang['hint_about'] = 'more informations on PhpWebGallery...';
 $lang['hint_admin'] = 'available for administrators only';
 $lang['hint_category'] = 'shows images at the root of this categry';
 $lang['hint_comments'] = 'See last users comments';
@@ -300,4 +298,10 @@ $lang['upload_username'] = 'Username';
 $lang['useful when password forgotten'] = 'useful when password forgotten';
 $lang['w_month'] = 'Month';
 $lang['yes'] = 'Yes';
+
+$lang['descending'] = 'descending';
+$lang['all'] = 'all';
+$lang['ascending'] = 'ascending';
+$lang['comment date'] = 'comment date';
+$lang['picture'] = 'picture';
 ?>
\ No newline at end of file
diff --git a/language/en_UK.iso-8859-1/help.html b/language/en_UK.iso-8859-1/help.html
index 1d2fd2e72..6d03ef3d8 100644
--- a/language/en_UK.iso-8859-1/help.html
+++ b/language/en_UK.iso-8859-1/help.html
@@ -99,14 +99,14 @@ your gallery.</li>
   extension. Optionaly, you can associate a thumbnail and a representative
   file (see video.avi in the example above).</li>
 
-  <li>Warning : the name of directories and files must be composed of
-  letters, figures, "-", "_" or ".". No blank space, no accentuated
-  characters</li>
-
-  <li>Advise : a category can contain elements and sub-categories in the
-  same time. Nerverthless, you are strongly advised for each category to
-  choose between category containing elements OR category containing
-  sub-categories.</li>
+  <li><em>Warning</em> : the name of directories and files must be composed
+of letters, figures, "-", "_" or ".". No blank space, no accentuated
+characters</li>
+
+  <li><em>Advise</em> : a category can contain elements and sub-categories
+in the same time. Nerverthless, you are strongly advised for each category
+to choose between category containing elements <strong>or</strong> category
+containing sub-categories.</li>
 
   <li>Once files, thumbnails and representatives are correctly placed in the
   directories, go to : <span class="pwgScreen">Administration, General,
diff --git a/language/en_UK.iso-8859-1/help/maintenance.html b/language/en_UK.iso-8859-1/help/maintenance.html
index 85e905cc9..c3ecbea46 100644
--- a/language/en_UK.iso-8859-1/help/maintenance.html
+++ b/language/en_UK.iso-8859-1/help/maintenance.html
@@ -18,7 +18,7 @@ information from database make you save disk space.</p>
   the coherence of representative picture.</li>
 
   <li><strong>update images informations</strong>. For each picture,
-  informations to update are : full path to file, averate
+  informations to update are : full path to file, average
   rate. <em>Warning</em>: do not get confuse with metadata informations
   which can be synchronized from <span class="pwgScreen">Administration,
   General, Synchronize</span> or by reaching the modification screen of a