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

12 files changed, 6 insertions, 48 deletions

diff --git a/language/cs_CZ/admin.lang.php b/language/cs_CZ/admin.lang.php
index 9426022e9..dbc73bbe7 100644
--- a/language/cs_CZ/admin.lang.php
+++ b/language/cs_CZ/admin.lang.php
@@ -793,14 +793,10 @@ $lang['No results'] = 'Žádný výsledek';
 $lang['Searching...'] = 'Hledám...';
 $lang['Type in a search term'] = 'Zadejte hledaný výraz';
 $lang['Activate icon "new" next to albums and pictures'] = 'Aktivovat ikonu "nové" vedle alb a obrázků';
-$lang['As default order'] = 'Jako výchozí pořadí';
 $lang['Compact'] = 'Kompaktní';
 $lang['Complete'] = 'Kompletní';
-$lang['Custom'] = 'Běžný';
 $lang['Deactivate all'] = 'Deaktivovat vše';
 $lang['Default photos order'] = 'Výchozí pořadí fotografií';
-$lang['Default photos order inside album'] = 'Výchozí pořadí fotografií uvnitř album';
-$lang['Invalid order string'] = 'Neplatný řetězec výběru';
 $lang['Restore'] = 'Obnovit';
 $lang['Restore default configuration. You will lost your plugin settings!'] = 'Obnovit výchozí konfiguraci. Přijdete o nastavení v pluginech!';
 $lang['Show menubar'] = 'Zobrazit menu';
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.";
diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php
index 4f6a09411..83ec8eccc 100644
--- a/language/fr_FR/admin.lang.php
+++ b/language/fr_FR/admin.lang.php
@@ -848,9 +848,8 @@ $lang['Type in a search term'] = 'Entrez un terme de recherche';
 $lang['Searching...'] = 'Recherche...';
 $lang['new'] = 'nouveau';
 $lang['Default photos order'] = "Ordre par défaut des photos";
-$lang['Default photos order inside album'] = "Ordre par défaut des photos dans un album";
-$lang['Invalid order string'] = 'Chaîne SQL incorrecte';
-$lang['As default order'] = "Comme l'ordre par défaut";
-$lang['Custom'] = "Personnalisé";
 $lang['Activate icon "new" next to albums and pictures'] = 'Afficher l\'icône "nouveau" à côté des albums et des photos';
+$lang['You can\'t define a default photo order because you have a custom setting in your local configuration.'] = 'Vous ne pouvez définir l\'ordre par défaut des photos car vous avez un paramètre personnalisé dans votre configuration locale.';
+$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> !'] = 'Vous avez spécifié <i>$conf[\'order_by\']</i> dans votre fichier de configuration, ce paramètre est obsolète, veuillez le supprimer ou le renommer en <i>$conf[\'order_by_custom\']</i> !';
+
 ?>
\ No newline at end of file
diff --git a/language/he_IL/admin.lang.php b/language/he_IL/admin.lang.php
index 386454db6..e76d1734a 100644
--- a/language/he_IL/admin.lang.php
+++ b/language/he_IL/admin.lang.php
@@ -803,14 +803,10 @@ $lang['Follow Orientation'] = 'עקוב אחר ההדרכה';
 $lang['If you want to regenerate thumbnails, please go to the <a href="%s">Batch Manager</a>.'] = 'אם ברצונך לחדש את התמונות הממוזערות נווט בבקשה ל <a href="%s">מנהל אצווה</a>.';
 $lang['Graphics Library'] = 'ספריית גרפיקה';
 $lang['Activate icon "new" next to albums and pictures'] = 'הפעל כפתו "חדש" ליד אלבומים';
-$lang['As default order'] = 'כסדר ברירת מחדל';
 $lang['Compact'] = 'קומפקטי';
 $lang['Complete'] = 'סיים';
-$lang['Custom'] = 'מותאם אישית';
 $lang['Deactivate all'] = 'בטל פעולה להכל';
 $lang['Default photos order'] = 'סדר ברירת מחדל לתמונות';
-$lang['Default photos order inside album'] = 'סדר ברירת מחדל לתמונות באלבום';
-$lang['Invalid order string'] = 'מחרוזת סדר לא חוקית';
 $lang['Restore'] = 'שחזר';
 $lang['Restore default configuration. You will lost your plugin settings!'] = 'שחזר להגדרות ברירת מחדל. הגדרות ההתקן יאבדו!';
 $lang['Show menubar'] = 'הצג תפריט';
diff --git a/language/it_IT/admin.lang.php b/language/it_IT/admin.lang.php
index 12266b871..434c4c0f8 100644
--- a/language/it_IT/admin.lang.php
+++ b/language/it_IT/admin.lang.php
@@ -848,9 +848,5 @@ $lang['Type in a search term'] = 'Inserire un Entrez un termine di ricerca';
 $lang['Searching...'] = 'Ricerca ...';
 $lang['new'] = 'nuovo';
 $lang['Default photos order'] = 'Ordinamento di default delle foto';
-$lang['Default photos order inside album'] = 'Ordinamento di default delle foto in un album';
-$lang['Invalid order string'] = 'Stringa SQL non corretta';
-$lang['As default order'] = 'Come ordinamento di default';
-$lang['Custom'] = 'Personalizzare';
 $lang['Activate icon "new" next to albums and pictures'] = 'Visualizzare l\'icona "nuovo" a fianco degli album e delle foto';
 ?>
\ No newline at end of file
diff --git a/language/ja_JP/admin.lang.php b/language/ja_JP/admin.lang.php
index f250df784..28e698491 100644
--- a/language/ja_JP/admin.lang.php
+++ b/language/ja_JP/admin.lang.php
@@ -726,11 +726,8 @@ $lang['Choose an action'] = 'アックションを選択して下さい';
 $lang['Compact'] = 'コンパクト';
 $lang['Complete'] = '完了';
 $lang['Activate icon "new" next to albums and pictures'] = 'アルバムと写真のとなりに、\'起動アイコン　"新" があります';
-$lang['As default order'] = 'デフォルト順として';
-$lang['Custom'] = 'カスタム';
 $lang['Deactivate all'] = '全て非活性する';
 $lang['Default photos order'] = 'デフォルト写真順番';
-$lang['Default photos order inside album'] = 'デフォルト写真順はアルバム中';
 $lang['Delete orphan tags'] = '捨てられたタグを削除する';
 $lang['delete photo'] = '写真を削除する';
 $lang['duplicates'] = '複写';
diff --git a/language/lv_LV/admin.lang.php b/language/lv_LV/admin.lang.php
index 89382cd3e..c8734164b 100644
--- a/language/lv_LV/admin.lang.php
+++ b/language/lv_LV/admin.lang.php
@@ -790,14 +790,10 @@ $lang['new'] = 'jauns';
 $lang['No results'] = 'Nav rezultātu';
 $lang['Searching...'] = 'Meklē...';
 $lang['Type in a search term'] = 'Ierakstiet meklējamo vārdu';
-$lang['As default order'] = 'Kā pēc noklusējuma';
 $lang['Compact'] = 'Kompaktēt';
 $lang['Complete'] = 'Pabeigt';
-$lang['Custom'] = 'Pielāgots';
 $lang['Deactivate all'] = 'Deaktivēt visu';
 $lang['Default photos order'] = 'Foto kārtojums pēc noklusējuma';
-$lang['Default photos order inside album'] = 'Foto kārtojums pēc noklusējuma albumā';
-$lang['Invalid order string'] = 'Kļūdaina kārtojuma rinda';
 $lang['Restore'] = 'Atjaunot';
 $lang['Restore default configuration. You will lost your plugin settings!'] = 'Atjaunot noklusējuma konfigurāciju. Jūs zaudēsit savus spraudņa iestatījumus!';
 $lang['Show menubar'] = 'Rādīt izvēles joslu';
diff --git a/language/pl_PL/admin.lang.php b/language/pl_PL/admin.lang.php
index ac00b5a3d..802c11834 100644
--- a/language/pl_PL/admin.lang.php
+++ b/language/pl_PL/admin.lang.php
@@ -790,14 +790,10 @@ $lang['No results'] = 'Brak wyników';
 $lang['Searching...'] = 'Wyszukiwanie...';
 $lang['Type in a search term'] = 'Wpisz frazę do wyszukania';
 $lang['Activate icon "new" next to albums and pictures'] = 'Aktywuj ikonę "nowe" obok albumów i zdjęć';
-$lang['As default order'] = 'Jako sortowanie domyślne';
 $lang['Compact'] = 'Minimalne';
 $lang['Complete'] = 'Pełne';
-$lang['Custom'] = 'Własne';
 $lang['Deactivate all'] = 'Deaktywuj wszystko';
 $lang['Default photos order'] = 'Domślne sortowanie zdjęć';
-$lang['Default photos order inside album'] = 'Domyślne sortowanie zdjęć w albumie';
-$lang['Invalid order string'] = 'Niepoprawny ciąg sortowania';
 $lang['Restore'] = 'Przywróć';
 $lang['Restore default configuration. You will lost your plugin settings!'] = 'Przywróć domyślną konfigurację. Stracisz ustawienia wtyczek!';
 $lang['Show menubar'] = 'Pokazuj belkę z menu';
diff --git a/language/ru_RU/admin.lang.php b/language/ru_RU/admin.lang.php
index e239c0264..7e8dafd0c 100644
--- a/language/ru_RU/admin.lang.php
+++ b/language/ru_RU/admin.lang.php
@@ -789,14 +789,10 @@ $lang['Searching...'] = 'Выполняется поиск...';
 $lang['Type in a search term'] = 'Определите критерий поиска';
 $lang['display'] = 'показать';
 $lang['Activate icon "new" next to albums and pictures'] = 'Активировать иконку "new" рядом с альбомами и фотографиями';
-$lang['As default order'] = 'Порядок по умолчанию';
 $lang['Compact'] = 'Компактный';
 $lang['Complete'] = 'Полный';
-$lang['Custom'] = 'Пользовательский';
 $lang['Deactivate all'] = 'Деактивировать все';
 $lang['Default photos order'] = 'Порядок фотографий по умолчанию';
-$lang['Default photos order inside album'] = 'Порядок фотографий в альбоме по умолчанию';
-$lang['Invalid order string'] = 'Недопустимое значение сортировки';
 $lang['Restore'] = 'Восстановить';
 $lang['Restore default configuration. You will lost your plugin settings!'] = 'Восстановление конфигурации по умолчанию. Ваши настройки плагинов будут потеряны!';
 $lang['Show menubar'] = 'Показать меню';
diff --git a/language/sk_SK/admin.lang.php b/language/sk_SK/admin.lang.php
index cbc9c5cf7..100223667 100644
--- a/language/sk_SK/admin.lang.php
+++ b/language/sk_SK/admin.lang.php
@@ -840,11 +840,6 @@ $lang['Follow Orientation'] = 'Nasledovať orientáciu';
 $lang['If you want to regenerate thumbnails, please go to the <a href="%s">Batch Manager</a>.'] = 'Ak chcete obnoviť náhľady, prosím choďte na <a href="%s">Správcu dávky</a>.';
 $lang['Graphics Library'] = 'Grafická knižnica';
 $lang['Activate icon "new" next to albums and pictures'] = 'Aktivovať ikonu "new" pre ďalšie albumy a fotky'; 
-$lang['As default order'] = 'Ako predvolené zoradenie'; 
-$lang['Custom'] = 'Voliteľné'; 
 $lang['Default photos order'] = 'Predvolené zoradenie fotiek'; 
-$lang['Default photos order inside album'] = 'Predvolené zoradenie fotografií vo vnútri albumu'; 
-$lang['Invalid order string'] = 'Neplatný zoraďovací sled';
-
 
 ?>
\ No newline at end of file
diff --git a/language/sv_SE/admin.lang.php b/language/sv_SE/admin.lang.php
index 67226255d..e2c3e20f0 100644
--- a/language/sv_SE/admin.lang.php
+++ b/language/sv_SE/admin.lang.php
@@ -797,14 +797,10 @@ $lang['No results'] = 'Inga poster hittades';
 $lang['Searching...'] = 'Söker...';
 $lang['Type in a search term'] = 'Ange nytt sökord';
 $lang['Activate icon "new" next to albums and pictures'] = 'Aktivera ikonen "ny" intill album och bilder';
-$lang['As default order'] = 'Standardordning';
 $lang['Compact'] = 'Kompakt';
 $lang['Complete'] = 'Komplett';
-$lang['Custom'] = 'Anpassad';
 $lang['Deactivate all'] = 'Avaktivera allt';
 $lang['Default photos order'] = 'Standardordning för bilder';
-$lang['Default photos order inside album'] = 'Standardordning för bilder i ett album';
-$lang['Invalid order string'] = 'Fel ordningssträng';
 $lang['Restore'] = 'Återställ';
 $lang['Restore default configuration. You will lost your plugin settings!'] = 'Återställ standardkonfiguration. Du kommer att förlora inställingarna för din plugins!';
 $lang['Show menubar'] = 'Visa verktygsfält';
diff --git a/language/tr_TR/admin.lang.php b/language/tr_TR/admin.lang.php
index f2ed4c12e..d81922f60 100644
--- a/language/tr_TR/admin.lang.php
+++ b/language/tr_TR/admin.lang.php
@@ -830,9 +830,6 @@ $lang['Follow Orientation'] = 'Oryantasyonu takip edin';
 $lang['If you want to regenerate thumbnails, please go to the <a href="%s">Batch Manager</a>.'] = 'Eğer küçük resimleri yenilemek istiyorsanız, <a href="%s">Küçük Resimleri Tekrar Oluştur</a> gidin.';
 $lang['Graphics Library'] = 'Grafik Arşivi';
 $lang['Activate icon "new" next to albums and pictures'] = 'Resimlerin yanındaki "yeni" simgesini etkinleştir';
-$lang['As default order'] = 'Varsayılan düzen olarak';
-$lang['Custom'] = 'özel';
 $lang['Default photos order'] = 'Varsayılan resim düzeni';
-$lang['Default photos order inside album'] = 'Albüm içindeki varsayılan resim düzeni';
-$lang['Invalid order string'] = 'Geçersiz düzen';
+
 ?>
\ No newline at end of file