issue 426 step 1 reverted:

svn merge -r1466:1465 .
svn merge -r1463:1462 .


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

26 files changed, 0 insertions, 0 deletions

diff --git a/template/public/yoga/admin.tpl b/template/yoga/admin.tpl
index 24177e427..24177e427 100644
--- a/template/public/yoga/admin.tpl
+++ b/template/yoga/admin.tpl
diff --git a/template/public/yoga/admin/cat_list.tpl b/template/yoga/admin/cat_list.tpl
index ec4b66d43..ec4b66d43 100644
--- a/template/public/yoga/admin/cat_list.tpl
+++ b/template/yoga/admin/cat_list.tpl
diff --git a/template/public/yoga/admin/cat_modify.tpl b/template/yoga/admin/cat_modify.tpl
index ed8861d84..ed8861d84 100644
--- a/template/public/yoga/admin/cat_modify.tpl
+++ b/template/yoga/admin/cat_modify.tpl
diff --git a/template/public/yoga/admin/cat_move.tpl b/template/yoga/admin/cat_move.tpl
index 5d5247f2f..5d5247f2f 100644
--- a/template/public/yoga/admin/cat_move.tpl
+++ b/template/yoga/admin/cat_move.tpl
diff --git a/template/public/yoga/admin/cat_options.tpl b/template/yoga/admin/cat_options.tpl
index 891dc37d4..891dc37d4 100644
--- a/template/public/yoga/admin/cat_options.tpl
+++ b/template/yoga/admin/cat_options.tpl
diff --git a/template/admin/yoga/admin/cat_perm.tpl b/template/yoga/admin/cat_perm.tpl
index 9c8fafa69..9c8fafa69 100644
--- a/template/admin/yoga/admin/cat_perm.tpl
+++ b/template/yoga/admin/cat_perm.tpl
diff --git a/template/admin/yoga/admin/comments.tpl b/template/yoga/admin/comments.tpl
index 065a1c8ee..065a1c8ee 100644
--- a/template/admin/yoga/admin/comments.tpl
+++ b/template/yoga/admin/comments.tpl
diff --git a/template/public/yoga/admin/configuration.tpl b/template/yoga/admin/configuration.tpl
index a0578692d..a0578692d 100644
--- a/template/public/yoga/admin/configuration.tpl
+++ b/template/yoga/admin/configuration.tpl
diff --git a/template/admin/yoga/admin/double_select.tpl b/template/yoga/admin/double_select.tpl
index 2bfa28072..2bfa28072 100644
--- a/template/admin/yoga/admin/double_select.tpl
+++ b/template/yoga/admin/double_select.tpl
diff --git a/template/public/yoga/admin/element_set_global.tpl b/template/yoga/admin/element_set_global.tpl
index 7bb9d7006..7bb9d7006 100644
--- a/template/public/yoga/admin/element_set_global.tpl
+++ b/template/yoga/admin/element_set_global.tpl
diff --git a/template/admin/yoga/admin/element_set_unit.tpl b/template/yoga/admin/element_set_unit.tpl
index 5adce8833..5adce8833 100644
--- a/template/admin/yoga/admin/element_set_unit.tpl
+++ b/template/yoga/admin/element_set_unit.tpl
diff --git a/template/public/yoga/admin/group_list.tpl b/template/yoga/admin/group_list.tpl
index 7b7dd67eb..7b7dd67eb 100644
--- a/template/public/yoga/admin/group_list.tpl
+++ b/template/yoga/admin/group_list.tpl
diff --git a/template/admin/yoga/admin/group_perm.tpl b/template/yoga/admin/group_perm.tpl
index 91c2f637a..91c2f637a 100644
--- a/template/admin/yoga/admin/group_perm.tpl
+++ b/template/yoga/admin/group_perm.tpl
diff --git a/template/public/yoga/admin/intro.tpl b/template/yoga/admin/intro.tpl
index 58c6b2510..58c6b2510 100644
--- a/template/public/yoga/admin/intro.tpl
+++ b/template/yoga/admin/intro.tpl
diff --git a/template/public/yoga/admin/maintenance.tpl b/template/yoga/admin/maintenance.tpl
index 697e0954b..697e0954b 100644
--- a/template/public/yoga/admin/maintenance.tpl
+++ b/template/yoga/admin/maintenance.tpl
diff --git a/template/admin/yoga/admin/notification_by_mail.tpl b/template/yoga/admin/notification_by_mail.tpl
index 22309e96d..22309e96d 100644
--- a/template/admin/yoga/admin/notification_by_mail.tpl
+++ b/template/yoga/admin/notification_by_mail.tpl
diff --git a/template/public/yoga/admin/picture_modify.tpl b/template/yoga/admin/picture_modify.tpl
index c10e7744e..c10e7744e 100644
--- a/template/public/yoga/admin/picture_modify.tpl
+++ b/template/yoga/admin/picture_modify.tpl
diff --git a/template/admin/yoga/admin/rating.tpl b/template/yoga/admin/rating.tpl
index ac78bf419..ac78bf419 100644
--- a/template/admin/yoga/admin/rating.tpl
+++ b/template/yoga/admin/rating.tpl
diff --git a/template/public/yoga/admin/site_manager.tpl b/template/yoga/admin/site_manager.tpl
index 88b77a362..88b77a362 100644
--- a/template/public/yoga/admin/site_manager.tpl
+++ b/template/yoga/admin/site_manager.tpl
diff --git a/template/admin/yoga/admin/site_update.tpl b/template/yoga/admin/site_update.tpl
index d3d0221ca..d3d0221ca 100644
--- a/template/admin/yoga/admin/site_update.tpl
+++ b/template/yoga/admin/site_update.tpl
diff --git a/template/public/yoga/admin/stats.tpl b/template/yoga/admin/stats.tpl
index 75de81f79..75de81f79 100644
--- a/template/public/yoga/admin/stats.tpl
+++ b/template/yoga/admin/stats.tpl
diff --git a/template/admin/yoga/admin/tags.tpl b/template/yoga/admin/tags.tpl
index 8fe666b59..8fe666b59 100644
--- a/template/admin/yoga/admin/tags.tpl
+++ b/template/yoga/admin/tags.tpl
diff --git a/template/public/yoga/admin/thumbnail.tpl b/template/yoga/admin/thumbnail.tpl
index cf5345d43..cf5345d43 100644
--- a/template/public/yoga/admin/thumbnail.tpl
+++ b/template/yoga/admin/thumbnail.tpl
diff --git a/template/admin/yoga/admin/user_list.tpl b/template/yoga/admin/user_list.tpl
index e6c1e81b6..e6c1e81b6 100644
--- a/template/admin/yoga/admin/user_list.tpl
+++ b/template/yoga/admin/user_list.tpl
diff --git a/template/admin/yoga/admin/user_perm.tpl b/template/yoga/admin/user_perm.tpl
index a24fd9096..a24fd9096 100644
--- a/template/admin/yoga/admin/user_perm.tpl
+++ b/template/yoga/admin/user_perm.tpl
diff --git a/template/public/yoga/admin/waiting.tpl b/template/yoga/admin/waiting.tpl
index b48aa314b..b48aa314b 100644
--- a/template/public/yoga/admin/waiting.tpl
+++ b/template/yoga/admin/waiting.tpl