Merging revision 2802

Advices [19] $conf['subcatify'] replaced by $conf['tags_default_display_mode']

Translation is needed for German, Spanish, Italian...
Please reorder after translation.




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

7 files changed, 22 insertions, 14 deletions

diff --git a/include/config_default.inc.php b/include/config_default.inc.php
index 033f9cec8..394e6d117 100644
--- a/include/config_default.inc.php
+++ b/include/config_default.inc.php
@@ -229,7 +229,7 @@ $conf['show_thumbnail_caption'] = true;
 // name ?
 $conf['show_picture_name_on_title'] = true;
 
-// display_fromto: in subcatify mode, display the date creation bounds of a
+// display_fromto: display the date creation bounds of a
 // category.
 $conf['display_fromto'] = false;
 
diff --git a/plugins/admin_advices/adv_set.php b/plugins/admin_advices/adv_set.php
index a95832688..aa3a62960 100644
--- a/plugins/admin_advices/adv_set.php
+++ b/plugins/admin_advices/adv_set.php
@@ -120,9 +120,9 @@ $adv['n'][18] = 'show_picture_name_on_title';
 $adv['c'][18] = $conf['show_picture_name_on_title'];
 $adv['v'][18] = sprintf($lang['current'], 'true');
 
-$adv['n'][19] = 'subcatify';
-/* $adv['c'][19] = $conf['subcatify']; No longer exist */
-$adv['v'][19] = sprintf($lang['current'], 'true');
+$adv['n'][19] = 'tags_default_display_mode';
+$adv['c'][15] = ( $conf['tags_default_display_mode'] == 'cloud' );
+$adv['v'][19] = sprintf($lang['current'], "'".$conf['tags_default_display_mode']."'");
 
 $adv['n'][20] = 'allow_random_representative';
 $adv['c'][20] = $conf['allow_random_representative'];
diff --git a/plugins/admin_advices/language/de_DE/plugin.lang.php b/plugins/admin_advices/language/de_DE/plugin.lang.php
index ba9521c16..9637e312a 100644
--- a/plugins/admin_advices/language/de_DE/plugin.lang.php
+++ b/plugins/admin_advices/language/de_DE/plugin.lang.php
@@ -91,8 +91,7 @@ $lang['Adv_case'][17] = array( /* show_thumbnail_caption */
  'Für eine leichtere Galerie müssen nur einen Blick bis zu $conf[\'show_thumbnail_caption\'] = false,', );
 $lang['Adv_case'][18] = array( /* show_picture_name_on_title */
  'Für eine leichtere Galerie müssen nur einen Blick bis zu $conf[\'show_picture_name_on_title\'] = false,', );
-$lang['Adv_case'][19] = array( /* subcatify */
- 'Wenn Sie keine Kategorie-Beschreibungen haben, nur einen Blick bis zu $conf[\'subcatify\'] = false,', );
+
 $lang['Adv_case'][20] = array( /* allow_random_representative */
  'Verlassen $conf[\'allow_random_representative\'] = true, ',
  'aber analysieren, wenn Sie können verhindern, dass für Performance-Gründen.' , );
@@ -164,4 +163,7 @@ $lang['Adv_case'][35] = array( /* template_compile_check */
  'you should consider to set it false.',
  'Choosing false, template changes are not detected, this improves response time.',
  'Anyway Specials > Maintenance > Purge compiled templates, is recommended after this $conf change.' );
+$lang['Adv_case'][19] = array( /* tags_default_display_mode */
+ '\'cloud\' by default, importance of tags is shown with font size.',
+ 'You can change the tags page, $conf[\'tags_default_display_mode\'] = \'letters\'', );
 ?>
\ No newline at end of file
diff --git a/plugins/admin_advices/language/en_UK/plugin.lang.php b/plugins/admin_advices/language/en_UK/plugin.lang.php
index 57ff2b765..77856af1c 100644
--- a/plugins/admin_advices/language/en_UK/plugin.lang.php
+++ b/plugins/admin_advices/language/en_UK/plugin.lang.php
@@ -91,8 +91,9 @@ $lang['Adv_case'][17] = array( /* show_thumbnail_caption */
  'For a lighter gallery just have a look to $conf[\'show_thumbnail_caption\'] = false,', );
 $lang['Adv_case'][18] = array( /* show_picture_name_on_title */
  'For a lighter gallery just have a look to $conf[\'show_picture_name_on_title\'] = false,', );
-$lang['Adv_case'][19] = array( /* subcatify */
- 'If you do NOT have any category descriptions just have a look to $conf[\'subcatify\'] = false,', );
+$lang['Adv_case'][19] = array( /* tags_default_display_mode */
+ '\'cloud\' by default, importance of tags is shown with font size.',
+ 'You can change the tags page, $conf[\'tags_default_display_mode\'] = \'letters\'', );
 $lang['Adv_case'][20] = array( /* allow_random_representative */
  'Leave $conf[\'allow_random_representative\'] = true, ',
  'but analyze if you can avoid for performance reasons.' , );
diff --git a/plugins/admin_advices/language/es_ES/plugin.lang.php b/plugins/admin_advices/language/es_ES/plugin.lang.php
index 57ff2b765..67e9eba1d 100644
--- a/plugins/admin_advices/language/es_ES/plugin.lang.php
+++ b/plugins/admin_advices/language/es_ES/plugin.lang.php
@@ -91,8 +91,7 @@ $lang['Adv_case'][17] = array( /* show_thumbnail_caption */
  'For a lighter gallery just have a look to $conf[\'show_thumbnail_caption\'] = false,', );
 $lang['Adv_case'][18] = array( /* show_picture_name_on_title */
  'For a lighter gallery just have a look to $conf[\'show_picture_name_on_title\'] = false,', );
-$lang['Adv_case'][19] = array( /* subcatify */
- 'If you do NOT have any category descriptions just have a look to $conf[\'subcatify\'] = false,', );
+
 $lang['Adv_case'][20] = array( /* allow_random_representative */
  'Leave $conf[\'allow_random_representative\'] = true, ',
  'but analyze if you can avoid for performance reasons.' , );
@@ -164,4 +163,7 @@ $lang['Adv_case'][35] = array( /* template_compile_check */
  'you should consider to set it false.',
  'Choosing false, template changes are not detected, this improves response time.',
  'Anyway Specials > Maintenance > Purge compiled templates, is recommended after this $conf change.' );
+ $lang['Adv_case'][19] = array( /* tags_default_display_mode */
+ '\'cloud\' by default, importance of tags is shown with font size.',
+ 'You can change the tags page, $conf[\'tags_default_display_mode\'] = \'letters\'', );
 ?>
\ No newline at end of file
diff --git a/plugins/admin_advices/language/fr_FR/plugin.lang.php b/plugins/admin_advices/language/fr_FR/plugin.lang.php
index 68ba6e725..d00156e42 100644
--- a/plugins/admin_advices/language/fr_FR/plugin.lang.php
+++ b/plugins/admin_advices/language/fr_FR/plugin.lang.php
@@ -93,8 +93,9 @@ $lang['Adv_case'][17] = array( /* show_thumbnail_caption */
  'Pour une galerie moins chargée, faites le test de $conf[\'show_thumbnail_caption\'] = false,', );
 $lang['Adv_case'][18] = array( /* show_picture_name_on_title */
  'Pour une galerie moins chargée, faites le test de $conf[\'show_picture_name_on_title\'] = false,', );
-$lang['Adv_case'][19] = array( /* subcatify */
- 'Si aucune de vos catégories ne possède de description alors essayez $conf[\'subcatify\'] = false;', );
+$lang['Adv_case'][19] = array( /* tags_default_display_mode */
+ 'Par défaut à \'cloud\' (nuage), plus un "tag" est utilisé plus il sera écrit en grand.',
+ 'Vous pouvez changer l\'affichage des "tags", $conf[\'tags_default_display_mode\'] = \'letters\'', );
 $lang['Adv_case'][20] = array( /* allow_random_representative */
  'Laissez $conf[\'allow_random_representative\'] = true, ',
  'mais étudiez comment vous pourriez l\'éviter pour des raisons de performance.' , );
diff --git a/plugins/admin_advices/language/it_IT/plugin.lang.php b/plugins/admin_advices/language/it_IT/plugin.lang.php
index a0b452870..f408f04cb 100644
--- a/plugins/admin_advices/language/it_IT/plugin.lang.php
+++ b/plugins/admin_advices/language/it_IT/plugin.lang.php
@@ -93,8 +93,7 @@ $lang['Adv_case'][17] = array( /* show_thumbnail_caption */
  'Per una galleria meno "carica", provate con $conf[\'show_thumbnail_caption\'] = false,', );
 $lang['Adv_case'][18] = array( /* show_picture_name_on_title */
  'Per una galleria meno "carica", provate con $conf[\'show_picture_name_on_title\'] = false,', );
-$lang['Adv_case'][19] = array( /* subcatify */
- 'Se nessuna delle vostre categorie ha una descrizzione provate $conf[\'subcatify\'] = false,', );
+
 $lang['Adv_case'][20] = array( /* allow_random_representative */
  'Lasciate pure $conf[\'allow_random_representative\'] = true, ',
  'ma provate a vedere come evitarlo per raggioni di performance.' , );
@@ -166,4 +165,7 @@ $lang['Adv_case'][35] = array( /* template_compile_check */
  'you should consider to set it false.',
  'Choosing false, template changes are not detected, this improves response time.',
  'Anyway Specials > Maintenance > Purge compiled templates, is recommended after this $conf change.' );
+ $lang['Adv_case'][19] = array( /* tags_default_display_mode */
+ '\'cloud\' by default, importance of tags is shown with font size.',
+ 'You can change the tags page, $conf[\'tags_default_display_mode\'] = \'letters\'', );
 ?>
\ No newline at end of file