plegall 5f597c2cba merge r6361 from branch 2.1 to trunk ...

feature 1697: ability to deactivate the synchronization method to add photos.


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

2010-05-26 00:20:07 +00:00

..

cat_modify.html

merge -3083 + update ES

2009-01-17 15:43:51 +00:00

cat_move.html

merge -3083 + update ES

2009-01-17 15:43:51 +00:00

cat_options.html

merge -3083 + update ES

2009-01-17 15:43:51 +00:00

cat_perm.html

merge -3083 + update ES

2009-01-17 15:43:51 +00:00

configuration.html

copy all languages (exceptions are en_UK and fr_FR) from branch 2.0 to trunk,

2010-03-24 19:34:41 +00:00

extend_for_templates.html

copy all languages (exceptions are en_UK and fr_FR) from branch 2.0 to trunk,

2010-03-24 19:34:41 +00:00

group_list.html

merge -3083 + update ES

2009-01-17 15:43:51 +00:00

help_add_photos.html

merge r6361 from branch 2.1 to trunk

2010-05-26 00:20:07 +00:00

help_groups.html

i18n: apply help.html dispatch to all languages having the help.html filled for 2.0

2010-04-01 12:24:20 +00:00

help_misc.html

i18n: apply help.html dispatch to all languages having the help.html filled for 2.0

2010-04-01 12:24:20 +00:00

help_permissions.html

the new text was not a replacement for the previous text, it was an addition :-)

2010-05-05 20:45:37 +00:00

help_user_upload.html

i18n: apply help.html dispatch to all languages having the help.html filled for 2.0

2010-04-01 12:24:20 +00:00

help_virtual_links.html

i18n: apply help.html dispatch to all languages having the help.html filled for 2.0

2010-04-01 12:24:20 +00:00

history.html

merge -3083 + update ES

2009-01-17 15:43:51 +00:00

index.php

merge -3083 + update ES

2009-01-17 15:43:51 +00:00

maintenance.html

feature 1587: move advanced features screen into maintenance screen.

2010-04-09 21:38:16 +00:00

notification_by_mail.html

merge -3083 + update ES

2009-01-17 15:43:51 +00:00

permalinks.html

merge -3083 + update ES

2009-01-17 15:43:51 +00:00

photos_add_ftp.html

i18n: apply help.html dispatch to all languages having the help.html filled for 2.0

2010-04-01 12:24:20 +00:00

search.html

merge -3083 + update ES

2009-01-17 15:43:51 +00:00

site_manager.html

merge -3083 + update ES

2009-01-17 15:43:51 +00:00

synchronize.html

merge -3083 + update ES

2009-01-17 15:43:51 +00:00

thumbnail.html

merge -3083 + update ES

2009-01-17 15:43:51 +00:00

user_list.html

merge -3083 + update ES

2009-01-17 15:43:51 +00:00