feature 2102 : rename item/image/picture to photo (admin side)

also remove duplicates/unused admin lang keys

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

13 files changed, 18 insertions, 18 deletions

diff --git a/admin/batch_manager_global.php b/admin/batch_manager_global.php
index 54b2a75a2..a6cc7ce90 100644
--- a/admin/batch_manager_global.php
+++ b/admin/batch_manager_global.php
@@ -89,7 +89,7 @@ if (isset($_POST['submit']))
   // photo in the selection
   if (count($collection) == 0)
   {
-    array_push($page['errors'], l10n('Select at least one picture'));
+    array_push($page['errors'], l10n('Select at least one photo'));
   }
 
   $action = $_POST['selectAction'];
diff --git a/admin/intro.php b/admin/intro.php
index ae1f227e9..4ad936211 100644
--- a/admin/intro.php
+++ b/admin/intro.php
@@ -232,7 +232,7 @@ SELECT MIN(date_available)
     array(
       'DB_DATE' =>
       sprintf(
-        l10n('first element added on %s'),
+        l10n('first photo added on %s'),
         format_date($first_date)
         )
       )
diff --git a/admin/notification_by_mail.php b/admin/notification_by_mail.php
index 4c7007d91..44f37d6b3 100644
--- a/admin/notification_by_mail.php
+++ b/admin/notification_by_mail.php
@@ -200,7 +200,7 @@ order by
         $query = 'delete from '.USER_MAIL_NOTIFICATION_TABLE.' where check_key in ('.implode(",", $quoted_check_key_list).');';
         $result = pwg_query($query);
 
-        redirect($base_url.get_query_string_diff(array(), false), l10n('Processing treatment.')."\n".l10n('Please wait...'));
+        redirect($base_url.get_query_string_diff(array(), false), l10n('Operation in progress')."\n".l10n('Please wait...'));
       }
     }
   }
diff --git a/admin/site_update.php b/admin/site_update.php
index abd239da8..1dfbad32c 100644
--- a/admin/site_update.php
+++ b/admin/site_update.php
@@ -476,7 +476,7 @@ SELECT id, path
         $insert_links
         );
 
-      // add new elements to caddie
+      // add new photos to caddie
       if (isset($_POST['add_to_caddie']) and $_POST['add_to_caddie'] == 1)
       {
         fill_caddie($caddiables);
diff --git a/admin/themes/default/template/batch_manager_unit.tpl b/admin/themes/default/template/batch_manager_unit.tpl
index 44ac226e5..6dd52a52d 100644
--- a/admin/themes/default/template/batch_manager_unit.tpl
+++ b/admin/themes/default/template/batch_manager_unit.tpl
@@ -33,7 +33,7 @@ jQuery(document).ready(function() {
 <form action="{$F_ACTION}" method="POST">
 <fieldset>
   <legend>{'Display options'|@translate}</legend>
-  <p>{'elements per page'|@translate} :
+  <p>{'photos per page'|@translate} :
       <a href="{$U_ELEMENTS_PAGE}&amp;display=5">5</a>
     | <a href="{$U_ELEMENTS_PAGE}&amp;display=10">10</a>
     | <a href="{$U_ELEMENTS_PAGE}&amp;display=50">50</a>
diff --git a/admin/themes/default/template/cat_modify.tpl b/admin/themes/default/template/cat_modify.tpl
index 6fe92a6f5..51118251c 100644
--- a/admin/themes/default/template/cat_modify.tpl
+++ b/admin/themes/default/template/cat_modify.tpl
@@ -14,7 +14,7 @@
   {/if}
   {if isset($U_MANAGE_ELEMENTS) }
   <li><a href="{$U_MANAGE_ELEMENTS}" title="{'manage album elements'|@translate}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/category_elements.png" class="button" alt="{'elements'|@translate}"></a></li>
-  <li><a href="{$U_MANAGE_RANKS}" title="{'manage image ranks'|@translate}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/ranks.png" class="button" alt="{'ranks'|@translate}"></a></li>
+  <li><a href="{$U_MANAGE_RANKS}" title="{'manage photo ranks'|@translate}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/ranks.png" class="button" alt="{'ranks'|@translate}"></a></li>
   {/if}
   <li><a href="{$U_CHILDREN}" title="{'manage sub-albums'|@translate}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/category_children.png" class="button" alt="{'sub-albums'|@translate}"></a></li>
   {if isset($U_MANAGE_PERMISSIONS) }
diff --git a/admin/themes/default/template/element_set_ranks.tpl b/admin/themes/default/template/element_set_ranks.tpl
index 4a32b09c5..576e5488a 100644
--- a/admin/themes/default/template/element_set_ranks.tpl
+++ b/admin/themes/default/template/element_set_ranks.tpl
@@ -16,7 +16,7 @@ jQuery(document).ready(function() {
 });
 {/literal}{/footer_script}
 
-<h2>{'Manage image ranks'|@translate}</h2>
+<h2>{'Manage photo ranks'|@translate}</h2>
 
 <h3>{$CATEGORIES_NAV}</h3>
 
diff --git a/admin/themes/default/template/intro.tpl b/admin/themes/default/template/intro.tpl
index 81d1d163f..242f73183 100644
--- a/admin/themes/default/template/intro.tpl
+++ b/admin/themes/default/template/intro.tpl
@@ -10,7 +10,7 @@ jQuery().ready(function(){ldelim}
 });
 {/footer_script}
 
-<h2>{'Piwigo administration'|@translate}</h2>
+<h2>{'Piwigo Administration'|@translate}</h2>
 <dl style="padding-top: 30px;">
   <dt>{'Piwigo version'|@translate}</dt>
   <dd>
diff --git a/admin/themes/default/template/notification_by_mail.tpl b/admin/themes/default/template/notification_by_mail.tpl
index 3cddc3936..3ffe30d4b 100644
--- a/admin/themes/default/template/notification_by_mail.tpl
+++ b/admin/themes/default/template/notification_by_mail.tpl
@@ -62,7 +62,7 @@ jQuery(document).ready(function(){
       </tr>
       <tr>
         <td>
-          <label>{'Include display of recent pictures group by dates'|@translate}</label>
+          <label>{'Include display of recent photos grouped by dates'|@translate}</label>
           <br><i><small>{'Available only with HTML format'|@translate}</small></i>
         </td>
         <td>
diff --git a/admin/themes/default/template/photos_add_direct.tpl b/admin/themes/default/template/photos_add_direct.tpl
index f14a385a2..4ea5899e4 100644
--- a/admin/themes/default/template/photos_add_direct.tpl
+++ b/admin/themes/default/template/photos_add_direct.tpl
@@ -271,7 +271,7 @@ var sizeLimit = {$upload_max_filesize};
 <div id="formErrors" class="errors" style="display:none">
   <ul>
     <li id="emptyCategoryName">{'The name of an album must not be empty'|@translate}</li>
-    <li id="noPhoto">{'Select at least one picture'|@translate}</li>
+    <li id="noPhoto">{'Select at least one photo'|@translate}</li>
   </ul>
   <div class="hideButton" style="text-align:center"><a href="#" id="hideErrors">{'Hide'|@translate}</a></div>
 </div>
diff --git a/admin/themes/default/template/picture_modify.tpl b/admin/themes/default/template/picture_modify.tpl
index 8f10fa04c..11e556df0 100644
--- a/admin/themes/default/template/picture_modify.tpl
+++ b/admin/themes/default/template/picture_modify.tpl
@@ -28,7 +28,7 @@ pwg_initialization_datepicker("#date_creation_day", "#date_creation_month", "#da
 
 <ul class="categoryActions">
   {if isset($U_JUMPTO) }
-  <li><a href="{$U_JUMPTO}" title="{'jump to image'|@translate}"><img src="{$themeconf.admin_icon_dir}/category_jump-to.png" class="button" alt="{'jump to image'|@translate}"></a></li>
+  <li><a href="{$U_JUMPTO}" title="{'jump to photo'|@translate}"><img src="{$themeconf.admin_icon_dir}/category_jump-to.png" class="button" alt="{'jump to photo'|@translate}"></a></li>
   {/if}
   {if !url_is_remote($PATH)}
   <li><a href="{$U_SYNC}" title="{'synchronize'|@translate}"><img src="{$themeconf.admin_icon_dir}/sync_metadata.png" class="button" alt="{'synchronize'|@translate}"></a></li>
diff --git a/admin/themes/default/template/rating.tpl b/admin/themes/default/template/rating.tpl
index 7a2551e82..0c001437a 100644
--- a/admin/themes/default/template/rating.tpl
+++ b/admin/themes/default/template/rating.tpl
@@ -1,4 +1,4 @@
-<h2>{'elements'|@translate} [{$NB_ELEMENTS} {'elements'|@translate}]</h2>
+<h2>{$NB_ELEMENTS} {'Photos'|@translate}</h2>
 
 <form action="{$F_ACTION}" method="GET" id="update" class="filter">
   <fieldset>
diff --git a/admin/themes/default/template/site_update.tpl b/admin/themes/default/template/site_update.tpl
index ec0f50dbf..336071cae 100644
--- a/admin/themes/default/template/site_update.tpl
+++ b/admin/themes/default/template/site_update.tpl
@@ -9,10 +9,10 @@
 <h3>{$L_RESULT_UPDATE}</h3>
 <ul>
   <li class="update_summary_new">{$update_result.NB_NEW_CATEGORIES} {'albums added in the database'|@translate}</li>
-  <li class="update_summary_new">{$update_result.NB_NEW_ELEMENTS} {'elements added in the database'|@translate}</li>
+  <li class="update_summary_new">{$update_result.NB_NEW_ELEMENTS} {'photos added in the database'|@translate}</li>
   <li class="update_summary_del">{$update_result.NB_DEL_CATEGORIES} {'albums deleted in the database'|@translate}</li>
-  <li class="update_summary_del">{$update_result.NB_DEL_ELEMENTS} {'elements deleted in the database'|@translate}</li>
-  <li>{$update_result.NB_UPD_ELEMENTS} {'elements updated in the database'|@translate}</li>
+  <li class="update_summary_del">{$update_result.NB_DEL_ELEMENTS} {'photos deleted from the database'|@translate}</li>
+  <li>{$update_result.NB_UPD_ELEMENTS} {'photos updated in the database'|@translate}</li>
   <li class="update_summary_err">{$update_result.NB_ERRORS} {'errors during synchronization'|@translate}</li>
 </ul>
 {/if}
@@ -67,8 +67,8 @@
 
 			<li><label><input type="radio" name="sync" value="files" {if 'files'==$introduction.sync}checked="checked"{/if}> {'directories + files'|@translate}</label>
 				<ul style="padding-left:3em">
-					<li><label><input type="checkbox" name="display_info" value="1" {if $introduction.display_info}checked="checked"{/if}> {'display maximum informations (added albums and elements, deleted albums and elements)'|@translate}</label></li>
-					<li><label><input type="checkbox" name="add_to_caddie" value="1" {if $introduction.add_to_caddie}checked="checked"{/if}> {'add new elements to caddie'|@translate}</label></li>
+					<li><label><input type="checkbox" name="display_info" value="1" {if $introduction.display_info}checked="checked"{/if}> {'display maximum informations (added albums and photos, deleted albums and photos)'|@translate}</label></li>
+					<li><label><input type="checkbox" name="add_to_caddie" value="1" {if $introduction.add_to_caddie}checked="checked"{/if}> {'add new photos to caddie'|@translate}</label></li>
 					<li><label>{'Who can see these photos?'|@translate} <select name="privacy_level">{html_options options=$introduction.privacy_level_options selected=$introduction.privacy_level_selected}</select></label></li>
 				</ul>
 			</li>
@@ -80,7 +80,7 @@
 		<label><input type="checkbox" name="sync_meta" {if $introduction.sync_meta}checked="checked"{/if}> {'synchronize metadata'|@translate} ({$METADATA_LIST})</label>
 		<ul style="padding-left:3em">
 	  		<li>
-	  			<label><input type="checkbox" name="meta_all" {if $introduction.meta_all}checked="checked"{/if}> {'even already synchronized elements'|@translate}</label>
+	  			<label><input type="checkbox" name="meta_all" {if $introduction.meta_all}checked="checked"{/if}> {'even already synchronized photos'|@translate}</label>
 	  		</li>
 	  		<li>
 	  			<label><input type="checkbox" name="meta_empty_overrides" {if $introduction.meta_empty_overrides}checked="checked"{/if}> {'overrides existing values with empty ones'|@translate}</label>