feature:2317 move order config to Admin->Config->Options

new GUI interface for simple paterns
in GUI, order_by and order_by_inside_category are merged (not un DB)
users can define special paterns with $conf['order_by_custom'] and $conf['order_by_inside_category_custom']

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

1 files changed, 2 insertions, 4 deletions

diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php
index 75e4d76a7..0849adf35 100644
--- a/language/en_UK/admin.lang.php
+++ b/language/en_UK/admin.lang.php
@@ -151,7 +151,6 @@ $lang['Apply to sub-albums'] = "Apply to sub-albums";
 $lang['Are you sure to install this upgrade? You must verify if this version does not need uninstallation.'] = "Are you sure you want to install this upgrade? You must verify if this version does not need prior uninstallation.";
 $lang['Are you sure you want to delete this plugin?'] = "Are you sure you want to delete this plugin?";
 $lang['Are you sure you want to install this plugin?'] = "Are you sure you want to install this plugin?";
-$lang['As default order'] = "As default order";
 $lang['Associate to album'] = "Associate to album";
 $lang['associate to group'] = "associate to group";
 $lang['Associated'] = "Associated";
@@ -204,7 +203,6 @@ $lang['Create the "%s" directory at the root of your Piwigo installation'] = 'Cr
 $lang['Create this site'] = "Create this site";
 $lang['created'] = "created";
 $lang['Current name'] = "Current name";
-$lang['Custom'] = "Custom";
 $lang['Database synchronization with files'] = "Database synchronization with files";
 $lang['Database'] = "Database";
 $lang['Date'] = "Date";
@@ -213,7 +211,6 @@ $lang['Deactivate'] = "Deactivate";
 $lang['Deactivate all'] = "Deactivate all";
 $lang['Default display'] = "Default display";
 $lang['Default photos order'] = "Default photos order";
-$lang['Default photos order inside album'] = "Default photos order inside album";
 $lang['Default user cannot be deleted'] = "Default user cannot be deleted";
 $lang['Default user does not exist'] = "The default user does not exist";
 $lang['default values'] = "default values";
@@ -363,7 +360,6 @@ $lang['Install'] = "Install";
 $lang['Installed Languages'] = 'Installed Languages';
 $lang['Installed Themes'] = "Installed Themes";
 $lang['Instructions to use Piwigo'] = "Instructions to use Piwigo";
-$lang['Invalid order string'] = 'Invalid order string';
 $lang['Invert'] = 'Invert';
 $lang['IP'] = "IP";
 $lang['JPEG files or ZIP archives with JPEG files inside please.'] = 'JPEG files or ZIP archives with JPEG files inside please.';
@@ -774,7 +770,9 @@ $lang['You are running on development sources, no check possible.'] = "You are r
 $lang['You are running the latest version of Piwigo.'] = "You are running Piwigo latest version.";
 $lang['You cannot delete your account'] = "You cannot delete your account";
 $lang['You cannot move an album in its own sub album'] = "You cannot move an album in its own sub album";
+$lang['You can\'t define a default photo order because you have a custom setting in your local configuration.'] = 'You can\'t define a default photo order because you have a custom setting in your local configuration.';
 $lang['You have %d orphan tags: %s.'] = 'You have %d orphan tags: %s.';
+$lang['You have specified <i>$conf[\'order_by\']</i> in your local configuration file, this parameter in deprecated, please remove it or rename it into <i>$conf[\'order_by_custom\']</i> !'] = 'You have specified <i>$conf[\'order_by\']</i> in your local configuration file, this parameter in deprecated, please remove it or rename it into <i>$conf[\'order_by_custom\']</i> !';
 $lang['You have subscribed to receiving notifications by mail.'] = "You have subscribed to receive notifications by mail.";
 $lang['You have unsubscribed from receiving notifications by mail.'] = "You have unsubscribed from being notified by mail.";
 $lang['You might go to plugin list to install and activate it.'] = "Go to the plugins list to install and activate it.";