From 7ca4f8e06004740e3dc0c331629daeccc868defe Mon Sep 17 00:00:00 2001
From: plegall <plg@piwigo.org>
Date: Mon, 17 Jan 2011 23:53:47 +0000
Subject: feature 2102: add a few language keys to remove all
 image/picture/element and replace by photo

git-svn-id: http://piwigo.org/svn/trunk@8727 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 admin/batch_manager_unit.php                  | 2 +-
 admin/cat_modify.php                          | 4 ++--
 admin/picture_modify.php                      | 2 +-
 admin/themes/default/template/cat_list.tpl    | 2 +-
 admin/themes/default/template/cat_modify.tpl  | 4 ++--
 admin/themes/default/template/site_update.tpl | 4 ++--
 admin/themes/default/template/thumbnail.tpl   | 4 ++--
 admin/thumbnail.php                           | 4 ++--
 8 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'admin')

diff --git a/admin/batch_manager_unit.php b/admin/batch_manager_unit.php
index d0bb2f182..be107f689 100644
--- a/admin/batch_manager_unit.php
+++ b/admin/batch_manager_unit.php
@@ -122,7 +122,7 @@ SELECT id, date_creation
     $datas
     );
 
-  array_push($page['infos'], l10n('Picture informations updated'));
+  array_push($page['infos'], l10n('Photo informations updated'));
 }
 
 // +-----------------------------------------------------------------------+
diff --git a/admin/cat_modify.php b/admin/cat_modify.php
index 4c0504428..adce08bd2 100644
--- a/admin/cat_modify.php
+++ b/admin/cat_modify.php
@@ -152,7 +152,7 @@ elseif (isset($_POST['submitAdd']))
     array_push(
       $page['infos'],
       sprintf(
-        l10n('Album elements associated to the following albums: %s'),
+        l10n('Album photos associated to the following albums: %s'),
         '<ul><li>'
         .get_cat_display_name_from_id($output_create['id'])
         .'</li></ul>'
@@ -181,7 +181,7 @@ elseif (isset($_POST['submitDestinations'])
   array_push(
     $page['infos'],
     sprintf(
-      l10n('Album elements associated to the following albums: %s'),
+      l10n('Album photos associated to the following albums: %s'),
       '<ul><li>'.implode('</li><li>', $category_names).'</li></ul>'
       )
     );
diff --git a/admin/picture_modify.php b/admin/picture_modify.php
index db776c6d3..b14f419d5 100644
--- a/admin/picture_modify.php
+++ b/admin/picture_modify.php
@@ -118,7 +118,7 @@ if (isset($_POST['submit']) and count($page['errors']) == 0)
   }
   set_tags($tag_ids, $_GET['image_id']);
 
-  array_push($page['infos'], l10n('Picture informations updated'));
+  array_push($page['infos'], l10n('Photo informations updated'));
 }
 // associate the element to other categories than its storage category
 if (isset($_POST['associate'])
diff --git a/admin/themes/default/template/cat_list.tpl b/admin/themes/default/template/cat_list.tpl
index 1a41344cd..0990258e5 100644
--- a/admin/themes/default/template/cat_list.tpl
+++ b/admin/themes/default/template/cat_list.tpl
@@ -70,7 +70,7 @@ jQuery(document).ready(function(){ldelim}
         {/if}
         <li><a href="{$category.U_EDIT}" title="{'edit album'|@translate}"><img src="{$themeconf.admin_icon_dir}/category_edit.png" class="button" alt="{'edit'|@translate}"></a></li>
         {if isset($category.U_MANAGE_ELEMENTS) }
-        <li><a href="{$category.U_MANAGE_ELEMENTS}" title="{'manage album elements'|@translate}"><img src="{$themeconf.admin_icon_dir}/category_elements.png" class="button" alt="{'elements'|@translate}"></a></li>
+        <li><a href="{$category.U_MANAGE_ELEMENTS}" title="{'manage album photos'|@translate}"><img src="{$themeconf.admin_icon_dir}/category_elements.png" class="button" alt="{'Photos'|@translate}"></a></li>
         {/if}
         <li><a href="{$category.U_CHILDREN}" title="{'manage sub-albums'|@translate}"><img src="{$themeconf.admin_icon_dir}/category_children.png" class="button" alt="{'sub-albums'|@translate}"></a></li>
         {if isset($category.U_MANAGE_PERMISSIONS) }
diff --git a/admin/themes/default/template/cat_modify.tpl b/admin/themes/default/template/cat_modify.tpl
index dbc3f4380..4c6ebe7fb 100644
--- a/admin/themes/default/template/cat_modify.tpl
+++ b/admin/themes/default/template/cat_modify.tpl
@@ -13,7 +13,7 @@
   <li><a href="{$U_JUMPTO}" title="{'jump to album'|@translate}"><img src="{$themeconf.admin_icon_dir}/category_jump-to.png" class="button" alt="{'jump to album'|@translate}"></a></li>
   {/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_ELEMENTS}" title="{'manage album photos'|@translate}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/category_elements.png" class="button" alt="{'Photos'|@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>
@@ -122,7 +122,7 @@
         {if isset($representant.picture) }
         <a href="{$representant.picture.URL}"><img src="{$representant.picture.SRC}" alt="" class="miniature"></a>
         {else}
-        <img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/category_representant_random.png" class="button" alt="{'Random picture'|@translate}" class="miniature">
+        <img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/category_representant_random.png" class="button" alt="{'Random photo'|@translate}" class="miniature">
         {/if}
       </td>
       <td>
diff --git a/admin/themes/default/template/site_update.tpl b/admin/themes/default/template/site_update.tpl
index a4ee630d5..d8826f127 100644
--- a/admin/themes/default/template/site_update.tpl
+++ b/admin/themes/default/template/site_update.tpl
@@ -20,7 +20,7 @@
 {if isset($metadata_result)}
 <h3>{$L_RESULT_METADATA}</h3>
 <ul>
-  <li>{$metadata_result.NB_ELEMENTS_DONE} {'elements informations synchronized with files metadata'|@translate}</li>
+  <li>{$metadata_result.NB_ELEMENTS_DONE} {'photos informations synchronized with files metadata'|@translate}</li>
   <li>{$metadata_result.NB_ELEMENTS_CANDIDATES} {'photos candidates for metadata synchronization'|@translate}</li>
   <li>{'Used metadata'|@translate} : {$METADATA_LIST}</li>
 </ul>
@@ -76,7 +76,7 @@
 	</fieldset>
 
 	<fieldset id="syncMetadata">
-		<legend>{'synchronize files metadata with database elements informations'|@translate}</legend>
+		<legend>{'synchronize files metadata with database photos informations'|@translate}</legend>
 		<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>
diff --git a/admin/themes/default/template/thumbnail.tpl b/admin/themes/default/template/thumbnail.tpl
index a01585df9..1981671ed 100644
--- a/admin/themes/default/template/thumbnail.tpl
+++ b/admin/themes/default/template/thumbnail.tpl
@@ -28,7 +28,7 @@
     <td colspan="2">{'General statistics'|@translate}</td>
   </tr>
   <tr>
-    <td>{'number of miniaturized pictures'|@translate}</td>
+    <td>{'number of miniaturized photos'|@translate}</td>
     <td style="text-align:center;">{$results.TN_NB}</td>
   </tr>
   <tr>
@@ -97,7 +97,7 @@
 {/if} {*isset params*}
 
 {if !empty($remainings) }
-<div class="admin">{$TOTAL_NB_REMAINING} {'pictures without thumbnail (jpeg and png only)'|@translate}</div>
+<div class="admin">{$TOTAL_NB_REMAINING} {'photos without thumbnail (jpeg and png only)'|@translate}</div>
 <table style="width:100%;">
   <tr class="throw">
     <td>&nbsp;</td>
diff --git a/admin/thumbnail.php b/admin/thumbnail.php
index 87223ca00..cb876175b 100644
--- a/admin/thumbnail.php
+++ b/admin/thumbnail.php
@@ -142,8 +142,8 @@ function RatioResizeImg($info, $path, $newWidth, $newHeight, $tn_ext)
   // error
   else
   {
-    echo l10n('Picture unreachable or no support')." ";
-    if ( isset( $extenstion ) )
+    echo l10n('Photo unreachable or no support')." ";
+    if ( isset( $extension ) )
     {
       echo l10n('for the file format').' '.$extension;
     }
-- 
cgit v1.2.3