aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--admin/intro.php4
-rw-r--r--admin/themes/default/template/footer.tpl2
-rw-r--r--admin/themes/default/template/plugins_list.tpl2
-rw-r--r--admin/themes/default/template/site_manager.tpl2
-rw-r--r--include/functions_category.inc.php2
-rw-r--r--include/functions_html.inc.php6
-rw-r--r--themes/default/template/comment_list.tpl6
-rw-r--r--themes/default/template/footer.tpl2
-rw-r--r--themes/default/template/menubar_categories.tpl2
-rw-r--r--themes/default/template/menubar_menu.tpl2
-rw-r--r--themes/default/template/menubar_tags.tpl2
-rw-r--r--themes/default/template/month_calendar.tpl4
-rw-r--r--themes/default/template/picture.tpl8
-rw-r--r--themes/default/template/search.tpl2
-rw-r--r--themes/default/template/tags.tpl2
15 files changed, 24 insertions, 24 deletions
diff --git a/admin/intro.php b/admin/intro.php
index 137efe95b..231a86f05 100644
--- a/admin/intro.php
+++ b/admin/intro.php
@@ -198,9 +198,9 @@ $template->assign(
'PHP_VERSION' => phpversion(),
'DB_ENGINE' => $conf['dblayer'],
'DB_VERSION' => $db_version,
- 'DB_ELEMENTS' => l10n_dec('%d element', '%d elements', $nb_elements),
+ 'DB_ELEMENTS' => l10n_dec('%d image', '%d images', $nb_elements),
'DB_CATEGORIES' =>
- l10n_dec('%d category including ', '%d categories including ',
+ l10n_dec('%d category including', '%d categories including',
$nb_categories).
l10n_dec('%d physical', '%d physical',
$nb_physical).
diff --git a/admin/themes/default/template/footer.tpl b/admin/themes/default/template/footer.tpl
index f7c83474e..66b0f736e 100644
--- a/admin/themes/default/template/footer.tpl
+++ b/admin/themes/default/template/footer.tpl
@@ -36,7 +36,7 @@
{'Contact'|@translate}
- <a href="mailto:{$CONTACT_MAIL}?subject={'title_send_mail'|@translate|@escape:url}">{'Webmaster'|@translate}</a>
+ <a href="mailto:{$CONTACT_MAIL}?subject={'A comment on your site'|@translate|@escape:url}">{'Webmaster'|@translate}</a>
</div> <!-- pageInfos -->
</div> <!-- footer -->
diff --git a/admin/themes/default/template/plugins_list.tpl b/admin/themes/default/template/plugins_list.tpl
index 8743d6b6d..74672fadc 100644
--- a/admin/themes/default/template/plugins_list.tpl
+++ b/admin/themes/default/template/plugins_list.tpl
@@ -69,7 +69,7 @@
</a>
</li>
<li>
- <a href="{$plugin.U_ACTION}&amp;action=delete" onclick="return confirm('{'plugins_confirm_delete'|@translate|@escape:'javascript'}');">
+ <a href="{$plugin.U_ACTION}&amp;action=delete" onclick="return confirm('{'Are you sure you want to delete this plugin?'|@translate|@escape:'javascript'}');">
<img src="{$themeconf.admin_icon_dir}/plug_delete.png" alt="{'Delete'|@translate}" title="{'Delete'|@translate}">
</a>
</li>
diff --git a/admin/themes/default/template/site_manager.tpl b/admin/themes/default/template/site_manager.tpl
index 678f177fb..91d888ac0 100644
--- a/admin/themes/default/template/site_manager.tpl
+++ b/admin/themes/default/template/site_manager.tpl
@@ -38,7 +38,7 @@
</tr>
{foreach from=$sites item=site name=site}
<tr style="text-align:left" class="{if $smarty.foreach.site.index is odd}row1{else}row2{/if}"><td>
- <a href="{$site.NAME}">{$site.NAME}</a><br>({$site.TYPE}, {$site.CATEGORIES} {'Categories'|@translate}, {$pwg->l10n_dec('%d element','%d elements',$site.IMAGES)})
+ <a href="{$site.NAME}">{$site.NAME}</a><br>({$site.TYPE}, {$site.CATEGORIES} {'Categories'|@translate}, {$pwg->l10n_dec('%d image','%d images',$site.IMAGES)})
</td><td>
[<a href="{$site.U_SYNCHRONIZE}" title="{'synchronize'|@translate}">{'synchronize'|@translate}</a>]
{if isset($site.U_DELETE)}
diff --git a/include/functions_category.inc.php b/include/functions_category.inc.php
index 1aa62ac25..4ce30a75a 100644
--- a/include/functions_category.inc.php
+++ b/include/functions_category.inc.php
@@ -472,7 +472,7 @@ function get_display_images_count($cat_nb_images, $cat_count_images, $cat_count_
}
//at least one image direct or indirect
- $display_text.= l10n_dec('%d element', '%d elements', $cat_count_images);
+ $display_text.= l10n_dec('%d image', '%d images', $cat_count_images);
if ($cat_count_categories == 0 or $cat_nb_images == $cat_count_images)
{
diff --git a/include/functions_html.inc.php b/include/functions_html.inc.php
index 70ffe48a5..5d07286c4 100644
--- a/include/functions_html.inc.php
+++ b/include/functions_html.inc.php
@@ -512,9 +512,9 @@ function register_default_menubar_blocks( $menu_ref_arr )
$menu->register_block( new RegisteredBlock( 'mbLinks', 'Links', 'piwigo'));
$menu->register_block( new RegisteredBlock( 'mbCategories', 'Categories', 'piwigo'));
$menu->register_block( new RegisteredBlock( 'mbTags', 'Related tags', 'piwigo'));
- $menu->register_block( new RegisteredBlock( 'mbSpecials', 'special_categories', 'piwigo'));
- $menu->register_block( new RegisteredBlock( 'mbMenu', 'title_menu', 'piwigo'));
- $menu->register_block( new RegisteredBlock( 'mbIdentification', 'identification', 'piwigo') );
+ $menu->register_block( new RegisteredBlock( 'mbSpecials', 'Specials', 'piwigo'));
+ $menu->register_block( new RegisteredBlock( 'mbMenu', 'Menu', 'piwigo'));
+ $menu->register_block( new RegisteredBlock( 'mbIdentification', 'Identification', 'piwigo') );
}
?> \ No newline at end of file
diff --git a/themes/default/template/comment_list.tpl b/themes/default/template/comment_list.tpl
index f431a1cd5..87da2158d 100644
--- a/themes/default/template/comment_list.tpl
+++ b/themes/default/template/comment_list.tpl
@@ -22,7 +22,7 @@
{/if}
{if isset($comment.U_EDIT) and !isset($comment.IN_EDIT)}
<li>
- <a class="editComment" href="{$comment.U_EDIT}#edit_comment" title="{'edit this comment'|@translate}">
+ <a class="editComment" href="{$comment.U_EDIT}#edit_comment" title="edit this comment">
<img src="{$ROOT_URL}{$themeconf.icon_dir}/edit.png" class="button" alt="[edit]">
</a>
</li>
@@ -41,8 +41,8 @@
<a name="edit_comment"></a>
<form method="post" action="{$comment.U_EDIT}" class="filter" id="editComment">
<fieldset>
- <legend>{'Edit a comment'|@translate}</legend>
- <label>{'Comment'|@translate}<textarea name="content" id="contenteditid" rows="5" cols="80">{$Comment.CONTENT|@escape}</textarea></label>
+ <legend>Edit a comment</legend>
+ <label>{'Comment'|@translate}<textarea name="content" id="contenteditid" rows="5" cols="80">{$comment.CONTENT|@escape}</textarea></label>
<input type="hidden" name="key" value="{$comment.KEY}">
<input type="hidden" name="image_id" value="{$comment.IMAGE_ID|@default:$current.id}">
<input class="submit" type="submit" value="{'Submit'|@translate}">
diff --git a/themes/default/template/footer.tpl b/themes/default/template/footer.tpl
index 89c034965..e2f3a76bd 100644
--- a/themes/default/template/footer.tpl
+++ b/themes/default/template/footer.tpl
@@ -15,7 +15,7 @@
{$VERSION}
{if isset($CONTACT_MAIL)}
- {'Contact'|@translate}
- <a href="mailto:{$CONTACT_MAIL}?subject={'title_send_mail'|@translate|@escape:url}">{'Webmaster'|@translate}</a>
+ <a href="mailto:{$CONTACT_MAIL}?subject={'A comment on your site'|@translate|@escape:url}">{'Webmaster'|@translate}</a>
{/if}
diff --git a/themes/default/template/menubar_categories.tpl b/themes/default/template/menubar_categories.tpl
index 02a9b6668..5f189bcd1 100644
--- a/themes/default/template/menubar_categories.tpl
+++ b/themes/default/template/menubar_categories.tpl
@@ -35,5 +35,5 @@
</li>
</ul>
{/if}
- <p class="totalImages">{$pwg->l10n_dec('%d element', '%d elements', $block->data.NB_PICTURE)}</p>
+ <p class="totalImages">{$pwg->l10n_dec('%d image', '%d images', $block->data.NB_PICTURE)}</p>
</dd>
diff --git a/themes/default/template/menubar_menu.tpl b/themes/default/template/menubar_menu.tpl
index 0d6541b97..3905922e4 100644
--- a/themes/default/template/menubar_menu.tpl
+++ b/themes/default/template/menubar_menu.tpl
@@ -6,7 +6,7 @@
<input type="text" name="q" id="qsearchInput" onfocus="if (value==qsearch_prompt) value='';" onblur="if (value=='') value=qsearch_prompt;" style="width:90%">
</p>
</form>
- <script type="text/javascript">var qsearch_prompt="{'qsearch'|@translate|@escape:'javascript'}"; document.getElementById('qsearchInput').value=qsearch_prompt;</script>
+ <script type="text/javascript">var qsearch_prompt="{'Quick search'|@translate|@escape:'javascript'}"; document.getElementById('qsearchInput').value=qsearch_prompt;</script>
{/if}
<ul>
diff --git a/themes/default/template/menubar_tags.tpl b/themes/default/template/menubar_tags.tpl
index 220175008..ad7177347 100644
--- a/themes/default/template/menubar_tags.tpl
+++ b/themes/default/template/menubar_tags.tpl
@@ -5,7 +5,7 @@
<span>
{if !empty($tag.U_ADD) }
<a href="{$tag.U_ADD}"
- title="{$pwg->l10n_dec('%d element are also linked to current tags', '%d elements are also linked to current tags', $tag.counter)}"
+ title="{$pwg->l10n_dec('%d image is also linked to current tags', '%d images are also linked to current tags', $tag.counter)}"
rel="nofollow">
<img src="{$ROOT_URL}{$themeconf.icon_dir}/add_tag.png" alt="+">
</a>
diff --git a/themes/default/template/month_calendar.tpl b/themes/default/template/month_calendar.tpl
index 45d6079e1..85415f459 100644
--- a/themes/default/template/month_calendar.tpl
+++ b/themes/default/template/month_calendar.tpl
@@ -12,7 +12,7 @@
&nbsp;
{else}
{foreach from=$bar.items item=item}
- <span class="calItem{if !isset($item.URL)}Empty{/if}" {if isset($item.NB_IMAGES)}title="{$pwg->l10n_dec('%d element', '%d elements', $item.NB_IMAGES)}"{/if}>
+ <span class="calItem{if !isset($item.URL)}Empty{/if}" {if isset($item.NB_IMAGES)}title="{$pwg->l10n_dec('%d image', '%d images', $item.NB_IMAGES)}"{/if}>
{if isset($item.URL)}
<a href="{$item.URL}">{$item.LABEL}</a>
{else}
@@ -68,7 +68,7 @@ TABLE.calMonth TBODY TD, TABLE.calMonth TBODY TD DIV.calImg {ldelim}
<div class="calBackDate">{$day.DAY}</div><div class="calForeDate">{$day.DAY}</div>
<div class="calImg">
<a href="{$day.U_IMG_LINK}">
- <img style="{$day.IMAGE_STYLE}" src="{$day.IMAGE}" alt="{$day.IMAGE_ALT}" title="{$pwg->l10n_dec('%d element','%d elements', $day.NB_ELEMENTS)}">
+ <img style="{$day.IMAGE_STYLE}" src="{$day.IMAGE}" alt="{$day.IMAGE_ALT}" title="{$pwg->l10n_dec('%d image','%d images', $day.NB_ELEMENTS)}">
</a>
</div>
{else}
diff --git a/themes/default/template/picture.tpl b/themes/default/template/picture.tpl
index 885d31112..54d3b538b 100644
--- a/themes/default/template/picture.tpl
+++ b/themes/default/template/picture.tpl
@@ -109,7 +109,7 @@ y.callService(
</a>
{/if}
-<table id="standard" class="infoTable" summary="{'Some info about this picture'|@translate}">
+<table id="standard" class="infoTable" summary="Some info about this picture">
<tr id="Author">
<td class="label">{'Author'|@translate}</td>
<td class="value">{if isset($INFO_AUTHOR)}{$INFO_AUTHOR}{else}{'N/A'|@translate}{/if}</td>
@@ -177,7 +177,7 @@ y.callService(
{if isset($rating)}
<tr id="rating">
<td class="label">
- <span id="updateRate">{if isset($rating.USER_RATE)}{'Rate this picture'|@translate}{else}{'Rate this picture'|@translate}{/if}</span>
+ <span id="updateRate">{if isset($rating.USER_RATE)}{'Update your rating'|@translate}{else}{'Rate this picture'|@translate}{/if}</span>
</td>
<td class="value">
<form action="{$rating.F_ACTION}" method="post" id="rateForm" style="margin:0;">
@@ -193,7 +193,7 @@ y.callService(
<script type="text/javascript" src="{$ROOT_URL}themes/default/js/rating.js"></script>
<script type="text/javascript">
makeNiceRatingForm( {ldelim}rootUrl: '{$ROOT_URL|@escape:"javascript"}', image_id: {$current.id},
- updateRateText: "{'update_rate'|@translate|@escape:'javascript'}", updateRateElement: document.getElementById("updateRate"),
+ updateRateText: "{'Update your rating'|@translate|@escape:'javascript'}", updateRateElement: document.getElementById("updateRate"),
ratingSummaryText: "{'%.2f (rated %d times, standard deviation = %.2f)'|@translate|@escape:'javascript'}", ratingSummaryElement: document.getElementById("ratingSummary") {rdelim} );
</script>
</div>
@@ -268,7 +268,7 @@ y.callService(
{if $comment_add.SHOW_AUTHOR}
<label>{'Author'|@translate}<input type="text" name="author"></label>
{/if}
- <label>{'Comment'|@translate}<textarea name="content" id="contentid" rows="5" cols="80">{$Comment_add.CONTENT}</textarea></label>
+ <label>{'Comment'|@translate}<textarea name="content" id="contentid" rows="5" cols="80">{$comment_add.CONTENT}</textarea></label>
<input type="hidden" name="key" value="{$comment_add.KEY}">
<input class="submit" type="submit" value="{'Submit'|@translate}">
</fieldset>
diff --git a/themes/default/template/search.tpl b/themes/default/template/search.tpl
index 390e5f0aa..133d5be1f 100644
--- a/themes/default/template/search.tpl
+++ b/themes/default/template/search.tpl
@@ -45,7 +45,7 @@
</label>
<ul>
<li><label>
- <input type="radio" name="mode" value="AND" checked="checked">{'Search for all terms '|@translate}
+ <input type="radio" name="mode" value="AND" checked="checked">{'Search for all terms'|@translate}
</label></li>
<li><label>
<input type="radio" name="mode" value="OR">{'Search for any terms'|@translate}
diff --git a/themes/default/template/tags.tpl b/themes/default/template/tags.tpl
index 417c374a6..4f5cd0c6d 100644
--- a/themes/default/template/tags.tpl
+++ b/themes/default/template/tags.tpl
@@ -35,7 +35,7 @@
{foreach from=$letter.tags item=tag}
<tr class="tagLine">
<td><a href="{$tag.URL}">{$tag.name}</a></td>
- <td class="nbEntries">{$pwg->l10n_dec('%d element', '%d elements', $tag.counter)}</td>
+ <td class="nbEntries">{$pwg->l10n_dec('%d image', '%d images', $tag.counter)}</td>
</tr>
{/foreach}
</table>