- upload.tpl goes smarty

- start some language cleanup and a small attempt to standardize a bit ...
- debug_language now calls trigger_error instead of echo when missing language key

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

2 files changed, 24 insertions, 50 deletions

diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php
index b17fcfe7e..1dd14f9e5 100644
--- a/language/en_UK/admin.lang.php
+++ b/language/en_UK/admin.lang.php
@@ -34,8 +34,6 @@ $lang['cat_inclu_part3_S'] = ' and %d virtual';
 $lang['cat_inclu_part3_P'] = ' and %d virtual';
 $lang['%d category moved'] = '%d category moved';
 $lang['%d categories moved'] = '%d categories moved';
-$lang['%d element'] = '%d element';
-$lang['%d elements'] = '%d elements';
 $lang['%d group'] = '%d group';
 $lang['%d groups'] = '%d groups';
 $lang['%d member'] = '%d member';
@@ -79,7 +77,6 @@ $lang['Check for upgrade failed for unknown reasons.'] = 'Check for upgrade fail
 $lang['Check for upgrade'] = 'Check for upgrade';
 $lang['Comments for all'] = 'Comments for all';
 $lang['Controversy'] = 'Controversy';
-$lang['Creation date'] = 'Creation date';
 $lang['Current name'] = 'Current name';
 $lang['Database'] = 'Database';
 $lang['Deactivate'] = 'Deactivate';
@@ -133,7 +130,6 @@ $lang['New name'] = 'New name';
 $lang['New parent category'] = 'New parent category';
 $lang['New tag'] = 'New tag';
 $lang['No tag defined. Use Administration>Pictures>Tags'] = 'No tag defined. Use Administration>Pictures>Tags';
-$lang['No'] = 'No';
 $lang['Number of comments per page'] = 'Number of comments per page';
 $lang['Number of rates'] = 'Number of rates';
 $lang['Number of thumbnails to create'] = 'Number of thumbnails to create';
@@ -182,7 +178,6 @@ $lang['Site manager'] = 'Site manager';
 $lang['Status'] = 'Status';
 $lang['Statistics'] = 'Statistics';
 $lang['Storage category'] = 'Storage category';
-$lang['Submit'] = 'Submit';
 $lang['Sum of rates'] = 'Sum of rates';
 $lang['Tag "%s" already exists'] = 'Tag "%s" already exists';
 $lang['Tag "%s" was added'] = 'Tag "%s" was added';
@@ -203,7 +198,6 @@ $lang['Virtual categories movement'] = 'Virtual categories movement';
 $lang['Virtual categories to move'] = 'Virtual categories to move';
 $lang['Virtual category name'] = 'Virtual category name';
 $lang['Webmaster cannot be deleted'] = 'Webmaster cannot be deleted';
-$lang['Yes'] = 'Yes';
 $lang['You are running on development sources, no check possible.'] = 'You are running on development sources, no check possible.';
 $lang['You are running the latest version of PhpWebGallery.'] = 'You are running the latest version of PhpWebGallery.';
 $lang['You cannot delete your account'] = "You cannot delete your account";
@@ -400,19 +394,6 @@ $lang['site_local'] = 'Local';
 $lang['site_remote'] = 'Remote';
 $lang['site_synchronize'] = 'synchronize';
 $lang['site_synchronize_hint'] = 'update the database from files';
-$lang['stats_addr'] = 'IP Address';
-$lang['stats_category'] = 'Category';
-$lang['stats_daily_graph_title'] = 'Pages seen by hour';
-$lang['stats_day_title'] = 'Daily statistics';
-$lang['stats_file'] = 'File';
-$lang['stats_global_graph_title'] = 'Pages seen by month';
-$lang['stats_hour'] = 'Hour';
-$lang['stats_login'] = 'Login';
-$lang['stats_month_title'] = 'Monthly statistics';
-$lang['stats_monthly_graph_title'] = 'Pages seen by day';
-$lang['stats_pages_seen'] = 'Pages seen';
-$lang['stats_picture'] = 'Picture';
-$lang['stats_title'] = 'Last year statistics';
 $lang['status'] = 'status';
 $lang['storage'] = 'Directory';
 $lang['sub-categories'] = 'sub-categories';
@@ -682,4 +663,4 @@ $lang['plugins_check_chmod'] = 'Please check "plugins" folder and sub-folders pe
 $lang['plugins_server_error'] = 'Can\'t connect to server.';
 
 $lang['Purge compiled templates'] = 'Purge compiled templates';
-?>
\ No newline at end of file
+?>
diff --git a/language/en_UK/common.lang.php b/language/en_UK/common.lang.php
index cae146631..a34d8eb96 100644
--- a/language/en_UK/common.lang.php
+++ b/language/en_UK/common.lang.php
@@ -43,12 +43,10 @@ $lang['%d comment'] = '%d comment';
 $lang['%d comments'] = '%d comments';
 $lang['%d hit'] = '%d hit';
 $lang['%d hits'] = '%d hits';
-$lang['%d new element'] = '%d new element';
-$lang['%d new elements'] = '%d new elements';
+$lang['%d new element'] = '%d new image';
+$lang['%d new elements'] = '%d new images';
 $lang['%d new user'] = '%d new user';
 $lang['%d new users'] = '%d new users';
-$lang['%d picture are also linked to current tags'] = '%d picture is also linked to current tags';
-$lang['%d pictures are also linked to current tags'] = '%d pictures are also linked to current tags';
 $lang['%d waiting element'] = '%d waiting element';
 $lang['%d waiting elements'] = '%d waiting elements';
 $lang['About'] = 'About';
@@ -118,7 +116,6 @@ $lang['Search rules'] = 'Search rules';
 $lang['Search tags'] = 'Search tags';
 $lang['Search'] = 'Search';
 $lang['See available tags'] = 'See available tags';
-$lang['See pictures linked to this tag only'] = 'See pictures linked to this tag only';
 $lang['Send new password'] = 'Send new password';
 $lang['Since'] = 'Since';
 $lang['Sort by'] = 'Sort by';
@@ -135,8 +132,7 @@ $lang['Week %d'] = 'Week %d';
 $lang['about_page_title'] = 'About PhpWebGallery';
 $lang['access_forbiden'] = 'You are not authorized to access the requested page';
 $lang['add to caddie'] = 'add to caddie';
-$lang['add_favorites_alt'] = 'Add to favorites';
-$lang['add_favorites_hint'] = 'Add this picture to your favorites';
+$lang['add_favorites_hint'] = 'add this image to your favorites';
 $lang['admin'] = 'Administration';
 $lang['adviser_mode_enabled'] = 'Adviser mode enabled';
 $lang['all'] = 'all';
@@ -183,10 +179,8 @@ $lang['day'][3] = 'Wednesday';
 $lang['day'][4] = 'Thursday';
 $lang['day'][5] = 'Friday';
 $lang['day'][6] = 'Saturday';
-$lang['days'] = 'days';
 $lang['default_sort'] = 'Default';
-$lang['del_favorites_alt'] = 'Delete from favorites';
-$lang['del_favorites_hint'] = 'Delete this picture from your favorites';
+$lang['del_favorites_hint'] = 'delete this image from your favorites';
 $lang['delete'] = 'Delete';
 $lang['descending'] = 'descending';
 $lang['download'] = 'download';
@@ -210,10 +204,7 @@ $lang['hint_customize'] = 'customize the appareance of the gallery';
 $lang['hint_search'] = 'search';
 $lang['home'] = 'Home';
 $lang['home_hint'] = 'Back to the home page';
-$lang['ident_title'] = 'ident_title';
 $lang['identification'] = 'Identification';
-$lang['image_available'] = '%d image';
-$lang['images_available'] = '%d images';
 $lang['images_available_cpl'] = 'in this category';
 $lang['images_available_cat'] = 'in %d sub-category';
 $lang['images_available_cats'] = 'in %d sub-categories';
@@ -256,17 +247,16 @@ $lang['nbm_unknown_identifier'] = 'Unknown identifier';
 $lang['new_password'] = 'New password';
 $lang['new_rate'] = 'Rate this picture';
 $lang['next_page'] = 'Next';
-$lang['no'] = 'No';
+/* DEPRECATED TO REMOVE AFTER ALL TEMPLATE CHANGE USE 'No' */ $lang['no'] = 'no';
 $lang['no_category'] = 'Home';
 $lang['no_rate'] = 'no rate';
-$lang['note_filter_day'] = 'Only displays elements posted within the last %s day.';
-$lang['note_filter_days'] = 'Only displays elements posted within the last %s days.';
+$lang['note_filter_day'] = 'Only displays elements posted within the last %d day.';
+$lang['note_filter_days'] = 'Only displays elements posted within the last %d days.';
 $lang['password updated'] = 'password updated';
 $lang['periods_error'] = 'Recent period must be a positive integer value';
-$lang['picture'] = 'picture';
+/* DEPRECATED USED IN comments.php FOR image_id ? */ $lang['picture'] = 'picture';
 $lang['picture_high'] = 'Click on the picture to see it in high definition';
 $lang['picture_show_metadata'] = 'Show file metadata';
-$lang['pictures'] = 'pictures';
 $lang['powered_by'] = 'Powered by';
 $lang['preferences'] = 'Preferences';
 $lang['previous_page'] = 'Previous';
@@ -274,7 +264,6 @@ $lang['random_cat'] = 'Random pictures';
 $lang['random_cat_hint'] = 'displays a set of random pictures';
 $lang['recent_cats_cat'] = 'Recent categories';
 $lang['recent_cats_cat_hint'] = 'displays recently updated categories';
-$lang['recent_image'] = 'Images within the';
 $lang['recent_period'] = 'Recent period';
 $lang['recent_pics_cat'] = 'Recent pictures';
 $lang['recent_pics_cat_hint'] = 'displays most recent pictures';
@@ -291,7 +280,7 @@ $lang['register_title'] = 'Registration';
 $lang['remember_me'] = 'Auto login';
 $lang['remove this tag'] = 'remove this tag from the list';
 $lang['representative'] = 'representative';
-$lang['reset'] = 'Reset';
+/* DEPRECATED TO REMOVE AFTER ALL TEMPLATE CHANGE USE 'Reset' */ $lang['reset'] = 'reset';
 $lang['return to homepage'] = 'return to homepage';
 $lang['search'] = 'Search';
 $lang['search_author'] = 'Search for Author';
@@ -317,9 +306,9 @@ $lang['slideshow'] = 'slideshow';
 $lang['slideshow_stop'] = 'stop the slideshow';
 $lang['special_categories'] = 'Specials';
 $lang['sql_queries_in'] = 'SQL queries in';
-$lang['start_filter_hint'] = 'displays only recently posted elements';
-$lang['stop_filter_hint'] = 'return to the display of all elements';
-$lang['submit'] = 'Submit';
+$lang['start_filter_hint'] = 'displays only recently posted images';
+$lang['stop_filter_hint'] = 'return to the display of all images';
+/* DEPRECATED TO REMOVE AFTER ALL TEMPLATE CHANGE USE 'Submit' */ $lang['submit'] = 'submit';
 $lang['the beginning'] = 'the beginning';
 $lang['theme'] = 'Interface theme';
 $lang['thumbnails'] = 'Thumbnails';
@@ -327,7 +316,6 @@ $lang['title_comments'] = 'Users comments';
 $lang['title_menu'] = 'Menu';
 $lang['title_send_mail'] = 'A comment on your site';
 $lang['today'] = 'today';
-$lang['total'] = 'images';
 $lang['update_rate'] = 'Update your rating';
 $lang['update_wrong_dirname'] = 'wrong filename';
 $lang['upload_advise'] = 'Choose an image to place in the category : ';
@@ -338,7 +326,6 @@ $lang['upload_advise_thumbnail'] = 'Optional, but recommended : choose a thumbna
 $lang['upload_advise_width'] = 'the width of the picture must not exceed : ';
 $lang['upload_author'] = 'Author (eg "Pierrick LE GALL")';
 $lang['upload_cannot_upload'] = 'can\'t upload the picture on the server';
-$lang['upload_creation_date'] = 'Creation date (DD/MM/YYYY)';
 $lang['upload_err_username'] = 'the username must be given';
 $lang['upload_file_exists'] = 'A picture\'s name already used';
 $lang['upload_filenotfound'] = 'You must choose a picture fileformat for the image';
@@ -347,10 +334,8 @@ $lang['upload_name'] = 'Name of the picture';
 $lang['upload_picture'] = 'Upload a picture';
 $lang['upload_successful'] = 'Picture uploaded with success, an administrator will validate it as soon as possible';
 $lang['upload_title'] = 'Upload a picture';
-$lang['upload_username'] = 'Username';
 $lang['useful when password forgotten'] = 'useful when password forgotten';
-$lang['w_month'] = 'Month';
-$lang['yes'] = 'Yes';
+/* DEPRECATED TO REMOVE AFTER ALL TEMPLATE CHANGE USE 'Yes' */ $lang['yes'] = 'yes';
 $lang['page_end'] = 'Page bottom';
 $lang['qsearch'] = 'Quick search';
 $lang['Connected user: %s'] = 'Connected user: %s';
@@ -384,5 +369,13 @@ $lang['start_repeat'] = 'Repeat the slideshow';
 $lang['stop_repeat'] = 'Not repeat the slideshow';
 $lang['inc_period'] = 'Increase waiting between pictures';
 $lang['dec_period'] = 'Decrease waiting between pictures';
-
-?>
\ No newline at end of file
+$lang['Submit'] = 'Submit';
+$lang['Yes'] = 'Yes';
+$lang['No'] = 'No';
+$lang['%d element']='%d image';
+$lang['%d elements']='%d images';
+$lang['%d element are also linked to current tags'] = '%d image is also linked to current tags';
+$lang['%d elements are also linked to current tags'] = '%d images are also linked to current tags';
+$lang['See elements linked to this tag only'] = 'See images linked to this tag only';
+$lang['elements posted during the last %d days'] = 'images posted during the last %d days';
+?>