Fix Mathias requests about French words.

Rename completely general tab into main tab.

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

4 files changed, 19 insertions, 19 deletions

diff --git a/template/yoga/admin.tpl b/template/yoga/admin.tpl
index be5ce7ff0..88975544c 100644
--- a/template/yoga/admin.tpl
+++ b/template/yoga/admin.tpl
@@ -14,8 +14,8 @@
     <dt>{lang:config}</dt>
     <dd>
       <ul>
-        <li><a href="{U_CONFIG_GENERAL}">{lang:general}</a></li>
-        <li><a href="{U_CONFIG_DISPLAY}">{lang:conf_default}</a></li>
+        <li><a href="{U_CONFIG_GENERAL}">{lang:conf_general}</a></li>
+        <li><a href="{U_CONFIG_DISPLAY}">{lang:conf_display}</a></li>
       </ul>
     </dd>
   </dl>
diff --git a/template/yoga/admin/configuration.tpl b/template/yoga/admin/configuration.tpl
index 5d2372587..52cb270e2 100644
--- a/template/yoga/admin/configuration.tpl
+++ b/template/yoga/admin/configuration.tpl
@@ -9,64 +9,64 @@
 
 <form method="post" action="{F_ACTION}" class="properties">
 
-<!-- BEGIN general -->
-<fieldset id="generalConf">
+<!-- BEGIN main -->
+<fieldset id="mainConf">
   <ul>
     <li>
       <span class="property">
         <label for="gallery_title">{lang:Gallery title}</label>
       </span>
-      <input type="text" maxlength="255" size="50" name="gallery_title" id="gallery_title" value="{general.CONF_GALLERY_TITLE}" />
+      <input type="text" maxlength="255" size="50" name="gallery_title" id="gallery_title" value="{main.CONF_GALLERY_TITLE}" />
     </li>
 
     <li>
       <span class="property">
         <label for="page_banner">{lang:Page banner}</label>
       </span>
-      <textarea class="description" name="page_banner" id="page_banner">{general.CONF_PAGE_BANNER}</textarea>
+      <textarea class="description" name="page_banner" id="page_banner">{main.CONF_PAGE_BANNER}</textarea>
     </li>
 
     <li>
       <span class="property">
         <label for="gallery_url">{lang:Gallery URL}</label>
       </span>
-      <input type="text" maxlength="255" size="50" name="gallery_url" id="gallery_url" value="{general.CONF_GALLERY_URL}" />
+      <input type="text" maxlength="255" size="50" name="gallery_url" id="gallery_url" value="{main.CONF_GALLERY_URL}" />
     </li>
 
     <li>
       <span class="property">{lang:Lock gallery}</span>
-      <label><input type="radio" class="radio" name="gallery_locked" value="true" {general.GALLERY_LOCKED_YES} />{lang:Yes}</label>
-      <label><input type="radio" class="radio" name="gallery_locked" value="false" {general.GALLERY_LOCKED_NO} />{lang:No}</label>
+      <label><input type="radio" class="radio" name="gallery_locked" value="true" {main.GALLERY_LOCKED_YES} />{lang:Yes}</label>
+      <label><input type="radio" class="radio" name="gallery_locked" value="false" {main.GALLERY_LOCKED_NO} />{lang:No}</label>
     </li>
 
     <li>
       <span class="property">{lang:Rating}</span>
-      <label><input type="radio" class="radio" name="rate" value="true" {general.RATE_YES} />{lang:Yes}</label>
-      <label><input type="radio" class="radio" name="rate" value="false" {general.RATE_NO} />{lang:No}</label>
+      <label><input type="radio" class="radio" name="rate" value="true" {main.RATE_YES} />{lang:Yes}</label>
+      <label><input type="radio" class="radio" name="rate" value="false" {main.RATE_NO} />{lang:No}</label>
     </li>
 
     <li>
       <span class="property">{lang:Rating by guests}</span>
-      <label><input type="radio" class="radio" name="rate_anonymous" value="true" {general.RATE_ANONYMOUS_YES} />{lang:Yes}</label>
-      <label><input type="radio" class="radio" name="rate_anonymous" value="false" {general.RATE_ANONYMOUS_NO} />{lang:No}</label>
+      <label><input type="radio" class="radio" name="rate_anonymous" value="true" {main.RATE_ANONYMOUS_YES} />{lang:Yes}</label>
+      <label><input type="radio" class="radio" name="rate_anonymous" value="false" {main.RATE_ANONYMOUS_NO} />{lang:No}</label>
     </li>
 
     <li>
       <label>
         <span class="property">{lang:Email admin when a new user registers}</span>
-        <input type="checkbox" name="email_admin_on_new_user" {general.EMAIL_ADMIN_ON_NEW_USER} />
+        <input type="checkbox" name="email_admin_on_new_user" {main.EMAIL_ADMIN_ON_NEW_USER} />
       </label>
     </li>
 
     <li>
       <label for="allow_user_registration">
         <span class="property">{lang:Allow user registration}</span>
-        <input type="checkbox" name="allow_user_registration" id="allow_user_registration" {general.ALLOW_USER_REGISTRATION} />
+        <input type="checkbox" name="allow_user_registration" id="allow_user_registration" {main.ALLOW_USER_REGISTRATION} />
       </label>
     </li>
   </ul>
 </fieldset>
-<!-- END general -->
+<!-- END main -->
 
 <!-- BEGIN history -->
 <fieldset id="historyConf">
diff --git a/template/yoga/admin/default-layout.css b/template/yoga/admin/default-layout.css
index edad24d3f..d6510b133 100644
--- a/template/yoga/admin/default-layout.css
+++ b/template/yoga/admin/default-layout.css
@@ -97,10 +97,10 @@ FORM#categoryPermissions LI {
   white-space: nowrap;

 }

 

-FIELDSET#generalConf SPAN.property {

+FIELDSET#mainConf SPAN.property {

   width: 25%;

 }

-FIELDSET#generalConf TEXTAREA.description {

+FIELDSET#mainConf TEXTAREA.description {

   width: 70%;

 }

 

diff --git a/template/yoga/admin/permalinks.tpl b/template/yoga/admin/permalinks.tpl
index dbbe4827f..3388cc40b 100644
--- a/template/yoga/admin/permalinks.tpl
+++ b/template/yoga/admin/permalinks.tpl
@@ -7,7 +7,7 @@
 
 <form method="post" action="{F_ACTION}">
 <fieldset><legend>{lang:Add/delete a permalink}</legend>
-  <label>Category:
+  <label>{lang:Category}:
     <select name="cat_id">
       <option value="0">------</option>
 <!-- BEGIN categories -->