Have taken advantage of the 2.1 version to review every EN and FR languages files since 4859/4860 revisions (last commit on languages files by tosca).

Fixed typos and languages mistakes, and made EN and FR files consistent with one another.

Older languages files (prior to 4859 revision) still to be reviewed.

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

1 files changed, 57 insertions, 56 deletions

diff --git a/language/en_UK/common.lang.php b/language/en_UK/common.lang.php
index 622b02ac4..78f5533e9 100644
--- a/language/en_UK/common.lang.php
+++ b/language/en_UK/common.lang.php
@@ -50,7 +50,7 @@ $lang['About'] = "About";
 $lang['All tags must match'] = "All tags must match";
 $lang['All tags'] = "All tags";
 $lang['Any tag'] = "Any tag";
-$lang['At least one listed rule must be satisfied.'] = "At least one listed rule must be satisfied.";
+$lang['At least one listed rule must be satisfied.'] = "At least one listed criterion must be satisfied.";
 $lang['At least one tag must match'] = "At least one tag must match";
 $lang['Author'] = "Author";
 $lang['Average rate'] = "Average rate";
@@ -68,27 +68,27 @@ $lang['Creation date'] = "Creation date";
 $lang['Current password is wrong'] = "Current password is wrong";
 $lang['Dimensions'] = "Dimensions";
 $lang['Display'] = "Display";
-$lang['Each listed rule must be satisfied.'] = "Each listed rule must be satisfied.";
+$lang['Each listed rule must be satisfied.'] = "Each listed criterion must be satisfied.";
 $lang['Email address is missing'] = "Email address is missing";
 $lang['Email address'] = "Email address";
-$lang['Enter your personnal informations'] = "Enter your personnal informations";
-$lang['Error sending email'] = "Error sending email";
+$lang['Enter your personnal informations'] = "Enter your personnal data";
+$lang['Error sending email'] = "Error when sending email";
 $lang['File name'] = "File name";
 $lang['File'] = "File";
 $lang['Filesize'] = "Filesize";
 $lang['Filter and display'] = "Filter and display";
 $lang['Filter'] = "Filter";
 $lang['Forgot your password?'] = "Forgot your password?";
-$lang['Go through the gallery as a visitor'] = "Go through the gallery as a visitor";
+$lang['Go through the gallery as a visitor'] = "Navigate the gallery as a visitor";
 $lang['Help'] = "Help";
 $lang['Identification'] = "Identification";
-$lang['Image only RSS feed'] = "Image only RSS feed";
+$lang['Image only RSS feed'] = "Images only RSS feed";
 $lang['Keyword'] = "Keyword";
 $lang['Links'] = "Links";
 $lang['Mail address'] = "Mail address";
 $lang['N/A'] = "N/A";
 $lang['New on %s'] = "New on %s";
-$lang['New password confirmation does not correspond'] = "New password confirmation does not correspond";
+$lang['New password confirmation does not correspond'] = "New password confirmation does not match";
 $lang['New password sent by email'] = "New password sent by email";
 $lang['No email address'] = "No email address";
 $lang['No classic user matches this email address'] = "No classic user matches this email address";
@@ -108,7 +108,7 @@ $lang['Registration'] = "Registration";
 $lang['Related tags'] = "Related tags";
 $lang['Reset'] = "Reset";
 $lang['Retrieve password'] = "Retrieve password";
-$lang['Search rules'] = "Search rules";
+$lang['Search rules'] = "Search criteria";
 $lang['Search tags'] = "Search tags";
 $lang['Search'] = "Search";
 $lang['See available tags'] = "See available tags";
@@ -118,7 +118,7 @@ $lang['Sort by'] = "Sort by";
 $lang['Sort order'] = "Sort order";
 $lang['Tag'] = "Tag";
 $lang['Tags'] = "Tags";
-$lang['The RSS notification feed provides notification on news from this website : new pictures, updated categories, new comments. Use a RSS feed reader.'] = "The RSS notification feed provides notification on news from this website : new pictures, updated categories, new comments. Use a RSS feed reader.";
+$lang['The RSS notification feed provides notification on news from this website : new pictures, updated categories, new comments. Use a RSS feed reader.'] = "The RSS feed provides notification on new events from this website: new pictures, updated categories, new comments. To be used with a RSS feed reader.";
 $lang['Unknown feed identifier'] = "Unknown feed identifier";
 $lang['User comments'] = "User comments";
 $lang['Username'] = "Username";
@@ -140,8 +140,8 @@ $lang['posted before %s (%s)'] = "posted before %s (%s)";
 $lang['posted between %s (%s) and %s (%s)'] = "posted between %s (%s) and %s (%s)";
 $lang['posted on %s'] = "posted on %s";
 $lang['Best rated'] = "Best rated";
-$lang['display best rated items'] = "display best rated items";
-$lang['caddie'] = "caddie";
+$lang['display best rated items'] = "display best rated images";
+$lang['caddie'] = "Caddie";
 $lang['Calendar'] = "Calendar";
 $lang['All'] = "All";
 $lang['display each day with pictures, month per month'] = "display each day with pictures, month per month";
@@ -156,7 +156,7 @@ $lang['Comment'] = "Comment";
 $lang['Your comment has been registered'] = "Your comment has been registered";
 $lang['Anti-flood system : please wait for a moment before trying to post another comment'] = "Anti-flood system : please wait for a moment before trying to post another comment";
 $lang['Your comment has NOT been registered because it did not pass the validation rules'] = "Your comment has NOT been registered because it did not pass the validation rules";
-$lang['An administrator must authorize your comment before it is visible.'] = "An administrator must authorize your comment before it is visible.";
+$lang['An administrator must authorize your comment before it is visible.'] = "An administrator must authorize your comment before it becomes visible.";
 $lang['This login is already used by another user'] = "This login is already used by another user";
 $lang['Comments'] = "Comments";
 $lang['Add a comment'] = "Add a comment";
@@ -165,7 +165,7 @@ $lang['created before %s (%s)'] = "created before %s (%s)";
 $lang['created between %s (%s) and %s (%s)'] = "created between %s (%s) and %s (%s)";
 $lang['created on %s'] = "created on %s";
 $lang['Customize'] = "Customize";
-$lang['Your Gallery Customization'] = "Your Gallery Customization";
+$lang['Your Gallery Customization'] = "Your gallery customization";
 $lang['day'][0] = "Sunday";
 $lang['day'][1] = "Monday";
 $lang['day'][2] = "Tuesday";
@@ -193,7 +193,7 @@ $lang['Hello'] = "Hello";
 $lang['available for administrators only'] = "available for administrators only";
 $lang['shows images at the root of this category'] = "shows images at the root of this category";
 $lang['See last users comments'] = "See last users comments";
-$lang['customize the appareance of the gallery'] = "customize the appareance of the gallery";
+$lang['customize the appareance of the gallery'] = "customize the look of the gallery";
 $lang['search'] = "search";
 $lang['Home'] = "Home";
 $lang['Identification'] = "Identification";
@@ -207,13 +207,13 @@ $lang['last %d days'] = "last %d days";
 $lang['Last'] = "Last";
 $lang['Logout'] = "Logout";
 $lang['E-mail address'] = "E-mail address";
-$lang['obligatory'] = "obligatory";
-$lang['Maximum height of the pictures'] = "Maximum height of the pictures";
-$lang['Maximum height must be a number superior to 50'] = "Maximum height must be a number superior to 50";
-$lang['Maximum width of the pictures'] = "Maximum width of the pictures";
-$lang['Maximum width must be a number superior to 50'] = "Maximum width must be a number superior to 50";
+$lang['obligatory'] = "mandatory";
+$lang['Maximum height of the pictures'] = "Pictures maximum height";
+$lang['Maximum height must be a number superior to 50'] = "Maximum height must be a number greater than 50";
+$lang['Maximum width of the pictures'] = "Pictures maximum width";
+$lang['Maximum width must be a number superior to 50'] = "Maximum width must be a number greater than 50";
 $lang['display a calendar by creation date'] = "display a calendar by creation date";
-$lang['display all elements in all sub-categories'] = "display all elements in all sub-categories";
+$lang['display all elements in all sub-categories'] = "display all elements in all categories and sub-categories";
 $lang['return to normal view mode'] = "return to normal view mode";
 $lang['display a calendar by posted date'] = "display a calendar by posted date";
 $lang['month'][10] = "October";
@@ -230,9 +230,9 @@ $lang['month'][8] = "August";
 $lang['month'][9] = "September";
 $lang['Most visited'] = "Most visited";
 $lang['display most visited pictures'] = "display most visited pictures";
-$lang['The number of images per row must be a not null scalar'] = "The number of images per row must be a not null scalar";
+$lang['The number of images per row must be a not null scalar'] = "The number of images per row must be a nonzero integer";
 $lang['Number of images per row'] = "Number of images per row";
-$lang['The number of rows per page must be a not null scalar'] = "The number of rows per page must be a not null scalar";
+$lang['The number of rows per page must be a not null scalar'] = "The number of rows per page must be a nonzero integer";
 $lang['Number of rows per page'] = "Number of rows per page";
 $lang['Unknown identifier'] = "Unknown identifier";
 $lang['New password'] = "New password";
@@ -240,8 +240,8 @@ $lang['Rate this picture'] = "Rate this picture";
 $lang['Next'] = "Next";
 $lang['Home'] = "Home";
 $lang['no rate'] = "no rate";
-$lang['Elements posted within the last %d day.'] = "Elements posted within the last %d day.";
-$lang['Elements posted within the last %d days.'] = "Elements posted within the last %d days.";
+$lang['Elements posted within the last %d day.'] = "Elements posted within the last %d day only.";
+$lang['Elements posted within the last %d days.'] = "Elements posted within the last %d days only.";
 $lang['password updated'] = "password updated";
 $lang['Recent period must be a positive integer value'] = "Recent period must be a positive integer value";
 $lang['picture'] = "picture";
@@ -259,26 +259,26 @@ $lang['Recent pictures'] = "Recent pictures";
 $lang['display most recent pictures'] = "display most recent pictures";
 $lang['Redirection...'] = "Redirection...";
 $lang['Please, enter a login'] = "Please, enter a login";
-$lang['login mustn\'t end with a space character'] = "login mustn't end with a space character";
-$lang['login mustn\'t start with a space character'] = "login mustn't start with a space character";
+$lang['login mustn\'t end with a space character'] = "login must not end with a space character";
+$lang['login mustn\'t start with a space character'] = "login must not start with a space character";
 $lang['this login is already used'] = "this login is already used";
 $lang['mail address must be like xxx@yyy.eee (example : jack@altern.org)'] = "mail address must be like xxx@yyy.eee (example : jack@altern.org)";
 $lang['please enter your password again'] = "please enter your password again";
 $lang['Auto login'] = "Auto login";
 $lang['remove this tag from the list'] = "remove this tag from the list";
 $lang['representative'] = "representative";
-$lang['return to homepage'] = "return to homepage";
-$lang['Search for Author'] = "Search for Author";
-$lang['Search in Categories'] = "Search in Categories";
-$lang['Search by Date'] = "Search by Date";
+$lang['return to homepage'] = "return to home page";
+$lang['Search for Author'] = "Search for an author";
+$lang['Search in Categories'] = "Search in categories";
+$lang['Search by Date'] = "Search by date";
 $lang['Date'] = "Date";
-$lang['End-Date'] = "End-Date";
+$lang['End-Date'] = "End date";
 $lang['Kind of date'] = "Kind of date";
 $lang['Search for words'] = "Search for words";
 $lang['Search for all terms'] = "Search for all terms";
-$lang['Search for any terms'] = "Search for any terms";
+$lang['Search for any terms'] = "Search for any term";
 $lang['Empty query. No criteria has been entered.'] = "Empty query. No criteria has been entered.";
-$lang['Search Options'] = "Search Options";
+$lang['Search Options'] = "Search options";
 $lang['Search results'] = "Search results";
 $lang['Search in subcategories'] = "Search in subcategories";
 $lang['Search'] = "Search";
@@ -301,22 +301,22 @@ $lang['A comment on your site'] = "A comment on your site";
 $lang['today'] = "today";
 $lang['Update your rating'] = "Update your rating";
 $lang['wrong filename'] = "wrong filename";
-$lang['the filesize of the picture must not exceed :'] = "the filesize of the picture must not exceed :";
-$lang['the picture must be to the fileformat jpg, gif or png'] = "the picture must be to the fileformat jpg, gif or png";
-$lang['the height of the picture must not exceed :'] = "the height of the picture must not exceed :";
+$lang['the filesize of the picture must not exceed :'] = "the picture filesize must not exceed :";
+$lang['the picture must be to the fileformat jpg, gif or png'] = "the picture fileformat must be jpg, gif or png";
+$lang['the height of the picture must not exceed :'] = "the picture height must not exceed :";
 $lang['Optional, but recommended : choose a thumbnail to associate to'] = "Optional, but recommended : choose a thumbnail to associate to";
 $lang['the width of the picture must not exceed :'] = "the width of the picture must not exceed :";
 $lang['Author'] = "Author";
-$lang['can\'t upload the picture on the server'] = "can't upload the picture on the server";
-$lang['the username must be given'] = "the username must be given";
-$lang['A picture\'s name already used'] = "A picture's name already used";
+$lang['can\'t upload the picture on the server'] = "the picture cannot be uploaded onto the server";
+$lang['the username must be given'] = "the username is required";
+$lang['A picture\'s name already used'] = "this picture name is already used";
 $lang['You must choose a picture fileformat for the image'] = "You must choose a picture fileformat for the image";
-$lang['You can\'t upload pictures in this category'] = "You can't upload pictures in this category";
-$lang['Name of the picture'] = "Name of the picture";
+$lang['You can\'t upload pictures in this category'] = "You cannot upload pictures in this category";
+$lang['Name of the picture'] = "Picture name";
 $lang['Upload a picture'] = "Upload a picture";
 $lang['Picture uploaded with success, an administrator will validate it as soon as possible'] = "Picture uploaded with success, an administrator will validate it as soon as possible";
 $lang['Upload a picture'] = "Upload a picture";
-$lang['useful when password forgotten'] = "useful when password forgotten";
+$lang['useful when password forgotten'] = "useful in case password is forgotten";
 $lang['Quick search'] = "Quick search";
 $lang['Connected user: %s'] = "Connected user: %s";
 $lang['IP: %s'] = "IP: %s";
@@ -333,20 +333,20 @@ $lang['Registration of %s'] = "Registration of %s";
 $lang['Category: %s'] = "Category: %s";
 $lang['Picture name: %s'] = "Picture name: %s";
 $lang['Creation date: %s'] = "Creation date: %s";
-$lang['Waiting page: %s'] = "Waiting page: %s";
+$lang['Waiting page: %s'] = "Awaiting page: %s";
 $lang['Picture uploaded by %s'] = "Picture uploaded by %s";
-$lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = "Bad status for user \"guest\", using default status. Please notify the webmaster.";
+$lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = "Bad status for user \"guest\", default status will be used. Please notify the webmaster.";
 $lang['Administrator, webmaster and special user cannot use this method'] = "Administrator, webmaster and special user cannot use this method";
-$lang['a user use already this mail address'] = "a user use already this mail address";
+$lang['a user use already this mail address'] = "another user already use this mail address";
 $lang['Category results for'] = "Category results for";
 $lang['Tag results for'] = "Tag results for";
 $lang['from %s to %s'] = "from %s to %s";
-$lang['Play of slideshow'] = "Play of slideshow";
-$lang['Pause of slideshow'] = "Pause of slideshow";
-$lang['Repeat the slideshow'] = "Repeat the slideshow";
-$lang['Not repeat the slideshow'] = "Not repeat the slideshow";
-$lang['Reduce diaporama speed'] = "Reduce diaporama speed";
-$lang['Accelerate diaporama speed'] = "Accelerate diaporama speed";
+$lang['Play of slideshow'] = "Play slideshow";
+$lang['Pause of slideshow'] = "Pause slideshow";
+$lang['Repeat the slideshow'] = "Repeat slideshow";
+$lang['Not repeat the slideshow'] = "Do not repeat slideshow";
+$lang['Reduce diaporama speed'] = "Reduce slideshow speed";
+$lang['Accelerate diaporama speed'] = "Increase slideshow speed";
 $lang['Submit'] = "Submit";
 $lang['Yes'] = "Yes";
 $lang['No'] = "No";
@@ -357,19 +357,19 @@ $lang['%d images are also linked to current tags'] = "%d images are also linked
 $lang['See images linked to this tag only'] = "See images linked to this tag only";
 $lang['images posted during the last %d days'] = "images posted during the last %d days";
 $lang['Choose an image'] = "Choose an image";
-$lang['Piwigo Help'] = "Piwigo Help";
+$lang['Piwigo Help'] = "Piwigo help";
 $lang['Rank'] = "Rank";
 $lang['group by letters'] = "group by letters";
 $lang['letters'] = "letters";
-$lang['show tag cloud'] = "show tag cloud";
+$lang['show tag cloud'] = "show tags cloud";
 $lang['cloud'] = "cloud";
 $lang['Reset to default values'] = "Reset to default values";
 $lang['delete all images from your favorites'] = "delete all images from your favorites";
 $lang['Sent by'] = "Sent by";
-$lang['Cookies are blocked or not supported by your browser. You must enable cookies to connect.'] = "Cookies are blocked or not supported by your browser. You must enable cookies to connect.";
+$lang['Cookies are blocked or not supported by your browser. You must enable cookies to connect.'] = "Cookies are blocked or not supported by your browser. You must enable cookies to log in.";
 
-$lang['Some info about this picture'] = "Some info about this picture";
-$lang['Some more (technical) info about this picture'] = "Some more (technical) info about this picture";
+$lang['Some info about this picture'] = "Information about this picture";
+$lang['Some more (technical) info about this picture'] = "More (technical) information about this picture";
 $lang['edit this comment'] = "edit this comment";
 $lang['Edit a comment'] = "Edit a comment";
 $lang['Are you sure?'] = "Are you sure?";
@@ -386,4 +386,5 @@ $lang['This author modified following comment:'] = 'This author modified followi
 $lang['This author removed the comment with id %d'] = 'This author removed the comment with id %d';
 $lang['delete this comment'] = "delete this comment";
 $lang['validate this comment'] = 'validate this comment';
+$lang['Allow user customization'] = "Allow user customization"; 
 ?>