Pictures > Waiting > Pictures

- Please, center column titles (category, Date,    file, thumbnail, Author)
- Caps are missing : Category, File, Thumbnail

and Pictures > Waiting > Comments
    *  Reject * Validate aligned

and Pictures > Thumbnails
- Caps are missing : path, filesize

Translators: (Only English and French are updated)

merge -c2943 from branch 2.0 to trunk


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

6 files changed, 16 insertions, 15 deletions

diff --git a/admin/template/goto/comments.tpl b/admin/template/goto/comments.tpl
index 5ceef17b1..d27b21a7d 100644
--- a/admin/template/goto/comments.tpl
+++ b/admin/template/goto/comments.tpl
@@ -13,11 +13,11 @@
     <a class="illustration" href="{$comment.U_PICTURE}"><img src="{$comment.TN_SRC}" /></a>
     <p class="commentHeader"><strong>{$comment.AUTHOR}</strong> - <em>{$comment.DATE}</em></p>
     <blockquote>{$comment.CONTENT}</blockquote>
+  </div>
     <ul class="actions">
       <li><label><input type="radio" name="action-{$comment.ID}" value="reject" />{'Reject'|@translate}</label></li>
       <li><label><input type="radio" name="action-{$comment.ID}" value="validate" />{'Validate'|@translate}</label></li>
     </ul>
-  </div>
   {/foreach}
 
   <p class="bottomButtons">
diff --git a/admin/template/goto/theme/roma/theme.css b/admin/template/goto/theme/roma/theme.css
index 1ddd415bc..e03621e98 100644
--- a/admin/template/goto/theme/roma/theme.css
+++ b/admin/template/goto/theme/roma/theme.css
@@ -77,6 +77,7 @@ a.Piwigo {
 a { color:#f70; border-width: 0; }
 a:hover, a:active { color: #f33; border-bottom: 1px solid #f33; cursor: pointer; }
 .content .navigationBar {color:#666;}
+ul.actions, .content form#waiting  {text-align:center;}
 h2 { display:block; font-size:28px; letter-spacing:-1px; 
 margin:0 20px; height:104px; overflow:hidden; padding:0; position:absolute; 
 right:0; text-align:right; top:0; width:770px; }
diff --git a/admin/template/goto/thumbnail.tpl b/admin/template/goto/thumbnail.tpl
index fff7b3dff..d753e0175 100644
--- a/admin/template/goto/thumbnail.tpl
+++ b/admin/template/goto/thumbnail.tpl
@@ -7,7 +7,7 @@
 <div class="admin">{'tn_results_title'|@translate}</div>
 <table style="width:100%;">
   <tr class="throw">
-    <td>{'path'|@translate}</td>
+    <td>{'Path'|@translate}</td>
     <td>{'thumbnail'|@translate}</td>
     <td>{'tn_results_gen_time'|@translate}</td>
     <td>{'filesize'|@translate}</td>
@@ -102,7 +102,7 @@
 <table style="width:100%;">
   <tr class="throw">
     <td>&nbsp;</td>
-    <td style="width:60%;">{'path'|@translate}</td>
+    <td style="width:60%;">{'Path'|@translate}</td>
     <td>{'filesize'|@translate}</td>
     <td>{'Dimensions'|@translate}</td>
   </tr>
diff --git a/admin/template/goto/upload.tpl b/admin/template/goto/upload.tpl
index 986a2cf93..098a92fe3 100644
--- a/admin/template/goto/upload.tpl
+++ b/admin/template/goto/upload.tpl
@@ -8,12 +8,12 @@
 <form action="{$F_ACTION}" method="post" id="waiting">
   <table style="width:99%;" >
     <tr class="throw">
-      <th style="width:20%;">{'category'|@translate}</th>
-      <th style="width:20%;">{'Date'|@translate}</th>
-      <th style="width:20%;">{'file'|@translate}</th>
-      <th style="width:20%;">{'thumbnail'|@translate}</th>
-      <th style="width:20%;">{'Author'|@translate}</th>
-      <th style="width:1px;">&nbsp;</th>
+      <td style="width:20%;">{'category'|@translate}</td>
+      <td style="width:20%;">{'Date'|@translate}</td>
+      <td style="width:20%;">{'file'|@translate}</td>
+      <td style="width:20%;">{'thumbnail'|@translate}</td>
+      <td style="width:20%;">{'Author'|@translate}</td>
+      <td style="width:1px;">&nbsp;</td>
     </tr>
     
     {if not empty($pictures) }
diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php
index 572dbbc77..9220af02f 100644
--- a/language/en_UK/admin.lang.php
+++ b/language/en_UK/admin.lang.php
@@ -232,8 +232,8 @@ $lang['editcat_uploadable'] = 'Authorize upload';
 $lang['elements per page'] = 'elements per page';
 $lang['elements'] = 'elements';
 $lang['enabled_high'] = 'High definition enabled';
-$lang['file'] = 'file';
-$lang['filesize'] = 'filesize';
+$lang['file'] = 'File';
+$lang['filesize'] = 'Filesize';
 $lang['first element added on %s'] = 'first element added on %s';
 $lang['forbidden'] = 'Forbidden';
 $lang['conf_general'] = 'General';
@@ -376,7 +376,7 @@ $lang['sub-categories'] = 'sub-categories';
 $lang['synchronize metadata'] = 'synchronize metadata';
 $lang['synchronize'] = 'synchronize';
 $lang['target'] = 'target';
-$lang['thumbnail'] = 'thumbnail';
+$lang['thumbnail'] = 'Thumbnail';
 $lang['title'] = 'title';
 $lang['title_categories'] = 'Categories management';
 $lang['title_configuration'] = 'Piwigo configuration';
diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php
index 28ec9c7bb..7a0dd2b93 100644
--- a/language/fr_FR/admin.lang.php
+++ b/language/fr_FR/admin.lang.php
@@ -232,8 +232,8 @@ $lang['editcat_uploadable'] = 'Autoriser l\'ajout d\'images';
 $lang['elements per page'] = 'éléments par page';
 $lang['elements'] = 'éléments';
 $lang['enabled_high'] = 'Haute définition actif';
-$lang['file'] = 'fichier';
-$lang['filesize'] = 'poids';
+$lang['file'] = 'Fichier';
+$lang['filesize'] = 'Poids';
 $lang['first element added on %s'] = 'premier élément ajouté le %s';
 $lang['forbidden'] = 'Interdit';
 $lang['conf_general'] = 'Générale';
@@ -376,7 +376,7 @@ $lang['sub-categories'] = 'sous-catégories';
 $lang['synchronize metadata'] = 'synchroniser les méta-données';
 $lang['synchronize'] = 'synchroniser';
 $lang['target'] = 'cible';
-$lang['thumbnail'] = 'miniature';
+$lang['thumbnail'] = 'Miniature';
 $lang['title'] = 'titre';
 $lang['title_categories'] = 'Gestion des catégories';
 $lang['title_configuration'] = 'Configuration de Piwigo';