From 11fd179d6d633fabd0cdc7299920d76ebbff7946 Mon Sep 17 00:00:00 2001 From: Jimmy Monin Date: Sat, 27 Aug 2016 21:53:29 +0200 Subject: [PATCH] update to piwigo 2.8.2 --- sources/LICENSE.txt | 339 ++ sources/README.md | 52 + sources/about.php | 2 +- sources/action.php | 45 +- sources/admin.php | 15 +- sources/admin/album.php | 2 +- sources/admin/album_notification.php | 219 +- sources/admin/batch_manager.php | 27 +- sources/admin/batch_manager_global.php | 9 +- sources/admin/batch_manager_unit.php | 2 +- sources/admin/cat_list.php | 4 +- sources/admin/cat_modify.php | 35 +- sources/admin/cat_move.php | 2 +- sources/admin/cat_options.php | 2 +- sources/admin/cat_perm.php | 2 +- sources/admin/comments.php | 2 +- sources/admin/configuration.php | 5 +- sources/admin/element_set_ranks.php | 34 +- sources/admin/extend_for_templates.php | 2 +- sources/admin/group_list.php | 2 +- sources/admin/group_perm.php | 2 +- sources/admin/help.php | 2 +- sources/admin/history.php | 4 +- sources/admin/include/add_core_tabs.inc.php | 2 +- sources/admin/include/albums_tab.inc.php | 2 +- sources/admin/include/c13y_internal.class.php | 4 +- .../admin/include/check_integrity.class.php | 4 +- .../configuration_sizes_process.inc.php | 2 +- .../configuration_watermark_process.inc.php | 4 +- sources/admin/include/functions.php | 125 +- .../admin/include/functions_history.inc.php | 2 +- .../admin/include/functions_install.inc.php | 2 +- sources/admin/include/functions_metadata.php | 72 +- .../functions_notification_by_mail.inc.php | 16 +- .../admin/include/functions_permalinks.php | 2 +- .../admin/include/functions_plugins.inc.php | 2 +- sources/admin/include/functions_upgrade.php | 9 +- .../admin/include/functions_upload.inc.php | 271 +- sources/admin/include/image.class.php | 10 +- sources/admin/include/index.php | 2 +- sources/admin/include/languages.class.php | 6 +- sources/admin/include/mysqldump.php | 4 +- sources/admin/include/pclzip.lib.php | 2 +- .../include/photos_add_direct_prepare.inc.php | 31 +- sources/admin/include/plugins.class.php | 6 +- sources/admin/include/tabsheet.class.php | 4 +- sources/admin/include/themes.class.php | 6 +- sources/admin/include/updates.class.php | 24 +- sources/admin/index.php | 2 +- sources/admin/intro.php | 2 +- sources/admin/languages.php | 2 +- sources/admin/languages_installed.php | 2 +- sources/admin/languages_new.php | 2 +- sources/admin/maintenance.php | 42 +- sources/admin/menubar.php | 2 +- sources/admin/notification_by_mail.php | 34 +- sources/admin/permalinks.php | 2 +- sources/admin/photo.php | 2 +- sources/admin/photos_add.php | 2 +- sources/admin/photos_add_applications.php | 2 +- sources/admin/photos_add_direct.php | 2 +- sources/admin/photos_add_ftp.php | 2 +- sources/admin/picture_coi.php | 2 +- sources/admin/picture_modify.php | 21 +- sources/admin/plugin.php | 4 +- sources/admin/plugins.php | 2 +- sources/admin/plugins_installed.php | 2 +- sources/admin/plugins_new.php | 2 +- sources/admin/popuphelp.php | 2 +- sources/admin/profile.php | 2 +- sources/admin/rating.php | 2 +- sources/admin/rating_user.php | 2 +- sources/admin/site_manager.php | 2 +- sources/admin/site_reader_local.php | 35 +- sources/admin/site_update.php | 135 +- sources/admin/stats.php | 2 +- sources/admin/tags.php | 2 +- sources/admin/theme.php | 2 +- sources/admin/themes.php | 2 +- sources/admin/themes/clear/icon/index.php | 2 +- sources/admin/themes/clear/index.php | 2 +- .../admin/themes/default/fontello/README.txt | 24 +- .../admin/themes/default/fontello/config.json | 6 + .../default/fontello/css/fontello-codes.css | 1 + .../fontello/css/fontello-embedded.css | 13 +- .../fontello/css/fontello-ie7-codes.css | 1 + .../default/fontello/css/fontello-ie7.css | 1 + .../themes/default/fontello/css/fontello.css | 19 +- .../admin/themes/default/fontello/demo.html | 183 +- .../themes/default/fontello/font/fontello.eot | Bin 19028 -> 19304 bytes .../themes/default/fontello/font/fontello.svg | 91 +- .../themes/default/fontello/font/fontello.ttf | Bin 18860 -> 19136 bytes .../default/fontello/font/fontello.woff | Bin 12100 -> 12360 bytes sources/admin/themes/default/icon/index.php | 2 +- sources/admin/themes/default/index.php | 2 +- .../themes/default/js/batchManagerGlobal.js | 2 +- .../admin/themes/default/template/admin.tpl | 3 + .../default/template/album_notification.tpl | 110 +- .../default/template/batch_manager_global.tpl | 32 +- .../default/template/batch_manager_unit.tpl | 4 +- .../themes/default/template/cat_modify.tpl | 80 +- .../template/configuration_watermark.tpl | 7 + .../default/template/notification_by_mail.tpl | 10 + .../default/template/photos_add_direct.tpl | 22 +- .../default/template/picture_modify.tpl | 5 +- .../themes/default/template/user_list.tpl | 90 +- sources/admin/themes/default/theme.css | 22 +- sources/admin/themes/roma/index.php | 2 +- sources/admin/themes/roma/theme.css | 4 +- sources/admin/themes_installed.php | 2 +- sources/admin/themes_new.php | 2 +- sources/admin/updates.php | 2 +- sources/admin/updates_ext.php | 2 +- sources/admin/updates_pwg.php | 2 +- sources/admin/user_list.php | 14 +- sources/admin/user_list_backend.php | 2 +- sources/admin/user_perm.php | 2 +- sources/comments.php | 2 +- sources/doc/index.php | 2 +- sources/feed.php | 2 +- sources/galleries/index.php | 30 + sources/i.php | 95 +- sources/identification.php | 2 +- sources/include/Logger.class.php | 489 ++ sources/include/block.class.php | 2 +- sources/include/cache.class.php | 2 +- sources/include/calendar_base.class.php | 4 +- sources/include/calendar_monthly.class.php | 2 +- sources/include/calendar_weekly.class.php | 2 +- sources/include/category_cats.inc.php | 2 +- sources/include/category_default.inc.php | 2 +- sources/include/common.inc.php | 28 +- sources/include/config_default.inc.php | 56 +- sources/include/constants.php | 8 +- .../include/dblayer/functions_mysql.inc.php | 4 +- .../include/dblayer/functions_mysqli.inc.php | 8 +- sources/include/derivative.inc.php | 2 +- sources/include/derivative_params.inc.php | 2 +- sources/include/derivative_std_params.inc.php | 6 +- sources/include/filter.inc.php | 2 +- sources/include/functions.inc.php | 67 +- sources/include/functions_calendar.inc.php | 2 +- sources/include/functions_category.inc.php | 12 +- sources/include/functions_comment.inc.php | 2 +- sources/include/functions_cookie.inc.php | 2 +- sources/include/functions_filter.inc.php | 2 +- sources/include/functions_html.inc.php | 29 +- sources/include/functions_mail.inc.php | 51 +- sources/include/functions_metadata.inc.php | 2 +- .../include/functions_notification.inc.php | 69 +- sources/include/functions_picture.inc.php | 2 +- sources/include/functions_plugins.inc.php | 2 +- sources/include/functions_rate.inc.php | 2 +- sources/include/functions_search.inc.php | 58 +- sources/include/functions_session.inc.php | 59 +- sources/include/functions_tag.inc.php | 2 +- sources/include/functions_url.inc.php | 25 +- sources/include/functions_user.inc.php | 178 +- sources/include/index.php | 2 +- sources/include/inflectors/en.php | 2 +- sources/include/inflectors/fr.php | 2 +- sources/include/menubar.inc.php | 2 +- sources/include/no_photo_yet.inc.php | 2 +- sources/include/page_header.php | 2 +- sources/include/page_tail.php | 2 +- sources/include/passwordhash.class.php | 57 +- sources/include/php_compat/index.php | 2 +- sources/include/picture_comment.inc.php | 2 +- sources/include/picture_metadata.inc.php | 2 +- sources/include/picture_rate.inc.php | 2 +- .../random_compat/byte_safe_strings.php | 181 + sources/include/random_compat/cast_to_int.php | 71 + .../include/random_compat/error_polyfill.php | 42 + sources/include/random_compat/random.php | 197 + .../random_compat/random_bytes_com_dotnet.php | 81 + .../random_bytes_dev_urandom.php | 148 + .../random_compat/random_bytes_libsodium.php | 86 + .../random_bytes_libsodium_legacy.php | 86 + .../random_compat/random_bytes_mcrypt.php | 76 + sources/include/random_compat/random_int.php | 191 + sources/include/section_init.inc.php | 2 +- sources/include/smarty/.gitattributes | 22 + sources/include/smarty/.gitignore | 221 + sources/include/smarty/.travis.yml | 25 + .../include/smarty/COMPOSER_RELEASE_NOTES.txt | 29 + .../smarty/INHERITANCE_RELEASE_NOTES.txt | 67 + sources/include/smarty/NEW_FEATURES.txt | 133 + sources/include/smarty/README | 13 +- sources/include/smarty/README.md | 65 + sources/include/smarty/SMARTY_3.1_NOTES.txt | 2 +- sources/include/smarty/change_log.txt | 733 ++- sources/include/smarty/composer.json | 43 + .../smarty_internal_configfilelexer.plex | 318 + .../lexer/smarty_internal_configfileparser.y | 362 ++ .../lexer/smarty_internal_templatelexer.plex | 672 +++ .../lexer/smarty_internal_templateparser.y | 1352 +++++ sources/include/smarty/libs/Autoloader.php | 124 + sources/include/smarty/libs/Smarty.class.php | 1544 +++-- .../include/smarty/libs/SmartyBC.class.php | 115 +- sources/include/smarty/libs/debug.tpl | 239 +- .../smarty/libs/plugins/block.textformat.php | 21 +- .../smarty/libs/plugins/function.counter.php | 40 +- .../smarty/libs/plugins/function.cycle.php | 47 +- .../smarty/libs/plugins/function.fetch.php | 117 +- .../libs/plugins/function.html_checkboxes.php | 78 +- .../libs/plugins/function.html_image.php | 68 +- .../libs/plugins/function.html_options.php | 81 +- .../libs/plugins/function.html_radios.php | 76 +- .../plugins/function.html_select_date.php | 169 +- .../plugins/function.html_select_time.php | 72 +- .../libs/plugins/function.html_table.php | 45 +- .../smarty/libs/plugins/function.mailto.php | 45 +- .../smarty/libs/plugins/function.math.php | 54 +- .../libs/plugins/modifier.capitalize.php | 59 +- .../libs/plugins/modifier.date_format.php | 36 +- .../libs/plugins/modifier.debug_print_var.php | 75 +- .../smarty/libs/plugins/modifier.escape.php | 32 +- .../libs/plugins/modifier.regex_replace.php | 35 +- .../smarty/libs/plugins/modifier.replace.php | 23 +- .../smarty/libs/plugins/modifier.spacify.php | 18 +- .../smarty/libs/plugins/modifier.truncate.php | 33 +- .../libs/plugins/modifiercompiler.cat.php | 15 +- .../modifiercompiler.count_characters.php | 11 +- .../modifiercompiler.count_paragraphs.php | 13 +- .../modifiercompiler.count_sentences.php | 13 +- .../plugins/modifiercompiler.count_words.php | 13 +- .../libs/plugins/modifiercompiler.default.php | 14 +- .../libs/plugins/modifiercompiler.escape.php | 75 +- .../plugins/modifiercompiler.from_charset.php | 9 +- .../libs/plugins/modifiercompiler.indent.php | 13 +- .../libs/plugins/modifiercompiler.lower.php | 14 +- .../libs/plugins/modifiercompiler.noprint.php | 8 +- .../modifiercompiler.string_format.php | 11 +- .../libs/plugins/modifiercompiler.strip.php | 12 +- .../plugins/modifiercompiler.strip_tags.php | 16 +- .../plugins/modifiercompiler.to_charset.php | 9 +- .../plugins/modifiercompiler.unescape.php | 9 +- .../libs/plugins/modifiercompiler.upper.php | 19 +- .../plugins/modifiercompiler.wordwrap.php | 31 +- .../plugins/outputfilter.trimwhitespace.php | 38 +- .../plugins/shared.escape_special_chars.php | 26 +- .../plugins/shared.literal_compiler_param.php | 8 +- .../libs/plugins/shared.make_timestamp.php | 19 +- .../libs/plugins/shared.mb_str_replace.php | 20 +- .../smarty/libs/plugins/shared.mb_unicode.php | 22 +- .../libs/plugins/shared.mb_wordwrap.php | 60 +- .../variablefilter.htmlspecialchars.php | 10 +- .../libs/sysplugins/smarty_cacheresource.php | 422 +- .../smarty_cacheresource_custom.php | 218 +- .../smarty_cacheresource_keyvaluestore.php | 300 +- .../libs/sysplugins/smarty_config_source.php | 95 - .../smarty/libs/sysplugins/smarty_data.php | 68 + .../smarty_internal_cacheresource_file.php | 207 +- .../smarty_internal_compile_append.php | 23 +- .../smarty_internal_compile_assign.php | 82 +- .../smarty_internal_compile_block.php | 446 +- .../smarty_internal_compile_break.php | 40 +- .../smarty_internal_compile_call.php | 77 +- .../smarty_internal_compile_capture.php | 61 +- .../smarty_internal_compile_config_load.php | 73 +- .../smarty_internal_compile_continue.php | 39 +- .../smarty_internal_compile_debug.php | 22 +- .../smarty_internal_compile_eval.php | 26 +- .../smarty_internal_compile_extends.php | 217 +- .../smarty_internal_compile_for.php | 122 +- .../smarty_internal_compile_foreach.php | 354 +- .../smarty_internal_compile_function.php | 232 +- .../sysplugins/smarty_internal_compile_if.php | 247 +- .../smarty_internal_compile_include.php | 427 +- .../smarty_internal_compile_include_php.php | 49 +- .../smarty_internal_compile_insert.php | 59 +- .../smarty_internal_compile_ldelim.php | 27 +- .../smarty_internal_compile_nocache.php | 52 +- ..._internal_compile_private_block_plugin.php | 46 +- ...nternal_compile_private_foreachsection.php | 220 + ...ternal_compile_private_function_plugin.php | 29 +- ...arty_internal_compile_private_modifier.php | 59 +- ..._compile_private_object_block_function.php | 43 +- ...ternal_compile_private_object_function.php | 61 +- .../smarty_internal_compile_private_php.php | 209 + ...ernal_compile_private_print_expression.php | 138 +- ...ernal_compile_private_registered_block.php | 84 +- ...al_compile_private_registered_function.php | 44 +- ...ernal_compile_private_special_variable.php | 191 +- .../smarty_internal_compile_rdelim.php | 26 +- .../smarty_internal_compile_section.php | 441 +- .../smarty_internal_compile_setfilter.php | 48 +- ...ty_internal_compile_shared_inheritance.php | 46 + .../smarty_internal_compile_while.php | 78 +- .../smarty_internal_compilebase.php | 62 +- .../sysplugins/smarty_internal_config.php | 302 - .../smarty_internal_config_file_compiler.php | 120 +- .../smarty_internal_configfilelexer.php | 797 +-- .../smarty_internal_configfileparser.php | 927 +-- .../libs/sysplugins/smarty_internal_data.php | 594 +- .../libs/sysplugins/smarty_internal_debug.php | 422 +- .../smarty_internal_extension_clear.php | 126 + .../smarty_internal_extension_handler.php | 157 + .../smarty_internal_filter_handler.php | 70 - .../smarty_internal_function_call_handler.php | 55 - .../smarty_internal_get_include_path.php | 48 - ...rty_internal_method_addautoloadfilters.php | 51 + ...ty_internal_method_adddefaultmodifiers.php | 42 + .../smarty_internal_method_append.php | 74 + .../smarty_internal_method_appendbyref.php | 50 + .../smarty_internal_method_assignbyref.php | 36 + .../smarty_internal_method_assignglobal.php | 43 + .../smarty_internal_method_clearallassign.php | 37 + .../smarty_internal_method_clearallcache.php | 40 + .../smarty_internal_method_clearassign.php | 44 + .../smarty_internal_method_clearcache.php | 43 + ..._internal_method_clearcompiledtemplate.php | 124 + .../smarty_internal_method_clearconfig.php | 41 + ...marty_internal_method_compileallconfig.php | 32 + ...ty_internal_method_compilealltemplates.php | 111 + .../smarty_internal_method_configload.php | 182 + .../smarty_internal_method_createdata.php | 44 + ...rty_internal_method_getautoloadfilters.php | 37 + .../smarty_internal_method_getconfigvars.php | 58 + ...marty_internal_method_getdebugtemplate.php | 35 + ...ty_internal_method_getdefaultmodifiers.php | 35 + ...ty_internal_method_getregisteredobject.php | 44 + ...arty_internal_method_getstreamvariable.php | 51 + .../smarty_internal_method_gettags.php | 62 + ...smarty_internal_method_gettemplatevars.php | 114 + .../smarty_internal_method_loadfilter.php | 77 + .../smarty_internal_method_loadplugin.php | 111 + .../smarty_internal_method_mustcompile.php | 49 + ..._internal_method_registercacheresource.php | 39 + .../smarty_internal_method_registerclass.php | 46 + ...al_method_registerdefaultconfighandler.php | 42 + ...al_method_registerdefaultpluginhandler.php | 43 + ..._method_registerdefaulttemplatehandler.php | 72 + .../smarty_internal_method_registerfilter.php | 88 + .../smarty_internal_method_registerobject.php | 71 + .../smarty_internal_method_registerplugin.php | 50 + ...marty_internal_method_registerresource.php | 44 + ...rty_internal_method_setautoloadfilters.php | 70 + ...marty_internal_method_setdebugtemplate.php | 41 + ...ty_internal_method_setdefaultmodifiers.php | 38 + .../smarty_internal_method_unloadfilter.php | 42 + ...nternal_method_unregistercacheresource.php | 40 + ...marty_internal_method_unregisterfilter.php | 42 + ...marty_internal_method_unregisterobject.php | 40 + ...marty_internal_method_unregisterplugin.php | 41 + ...rty_internal_method_unregisterresource.php | 40 + .../smarty_internal_nocache_insert.php | 32 +- .../sysplugins/smarty_internal_parsetree.php | 377 +- .../smarty_internal_parsetree_code.php | 42 + .../smarty_internal_parsetree_dq.php | 88 + .../smarty_internal_parsetree_dqcontent.php | 42 + .../smarty_internal_parsetree_tag.php | 69 + .../smarty_internal_parsetree_template.php | 128 + .../smarty_internal_parsetree_text.php | 40 + .../smarty_internal_resource_eval.php | 56 +- .../smarty_internal_resource_extends.php | 188 +- .../smarty_internal_resource_file.php | 155 +- .../smarty_internal_resource_php.php | 108 +- .../smarty_internal_resource_registered.php | 52 +- .../smarty_internal_resource_stream.php | 83 +- .../smarty_internal_resource_string.php | 57 +- .../smarty_internal_runtime_cachemodify.php | 67 + .../smarty_internal_runtime_codeframe.php | 94 + .../smarty_internal_runtime_filterhandler.php | 73 + .../smarty_internal_runtime_foreach.php | 47 + ...smarty_internal_runtime_getincludepath.php | 180 + .../smarty_internal_runtime_hhvm.php | 30 + .../smarty_internal_runtime_inheritance.php | 233 + .../smarty_internal_runtime_subtemplate.php | 203 + .../smarty_internal_runtime_tplfunction.php | 97 + .../smarty_internal_runtime_updatecache.php | 170 + .../smarty_internal_runtime_updatescope.php | 55 + ...arty_internal_runtime_validatecompiled.php | 86 + .../smarty_internal_runtime_var.php | 33 + ... => smarty_internal_runtime_writefile.php} | 54 +- ...smarty_internal_smartytemplatecompiler.php | 156 +- .../sysplugins/smarty_internal_template.php | 762 +-- .../smarty_internal_templatebase.php | 967 +--- .../smarty_internal_templatecompilerbase.php | 1002 +++- .../smarty_internal_templatelexer.php | 1842 +++--- .../smarty_internal_templateparser.php | 5139 ++++++++--------- .../smarty_internal_testinstall.php | 604 ++ .../sysplugins/smarty_internal_undefined.php | 48 + .../sysplugins/smarty_internal_utility.php | 830 --- .../libs/sysplugins/smarty_resource.php | 817 +-- .../sysplugins/smarty_resource_custom.php | 41 +- .../sysplugins/smarty_resource_recompiled.php | 31 +- .../sysplugins/smarty_resource_uncompiled.php | 57 +- .../libs/sysplugins/smarty_security.php | 566 +- .../sysplugins/smarty_template_cached.php | 246 + .../sysplugins/smarty_template_compiled.php | 297 + .../sysplugins/smarty_template_config.php | 97 + .../smarty_template_resource_base.php | 155 + .../sysplugins/smarty_template_source.php | 267 + .../sysplugins/smarty_undefined_variable.php | 37 + .../libs/sysplugins/smarty_variable.php | 47 + .../sysplugins/smartycompilerexception.php | 39 + .../libs/sysplugins/smartyexception.php | 15 + sources/include/srand.php | 149 + sources/include/template.class.php | 4 +- sources/include/user.inc.php | 12 +- sources/include/ws_core.inc.php | 12 +- sources/include/ws_functions.inc.php | 25 +- sources/include/ws_functions/index.php | 2 +- .../include/ws_functions/pwg.categories.php | 137 +- .../include/ws_functions/pwg.extensions.php | 2 +- sources/include/ws_functions/pwg.groups.php | 2 +- sources/include/ws_functions/pwg.images.php | 124 +- .../include/ws_functions/pwg.permissions.php | 2 +- sources/include/ws_functions/pwg.php | 4 +- sources/include/ws_functions/pwg.tags.php | 10 +- sources/include/ws_functions/pwg.users.php | 28 +- sources/include/ws_protocols/index.php | 2 +- sources/include/ws_protocols/json_encoder.php | 2 +- sources/include/ws_protocols/php_encoder.php | 2 +- sources/include/ws_protocols/rest_encoder.php | 4 +- sources/include/ws_protocols/rest_handler.php | 2 +- .../include/ws_protocols/xmlrpc_encoder.php | 2 +- sources/index.php | 2 +- sources/install.php | 15 +- sources/install/db/100-database.php | 2 +- sources/install/db/101-database.php | 2 +- sources/install/db/102-database.php | 2 +- sources/install/db/103-database.php | 2 +- sources/install/db/104-database.php | 2 +- sources/install/db/105-database.php | 2 +- sources/install/db/106-database.php | 2 +- sources/install/db/107-database.php | 2 +- sources/install/db/108-database.php | 2 +- sources/install/db/109-database.php | 2 +- sources/install/db/110-database.php | 2 +- sources/install/db/111-database.php | 2 +- sources/install/db/112-database.php | 2 +- sources/install/db/113-database.php | 2 +- sources/install/db/114-database.php | 2 +- sources/install/db/115-database.php | 2 +- sources/install/db/116-database.php | 2 +- sources/install/db/117-database.php | 2 +- sources/install/db/118-database.php | 2 +- sources/install/db/119-database.php | 2 +- sources/install/db/120-database.php | 2 +- sources/install/db/121-database.php | 2 +- sources/install/db/122-database.php | 2 +- sources/install/db/123-database.php | 2 +- sources/install/db/124-database.php | 2 +- sources/install/db/125-database.php | 2 +- sources/install/db/126-database.php | 2 +- sources/install/db/127-database.php | 2 +- sources/install/db/128-database.php | 2 +- sources/install/db/129-database.php | 2 +- sources/install/db/130-database.php | 2 +- sources/install/db/131-database.php | 2 +- sources/install/db/132-database.php | 2 +- sources/install/db/133-database.php | 2 +- sources/install/db/134-database.php | 2 +- sources/install/db/135-database.php | 2 +- sources/install/db/136-database.php | 2 +- sources/install/db/137-database.php | 2 +- sources/install/db/138-database.php | 2 +- sources/install/db/139-database.php | 2 +- sources/install/db/140-database.php | 2 +- sources/install/db/141-database.php | 2 +- sources/install/db/142-database.php | 2 +- sources/install/db/143-database.php | 2 +- sources/install/db/144-database.php | 2 +- sources/install/db/145-database.php | 44 + sources/install/db/146-database.php | 39 + sources/install/db/147-database.php | 46 + sources/install/db/148-database.php | 39 + sources/install/db/61-database.php | 2 +- sources/install/db/62-database.php | 2 +- sources/install/db/63-database.php | 2 +- sources/install/db/64-database.php | 2 +- sources/install/db/65-database.php | 2 +- sources/install/db/66-database.php | 2 +- sources/install/db/67-database.php | 2 +- sources/install/db/68-database.php | 2 +- sources/install/db/69-database.php | 2 +- sources/install/db/70-database.php | 2 +- sources/install/db/71-database.php | 2 +- sources/install/db/72-database.php | 2 +- sources/install/db/73-database.php | 2 +- sources/install/db/74-database.php | 2 +- sources/install/db/75-database.php | 2 +- sources/install/db/76-database.php | 2 +- sources/install/db/77-database.php | 2 +- sources/install/db/78-database.php | 2 +- sources/install/db/79-database.php | 2 +- sources/install/db/80-database.php | 2 +- sources/install/db/81-database.php | 2 +- sources/install/db/82-database.php | 2 +- sources/install/db/83-database.php | 2 +- sources/install/db/84-database.php | 2 +- sources/install/db/85-database.php | 2 +- sources/install/db/86-database.php | 2 +- sources/install/db/87-database.php | 2 +- sources/install/db/88-database.php | 2 +- sources/install/db/89-database.php | 2 +- sources/install/db/90-database.php | 2 +- sources/install/db/91-database.php | 2 +- sources/install/db/92-database.php | 2 +- sources/install/db/93-database.php | 2 +- sources/install/db/94-database.php | 2 +- sources/install/db/95-database.php | 2 +- sources/install/db/96-database.php | 2 +- sources/install/db/97-database.php | 2 +- sources/install/db/98-database.php | 2 +- sources/install/db/99-database.php | 2 +- sources/install/db/index.php | 2 +- sources/install/hosting.php | 2 +- sources/install/index.php | 2 +- sources/install/php5_apache_configuration.php | 2 +- sources/install/piwigo_structure-mysql.sql | 44 +- sources/install/upgrade_1.3.0.php | 2 +- sources/install/upgrade_1.3.1.php | 2 +- sources/install/upgrade_1.4.0.php | 2 +- sources/install/upgrade_1.5.0.php | 2 +- sources/install/upgrade_1.6.0.php | 2 +- sources/install/upgrade_1.6.2.php | 2 +- sources/install/upgrade_1.7.0.php | 2 +- sources/install/upgrade_2.0.0.php | 2 +- sources/install/upgrade_2.1.0.php | 2 +- sources/install/upgrade_2.2.0.php | 2 +- sources/install/upgrade_2.3.0.php | 2 +- sources/install/upgrade_2.4.0.php | 2 +- sources/install/upgrade_2.5.0.php | 2 +- sources/install/upgrade_2.6.0.php | 7 +- sources/install/upgrade_2.7.0.php | 126 + sources/language/af_ZA/admin.lang.php | 2 +- sources/language/af_ZA/common.lang.php | 4 +- sources/language/af_ZA/index.php | 2 +- sources/language/af_ZA/install.lang.php | 15 +- sources/language/af_ZA/upgrade.lang.php | 2 +- sources/language/ar_EG/ar_EG.jpg | Bin 0 -> 1031 bytes sources/language/ar_EG/common.lang.php | 429 ++ sources/language/ar_EG/index.php | 30 + sources/language/ar_EG/install.lang.php | 70 + sources/language/ar_EG/iso.txt | 1 + sources/language/ar_MA/common.lang.php | 4 +- sources/language/ar_MA/index.php | 2 +- sources/language/ar_SA/admin.lang.php | 15 +- sources/language/ar_SA/common.lang.php | 9 +- .../language/ar_SA/help/photos_add_ftp.html | 70 +- sources/language/ar_SA/index.php | 2 +- sources/language/ar_SA/install.lang.php | 15 +- sources/language/ar_SA/upgrade.lang.php | 2 +- sources/language/az_AZ/common.lang.php | 4 +- sources/language/bg_BG/admin.lang.php | 14 +- sources/language/bg_BG/common.lang.php | 7 +- sources/language/bg_BG/help/group_list.html | 22 + sources/language/bg_BG/help/help_groups.html | 11 + sources/language/bg_BG/help/help_misc.html | 7 + sources/language/bg_BG/install.lang.php | 2 +- sources/language/bg_BG/upgrade.lang.php | 2 +- sources/language/bn_IN/common.lang.php | 25 +- sources/language/br_FR/admin.lang.php | 496 +- sources/language/br_FR/common.lang.php | 28 +- sources/language/br_FR/install.lang.php | 15 +- sources/language/br_FR/upgrade.lang.php | 2 +- sources/language/ca_ES/admin.lang.php | 17 +- sources/language/ca_ES/common.lang.php | 7 +- .../language/ca_ES/help/photos_add_ftp.html | 49 +- sources/language/ca_ES/install.lang.php | 15 +- sources/language/ca_ES/upgrade.lang.php | 2 +- sources/language/cs_CZ/admin.lang.php | 13 +- sources/language/cs_CZ/common.lang.php | 7 +- sources/language/cs_CZ/help/index.php | 2 +- .../language/cs_CZ/help/photos_add_ftp.html | 147 +- sources/language/cs_CZ/index.php | 2 +- sources/language/cs_CZ/install.lang.php | 16 +- sources/language/cs_CZ/upgrade.lang.php | 2 +- sources/language/da_DK/admin.lang.php | 19 +- sources/language/da_DK/common.lang.php | 11 +- .../language/da_DK/help/photos_add_ftp.html | 47 +- sources/language/da_DK/index.php | 2 +- sources/language/da_DK/install.lang.php | 15 +- sources/language/da_DK/upgrade.lang.php | 2 +- sources/language/de_DE/about.html | 1 + sources/language/de_DE/admin.lang.php | 75 +- sources/language/de_DE/common.lang.php | 67 +- sources/language/de_DE/help/index.php | 2 +- .../language/de_DE/help/photos_add_ftp.html | 47 +- sources/language/de_DE/index.php | 2 +- sources/language/de_DE/install.lang.php | 14 +- sources/language/de_DE/upgrade.lang.php | 2 +- sources/language/dv_MV/common.lang.php | 4 +- sources/language/dv_MV/index.php | 2 +- sources/language/el_GR/admin.lang.php | 13 +- sources/language/el_GR/common.lang.php | 5 +- .../language/el_GR/help/photos_add_ftp.html | 147 +- sources/language/el_GR/index.php | 2 +- sources/language/el_GR/install.lang.php | 15 +- sources/language/el_GR/upgrade.lang.php | 2 +- sources/language/en_GB/admin.lang.php | 24 +- sources/language/en_GB/common.lang.php | 4 +- sources/language/en_GB/index.php | 2 +- sources/language/en_GB/install.lang.php | 2 +- sources/language/en_UK/admin.lang.php | 15 +- sources/language/en_UK/common.lang.php | 5 +- sources/language/en_UK/help/index.php | 2 +- .../language/en_UK/help/photos_add_ftp.html | 23 +- sources/language/en_UK/help/quick_search.html | 7 + sources/language/en_UK/index.php | 2 +- sources/language/en_UK/install.lang.php | 15 +- sources/language/en_UK/upgrade.lang.php | 2 +- sources/language/en_US/admin.lang.php | 2 +- sources/language/en_US/common.lang.php | 4 +- sources/language/en_US/index.php | 2 +- sources/language/eo_EO/admin.lang.php | 2 +- sources/language/eo_EO/common.lang.php | 4 +- sources/language/eo_EO/help/help_misc.html | 9 + sources/language/eo_EO/install.lang.php | 15 +- sources/language/eo_EO/upgrade.lang.php | 2 +- sources/language/es_AR/common.lang.php | 12 +- sources/language/es_AR/index.php | 2 +- sources/language/es_ES/admin.lang.php | 13 +- sources/language/es_ES/common.lang.php | 7 +- sources/language/es_ES/help/index.php | 2 +- .../language/es_ES/help/photos_add_ftp.html | 51 +- sources/language/es_ES/index.php | 2 +- sources/language/es_ES/install.lang.php | 12 +- sources/language/es_ES/upgrade.lang.php | 2 +- sources/language/es_MX/common.lang.php | 4 +- sources/language/es_MX/install.lang.php | 2 +- sources/language/et_EE/admin.lang.php | 2 +- sources/language/et_EE/common.lang.php | 4 +- sources/language/et_EE/install.lang.php | 15 +- sources/language/et_EE/upgrade.lang.php | 2 +- sources/language/eu_ES/common.lang.php | 4 +- sources/language/fa_IR/admin.lang.php | 13 +- sources/language/fa_IR/common.lang.php | 7 +- sources/language/fa_IR/index.php | 2 +- sources/language/fa_IR/install.lang.php | 15 +- sources/language/fa_IR/upgrade.lang.php | 2 +- sources/language/fi_FI/admin.lang.php | 54 +- sources/language/fi_FI/common.lang.php | 7 +- sources/language/fi_FI/install.lang.php | 15 +- sources/language/fi_FI/upgrade.lang.php | 2 +- sources/language/fr_CA/admin.lang.php | 20 +- sources/language/fr_CA/common.lang.php | 12 +- sources/language/fr_CA/help/index.php | 2 +- .../language/fr_CA/help/photos_add_ftp.html | 95 +- sources/language/fr_CA/index.php | 2 +- sources/language/fr_CA/install.lang.php | 15 +- sources/language/fr_CA/upgrade.lang.php | 2 +- sources/language/fr_FR/admin.lang.php | 19 +- sources/language/fr_FR/common.lang.php | 7 +- sources/language/fr_FR/help/index.php | 2 +- .../language/fr_FR/help/photos_add_ftp.html | 21 +- sources/language/fr_FR/index.php | 2 +- sources/language/fr_FR/install.lang.php | 15 +- sources/language/fr_FR/upgrade.lang.php | 2 +- sources/language/ga_IE/common.lang.php | 4 +- sources/language/gl_ES/admin.lang.php | 12 +- sources/language/gl_ES/common.lang.php | 7 +- .../language/gl_ES/help/photos_add_ftp.html | 21 +- sources/language/gl_ES/install.lang.php | 15 +- sources/language/gl_ES/upgrade.lang.php | 2 +- sources/language/gu_IN/common.lang.php | 16 +- sources/language/he_IL/admin.lang.php | 1161 ++-- sources/language/he_IL/common.lang.php | 377 +- sources/language/he_IL/install.lang.php | 12 +- sources/language/he_IL/upgrade.lang.php | 13 +- sources/language/hr_HR/admin.lang.php | 2 +- sources/language/hr_HR/common.lang.php | 4 +- sources/language/hr_HR/help/index.php | 2 +- sources/language/hr_HR/index.php | 2 +- sources/language/hr_HR/install.lang.php | 15 +- sources/language/hr_HR/upgrade.lang.php | 2 +- sources/language/hu_HU/admin.lang.php | 13 +- sources/language/hu_HU/common.lang.php | 7 +- sources/language/hu_HU/help/index.php | 2 +- .../language/hu_HU/help/photos_add_ftp.html | 63 +- sources/language/hu_HU/index.php | 2 +- sources/language/hu_HU/install.lang.php | 12 +- sources/language/hu_HU/upgrade.lang.php | 2 +- sources/language/id_ID/common.lang.php | 17 +- sources/language/id_ID/index.php | 2 +- sources/language/id_ID/install.lang.php | 49 + sources/language/index.php | 2 +- sources/language/is_IS/common.lang.php | 4 +- sources/language/is_IS/index.php | 2 +- sources/language/it_IT/admin.lang.php | 14 +- sources/language/it_IT/common.lang.php | 7 +- sources/language/it_IT/help/index.php | 2 +- .../language/it_IT/help/photos_add_ftp.html | 13 +- sources/language/it_IT/index.php | 2 +- sources/language/it_IT/install.lang.php | 15 +- sources/language/it_IT/upgrade.lang.php | 2 +- sources/language/ja_JP/admin.lang.php | 159 +- sources/language/ja_JP/common.lang.php | 9 +- .../language/ja_JP/help/photos_add_ftp.html | 63 +- sources/language/ja_JP/index.php | 2 +- sources/language/ja_JP/install.lang.php | 2 +- sources/language/ja_JP/upgrade.lang.php | 7 +- sources/language/ka_GE/admin.lang.php | 2 +- sources/language/ka_GE/common.lang.php | 4 +- .../language/ka_GE/help/photos_add_ftp.html | 62 +- sources/language/ka_GE/index.php | 2 +- sources/language/ka_GE/install.lang.php | 15 +- sources/language/ka_GE/upgrade.lang.php | 2 +- sources/language/km_KH/admin.lang.php | 19 +- sources/language/km_KH/common.lang.php | 7 +- sources/language/km_KH/index.php | 2 +- sources/language/km_KH/install.lang.php | 32 +- sources/language/km_KH/upgrade.lang.php | 2 +- sources/language/kn_IN/admin.lang.php | 2 +- sources/language/kn_IN/common.lang.php | 4 +- sources/language/kn_IN/install.lang.php | 15 +- sources/language/kn_IN/upgrade.lang.php | 2 +- sources/language/ko_KR/admin.lang.php | 442 +- sources/language/ko_KR/common.lang.php | 34 +- sources/language/ko_KR/install.lang.php | 55 +- sources/language/ko_KR/upgrade.lang.php | 49 +- sources/language/kok_IN/common.lang.php | 4 +- sources/language/lb_LU/common.lang.php | 21 +- sources/language/lt_LT/admin.lang.php | 19 +- sources/language/lt_LT/common.lang.php | 12 +- sources/language/lt_LT/install.lang.php | 15 +- sources/language/lt_LT/upgrade.lang.php | 2 +- sources/language/lv_LV/admin.lang.php | 13 +- sources/language/lv_LV/common.lang.php | 7 +- .../language/lv_LV/help/photos_add_ftp.html | 66 +- sources/language/lv_LV/index.php | 2 +- sources/language/lv_LV/install.lang.php | 15 +- sources/language/lv_LV/upgrade.lang.php | 2 +- sources/language/mk_MK/admin.lang.php | 2 +- sources/language/mk_MK/common.lang.php | 4 +- sources/language/mk_MK/index.php | 2 +- sources/language/mk_MK/install.lang.php | 7 +- sources/language/mn_MN/admin.lang.php | 14 +- sources/language/mn_MN/common.lang.php | 11 +- sources/language/mn_MN/install.lang.php | 11 +- sources/language/mn_MN/upgrade.lang.php | 2 +- sources/language/ms_MY/common.lang.php | 4 +- sources/language/nb_NO/admin.lang.php | 35 +- sources/language/nb_NO/common.lang.php | 59 +- .../language/nb_NO/help/photos_add_ftp.html | 96 +- sources/language/nb_NO/index.php | 2 +- sources/language/nb_NO/install.lang.php | 15 +- sources/language/nb_NO/upgrade.lang.php | 2 +- sources/language/nl_NL/admin.lang.php | 21 +- sources/language/nl_NL/common.lang.php | 15 +- sources/language/nl_NL/help/index.php | 2 +- .../language/nl_NL/help/photos_add_ftp.html | 59 +- sources/language/nl_NL/index.php | 2 +- sources/language/nl_NL/install.lang.php | 15 +- sources/language/nl_NL/upgrade.lang.php | 2 +- sources/language/nn_NO/admin.lang.php | 16 +- sources/language/nn_NO/common.lang.php | 4 +- .../language/nn_NO/help/photos_add_ftp.html | 15 +- sources/language/nn_NO/install.lang.php | 15 +- sources/language/nn_NO/upgrade.lang.php | 2 +- sources/language/pl_PL/admin.lang.php | 2 +- sources/language/pl_PL/common.lang.php | 4 +- .../language/pl_PL/help/photos_add_ftp.html | 15 +- sources/language/pl_PL/index.php | 2 +- sources/language/pl_PL/install.lang.php | 15 +- sources/language/pl_PL/upgrade.lang.php | 2 +- sources/language/pt_BR/about.html | 11 +- sources/language/pt_BR/admin.lang.php | 16 +- sources/language/pt_BR/common.lang.php | 7 +- .../language/pt_BR/help/photos_add_ftp.html | 79 +- sources/language/pt_BR/index.php | 2 +- sources/language/pt_BR/install.lang.php | 12 +- sources/language/pt_BR/upgrade.lang.php | 2 +- sources/language/pt_PT/admin.lang.php | 14 +- sources/language/pt_PT/common.lang.php | 7 +- sources/language/pt_PT/help/cat_options.html | 23 + sources/language/pt_PT/help/cat_perm.html | 11 + sources/language/pt_PT/help/permalinks.html | 7 + .../language/pt_PT/help/photos_add_ftp.html | 78 +- sources/language/pt_PT/index.php | 2 +- sources/language/pt_PT/install.lang.php | 15 +- sources/language/pt_PT/upgrade.lang.php | 2 +- sources/language/ro_RO/admin.lang.php | 13 +- sources/language/ro_RO/common.lang.php | 8 +- sources/language/ro_RO/index.php | 2 +- sources/language/ro_RO/install.lang.php | 15 +- sources/language/ro_RO/upgrade.lang.php | 2 +- sources/language/ru_RU/admin.lang.php | 13 +- sources/language/ru_RU/common.lang.php | 7 +- .../language/ru_RU/help/photos_add_ftp.html | 13 +- sources/language/ru_RU/index.php | 2 +- sources/language/ru_RU/install.lang.php | 15 +- sources/language/ru_RU/upgrade.lang.php | 2 +- sources/language/sh_RS/admin.lang.php | 2 +- sources/language/sh_RS/common.lang.php | 4 +- sources/language/sh_RS/help/index.php | 2 +- sources/language/sh_RS/index.php | 2 +- sources/language/sh_RS/install.lang.php | 12 +- sources/language/sh_RS/upgrade.lang.php | 2 +- sources/language/sk_SK/admin.lang.php | 13 +- sources/language/sk_SK/common.lang.php | 7 +- sources/language/sk_SK/help/index.php | 2 +- .../language/sk_SK/help/photos_add_ftp.html | 80 +- sources/language/sk_SK/index.php | 2 +- sources/language/sk_SK/install.lang.php | 16 +- sources/language/sk_SK/upgrade.lang.php | 2 +- sources/language/sl_SI/admin.lang.php | 34 +- sources/language/sl_SI/common.lang.php | 7 +- sources/language/sl_SI/help/cat_perm.html | 13 + sources/language/sl_SI/help/help_misc.html | 9 + sources/language/sl_SI/install.lang.php | 15 +- sources/language/sl_SI/upgrade.lang.php | 45 +- sources/language/sr_RS/admin.lang.php | 13 +- sources/language/sr_RS/common.lang.php | 7 +- sources/language/sr_RS/index.php | 2 +- sources/language/sr_RS/install.lang.php | 12 +- sources/language/sr_RS/upgrade.lang.php | 2 +- sources/language/sv_SE/admin.lang.php | 13 +- sources/language/sv_SE/common.lang.php | 7 +- sources/language/sv_SE/help/index.php | 2 +- .../language/sv_SE/help/photos_add_ftp.html | 15 +- sources/language/sv_SE/install.lang.php | 15 +- sources/language/sv_SE/upgrade.lang.php | 8 +- sources/language/ta_IN/admin.lang.php | 2 +- sources/language/ta_IN/common.lang.php | 4 +- sources/language/ta_IN/install.lang.php | 15 +- sources/language/ta_IN/upgrade.lang.php | 2 +- sources/language/th_TH/admin.lang.php | 42 +- sources/language/th_TH/common.lang.php | 8 +- sources/language/th_TH/install.lang.php | 15 +- sources/language/th_TH/upgrade.lang.php | 2 +- sources/language/tr_TR/admin.lang.php | 2 +- sources/language/tr_TR/common.lang.php | 7 +- .../language/tr_TR/help/photos_add_ftp.html | 17 +- sources/language/tr_TR/install.lang.php | 15 +- sources/language/tr_TR/upgrade.lang.php | 2 +- sources/language/uk_UA/admin.lang.php | 13 +- sources/language/uk_UA/common.lang.php | 7 +- .../language/uk_UA/help/photos_add_ftp.html | 151 +- sources/language/uk_UA/install.lang.php | 15 +- sources/language/uk_UA/upgrade.lang.php | 2 +- sources/language/vi_VN/admin.lang.php | 5 +- sources/language/vi_VN/common.lang.php | 127 +- sources/language/vi_VN/help/help_misc.html | 9 + sources/language/vi_VN/help/index.php | 2 +- sources/language/vi_VN/install.lang.php | 12 +- sources/language/vi_VN/upgrade.lang.php | 2 +- sources/language/wo_SN/common.lang.php | 4 +- sources/language/zh_CN/admin.lang.php | 19 +- sources/language/zh_CN/common.lang.php | 7 +- .../language/zh_CN/help/photos_add_ftp.html | 77 +- sources/language/zh_CN/install.lang.php | 15 +- sources/language/zh_CN/upgrade.lang.php | 2 +- sources/language/zh_HK/admin.lang.php | 31 +- sources/language/zh_HK/common.lang.php | 7 +- sources/language/zh_HK/index.php | 2 +- sources/language/zh_HK/install.lang.php | 15 +- sources/language/zh_HK/upgrade.lang.php | 2 +- sources/language/zh_TW/admin.lang.php | 2 +- sources/language/zh_TW/common.lang.php | 4 +- .../language/zh_TW/help/photos_add_ftp.html | 30 +- sources/language/zh_TW/install.lang.php | 12 +- sources/language/zh_TW/upgrade.lang.php | 2 +- sources/local/config/index.php | 2 +- sources/local/css/index.php | 2 +- sources/local/index.php | 2 +- sources/local/language/index.php | 2 +- sources/nbm.php | 2 +- sources/notification.php | 2 +- sources/password.php | 4 +- sources/picture.php | 45 +- .../plugins/AdminTools/include/events.inc.php | 7 +- .../AdminTools/language/de_DE/plugin.lang.php | 4 +- .../AdminTools/language/el_GR/plugin.lang.php | 9 +- .../AdminTools/language/ja_JP/plugin.lang.php | 50 +- .../AdminTools/language/mn_MN/plugin.lang.php | 8 +- .../AdminTools/language/nb_NO/plugin.lang.php | 7 +- sources/plugins/AdminTools/main.inc.php | 2 +- .../language/de_DE/plugin.lang.php | 7 +- sources/plugins/LocalFilesEditor/main.inc.php | 4 +- sources/plugins/TakeATour/admin.php | 11 +- .../css/bootstrap-tour-standalone.css | 491 +- .../js/custom-bootstrap-tour-standalone.js | 2689 ++++----- sources/plugins/TakeATour/js/custom.patch | 86 +- .../TakeATour/language/ca_ES/plugin.lang.php | 4 +- .../language/ca_ES/tour_2_7_0.lang.php | 44 +- .../ca_ES/tour_first_contact.lang.php | 26 +- .../language/ca_ES/tour_privacy.lang.php | 4 + .../TakeATour/language/cs_CZ/plugin.lang.php | 2 + .../TakeATour/language/da_DK/plugin.lang.php | 4 +- .../TakeATour/language/de_DE/plugin.lang.php | 8 +- .../language/de_DE/tour_2_7_0.lang.php | 2 +- .../de_DE/tour_first_contact.lang.php | 4 +- .../TakeATour/language/el_GR/plugin.lang.php | 5 +- .../TakeATour/language/en_UK/plugin.lang.php | 4 +- .../eo_EO/tour_first_contact.lang.php | 31 +- .../TakeATour/language/es_ES/plugin.lang.php | 4 +- .../TakeATour/language/fi_FI/plugin.lang.php | 4 +- .../TakeATour/language/fr_FR/plugin.lang.php | 5 +- .../TakeATour/language/it_IT/plugin.lang.php | 4 +- .../TakeATour/language/lv_LV/plugin.lang.php | 4 +- .../TakeATour/language/nb_NO/plugin.lang.php | 4 +- .../TakeATour/language/nl_NL/plugin.lang.php | 4 +- .../TakeATour/language/pt_BR/plugin.lang.php | 4 +- .../TakeATour/language/ru_RU/plugin.lang.php | 4 +- .../TakeATour/language/sk_SK/plugin.lang.php | 4 +- .../TakeATour/language/sl_SI/plugin.lang.php | 4 +- .../TakeATour/language/sr_RS/plugin.lang.php | 44 +- .../TakeATour/language/sv_SE/plugin.lang.php | 4 +- .../sv_SE/tour_first_contact.lang.php | 56 +- .../tr_TR/tour_first_contact.lang.php | 55 +- .../TakeATour/language/zh_CN/plugin.lang.php | 4 +- sources/plugins/TakeATour/main.inc.php | 18 +- sources/plugins/TakeATour/tpl/admin.tpl | 15 + sources/plugins/index.php | 2 +- .../language_switch/language_switch.css | 1 + sources/plugins/language_switch/main.inc.php | 4 +- sources/plugins/language_switch/style.css | 8 +- sources/popuphelp.php | 2 +- sources/profile.php | 4 +- sources/qsearch.php | 2 +- sources/random.php | 2 +- sources/register.php | 2 +- sources/search.php | 11 +- sources/search_rules.php | 2 +- sources/tags.php | 2 +- sources/template-extension/index.php | 2 +- sources/template-extension/yoga/index.php | 2 +- .../template-extension/yoga/local/index.php | 2 +- sources/themes/Sylvia/icon/index.php | 2 +- .../themes/Sylvia/icon/mimetypes/index.php | 2 +- sources/themes/Sylvia/index.php | 2 +- sources/themes/Sylvia/themeconf.inc.php | 2 +- sources/themes/clear/index.php | 2 +- sources/themes/clear/themeconf.inc.php | 2 +- sources/themes/dark/images/index.php | 2 +- sources/themes/dark/index.php | 2 +- sources/themes/dark/themeconf.inc.php | 2 +- sources/themes/default/icon/index.php | 2 +- .../themes/default/icon/mimetypes/index.php | 2 +- sources/themes/default/images/index.php | 2 +- sources/themes/default/index.php | 2 +- sources/themes/default/js/jquery.js | 195 +- sources/themes/default/js/jquery.min.js | 9 +- .../colorbox/i18n/jquery.colorbox-ar.js | 15 + .../colorbox/i18n/jquery.colorbox-bg.js | 16 + .../colorbox/i18n/jquery.colorbox-bn.js | 16 + .../colorbox/i18n/jquery.colorbox-ca.js | 13 + .../colorbox/i18n/jquery.colorbox-cs.js | 16 + .../colorbox/i18n/jquery.colorbox-da.js | 16 + .../colorbox/i18n/jquery.colorbox-de.js | 15 + .../colorbox/i18n/jquery.colorbox-es.js | 13 + .../colorbox/i18n/jquery.colorbox-et.js | 15 + .../colorbox/i18n/jquery.colorbox-fa.js | 18 + .../colorbox/i18n/jquery.colorbox-fi.js | 15 + .../colorbox/i18n/jquery.colorbox-fr.js | 15 + .../colorbox/i18n/jquery.colorbox-gl.js | 13 + .../colorbox/i18n/jquery.colorbox-gr.js | 16 + .../colorbox/i18n/jquery.colorbox-he.js | 16 + .../colorbox/i18n/jquery.colorbox-hr.js | 15 + .../colorbox/i18n/jquery.colorbox-hu.js | 15 + .../colorbox/i18n/jquery.colorbox-id.js | 15 + .../colorbox/i18n/jquery.colorbox-it.js | 15 + .../colorbox/i18n/jquery.colorbox-ja.js | 15 + .../colorbox/i18n/jquery.colorbox-kr.js | 15 + .../colorbox/i18n/jquery.colorbox-lt.js | 15 + .../colorbox/i18n/jquery.colorbox-lv.js | 16 + .../colorbox/i18n/jquery.colorbox-my.js | 15 + .../colorbox/i18n/jquery.colorbox-nl.js | 15 + .../colorbox/i18n/jquery.colorbox-no.js | 16 + .../colorbox/i18n/jquery.colorbox-pl.js | 16 + .../colorbox/i18n/jquery.colorbox-pt_BR.js | 15 + .../colorbox/i18n/jquery.colorbox-ro.js | 15 + .../colorbox/i18n/jquery.colorbox-ru.js | 16 + .../colorbox/i18n/jquery.colorbox-si.js | 15 + .../colorbox/i18n/jquery.colorbox-sk.js | 15 + .../colorbox/i18n/jquery.colorbox-sr.js | 15 + .../colorbox/i18n/jquery.colorbox-sv.js | 15 + .../colorbox/i18n/jquery.colorbox-tr.js | 19 + .../colorbox/i18n/jquery.colorbox-uk.js | 16 + .../colorbox/i18n/jquery.colorbox-zh_CN.js | 15 + .../colorbox/i18n/jquery.colorbox-zh_TW.js | 15 + .../js/plugins/colorbox/style1/colorbox.css | 37 +- .../plugins/colorbox/style1/images/border.png | Bin 112 -> 76 bytes .../colorbox/style1/images/controls.png | Bin 1249 -> 1261 bytes .../style1/images/ie6/borderBottomCenter.png | Bin 111 -> 0 bytes .../style1/images/ie6/borderBottomLeft.png | Bin 215 -> 0 bytes .../style1/images/ie6/borderBottomRight.png | Bin 217 -> 0 bytes .../style1/images/ie6/borderMiddleLeft.png | Bin 108 -> 0 bytes .../style1/images/ie6/borderMiddleRight.png | Bin 108 -> 0 bytes .../style1/images/ie6/borderTopCenter.png | Bin 111 -> 0 bytes .../style1/images/ie6/borderTopLeft.png | Bin 216 -> 0 bytes .../style1/images/ie6/borderTopRight.png | Bin 214 -> 0 bytes .../colorbox/style1/images/loading.gif | Bin 9427 -> 8685 bytes .../style1/images/loading_background.png | Bin 157 -> 131 bytes .../colorbox/style1/images/overlay.png | Bin 182 -> 115 bytes .../js/plugins/colorbox/style1/index.html | 87 - .../js/plugins/colorbox/style2/colorbox.css | 11 +- .../colorbox/style2/images/controls.png.old | Bin 570 -> 0 bytes .../colorbox/style2/images/loading.gif | Bin 9427 -> 6244 bytes .../js/plugins/colorbox/style2/index.html | 87 - .../js/plugins/colorbox/style3/colorbox.css | 45 + .../colorbox/style3/images/controls.png | Bin 0 -> 1633 bytes .../colorbox/style3/images/loading.gif | Bin 0 -> 6244 bytes .../js/plugins/colorbox/style4/colorbox.css | 66 + .../colorbox/style4/images/border1.png | Bin 0 -> 629 bytes .../colorbox/style4/images/border2.png | Bin 0 -> 112 bytes .../colorbox/style4/images/loading.gif | Bin 0 -> 6244 bytes .../js/plugins/colorbox/style5/colorbox.css | 58 + .../plugins/colorbox/style5/images/border.png | Bin 0 -> 139 bytes .../colorbox/style5/images/controls.png | Bin 0 -> 2027 bytes .../colorbox/style5/images/loading.gif | Bin 0 -> 8685 bytes .../style5/images/loading_background.png | Bin 0 -> 131 bytes .../default/js/plugins/jquery.colorbox.min.js | 8 +- sources/themes/default/js/plugins/piecon.js | 189 + .../default/js/plugins/selectize.clear.css | 3 +- .../default/js/plugins/selectize.dark.css | 3 +- .../default/js/plugins/selectize.min.js | 6 +- sources/themes/default/js/switchbox.js | 2 +- sources/themes/default/template/index.tpl | 6 +- .../themes/default/template/mail/index.php | 2 +- .../mail/text/html/cat_group_info.tpl | 2 +- .../mail/text/html/global-mail-css.tpl | 2 - .../default/template/mail/text/html/index.php | 2 +- .../mail/text/html/mail-css-clear.tpl | 2 - .../template/mail/text/html/mail-css-dark.tpl | 2 - .../default/template/mail/text/index.php | 2 +- .../template/mail/text/plain/index.php | 2 +- .../default/template/navigation_bar.tpl | 16 +- sources/themes/default/template/picture.tpl | 25 +- sources/themes/default/template/search.tpl | 3 + sources/themes/default/template/slideshow.tpl | 2 +- sources/themes/default/theme.css | 6 + .../themes/default/watermarks/copyright.png | Bin 5725 -> 9424 bytes sources/themes/elegant/admin/admin.inc.php | 5 +- sources/themes/elegant/admin/index.php | 2 +- sources/themes/elegant/admin/upgrade.inc.php | 27 +- sources/themes/elegant/index.php | 2 +- .../elegant/language/ar_SA/theme.lang.php | 2 +- .../elegant/language/bg_BG/theme.lang.php | 2 +- .../elegant/language/br_FR/theme.lang.php | 2 +- .../elegant/language/ca_ES/theme.lang.php | 2 +- .../elegant/language/da_DK/theme.lang.php | 2 +- .../elegant/language/de_DE/theme.lang.php | 2 +- .../elegant/language/el_GR/theme.lang.php | 2 +- .../themes/elegant/language/en_UK/index.php | 2 +- .../elegant/language/eo_EO/theme.lang.php | 2 +- .../elegant/language/es_ES/theme.lang.php | 2 +- .../elegant/language/et_EE/theme.lang.php | 2 +- .../elegant/language/fa_IR/theme.lang.php | 2 +- .../elegant/language/fi_FI/theme.lang.php | 2 +- .../themes/elegant/language/fr_CA/index.php | 2 +- .../themes/elegant/language/fr_FR/index.php | 2 +- .../elegant/language/gl_ES/theme.lang.php | 2 +- .../elegant/language/he_IL/theme.lang.php | 2 +- .../elegant/language/hu_HU/theme.lang.php | 2 +- .../elegant/language/it_IT/theme.lang.php | 2 +- .../elegant/language/ja_JP/theme.lang.php | 2 +- .../elegant/language/km_KH/theme.lang.php | 2 +- .../elegant/language/kn_IN/theme.lang.php | 2 +- .../elegant/language/ko_KR/theme.lang.php | 2 +- .../elegant/language/lt_LT/theme.lang.php | 2 +- .../elegant/language/lv_LV/theme.lang.php | 2 +- .../elegant/language/mn_MN/theme.lang.php | 2 +- .../elegant/language/nb_NO/theme.lang.php | 2 +- .../elegant/language/nl_NL/theme.lang.php | 2 +- .../elegant/language/nn_NO/theme.lang.php | 2 +- .../elegant/language/pl_PL/theme.lang.php | 2 +- .../elegant/language/pt_BR/theme.lang.php | 2 +- .../elegant/language/pt_PT/theme.lang.php | 2 +- .../elegant/language/ro_RO/theme.lang.php | 2 +- .../elegant/language/ru_RU/theme.lang.php | 2 +- .../elegant/language/sk_SK/theme.lang.php | 2 +- .../elegant/language/sl_SI/theme.lang.php | 2 +- .../elegant/language/sr_RS/theme.lang.php | 2 +- .../elegant/language/sv_SE/theme.lang.php | 2 +- .../elegant/language/ta_IN/theme.lang.php | 2 +- .../elegant/language/th_TH/theme.lang.php | 2 +- .../elegant/language/tr_TR/theme.lang.php | 2 +- .../elegant/language/uk_UA/theme.lang.php | 2 +- .../elegant/language/vi_VN/theme.lang.php | 2 +- .../elegant/language/zh_CN/theme.lang.php | 2 +- .../elegant/language/zh_HK/theme.lang.php | 2 +- .../elegant/language/zh_TW/theme.lang.php | 2 +- sources/themes/elegant/themeconf.inc.php | 2 +- sources/themes/index.php | 2 +- .../themes/smartpocket/admin/admin.inc.php | 5 +- sources/themes/smartpocket/admin/index.php | 2 +- .../themes/smartpocket/admin/maintain.inc.php | 22 +- .../themes/smartpocket/admin/upgrade.inc.php | 22 +- .../smartpocket/language/ar_SA/theme.lang.php | 2 +- .../smartpocket/language/bg_BG/theme.lang.php | 2 +- .../smartpocket/language/br_FR/theme.lang.php | 2 +- .../smartpocket/language/ca_ES/theme.lang.php | 2 +- .../smartpocket/language/cs_CZ/index.php | 2 +- .../smartpocket/language/da_DK/theme.lang.php | 2 +- .../smartpocket/language/de_DE/theme.lang.php | 4 +- .../smartpocket/language/el_GR/theme.lang.php | 2 +- .../smartpocket/language/en_UK/index.php | 2 +- .../smartpocket/language/eo_EO/theme.lang.php | 2 +- .../smartpocket/language/es_ES/theme.lang.php | 2 +- .../smartpocket/language/es_MX/theme.lang.php | 2 +- .../smartpocket/language/et_EE/theme.lang.php | 2 +- .../smartpocket/language/fa_IR/theme.lang.php | 2 +- .../smartpocket/language/fi_FI/theme.lang.php | 2 +- .../smartpocket/language/fr_CA/index.php | 2 +- .../smartpocket/language/fr_FR/index.php | 2 +- .../smartpocket/language/gl_ES/theme.lang.php | 2 +- .../smartpocket/language/he_IL/theme.lang.php | 2 +- .../smartpocket/language/hu_HU/theme.lang.php | 2 +- .../smartpocket/language/it_IT/theme.lang.php | 2 +- .../smartpocket/language/ja_JP/theme.lang.php | 2 +- .../smartpocket/language/km_KH/theme.lang.php | 2 +- .../smartpocket/language/lt_LT/theme.lang.php | 2 +- .../smartpocket/language/lv_LV/theme.lang.php | 2 +- .../smartpocket/language/mn_MN/theme.lang.php | 2 +- .../smartpocket/language/nb_NO/theme.lang.php | 2 +- .../smartpocket/language/nl_NL/theme.lang.php | 2 +- .../smartpocket/language/nn_NO/theme.lang.php | 2 +- .../smartpocket/language/pl_PL/theme.lang.php | 2 +- .../smartpocket/language/pt_BR/theme.lang.php | 2 +- .../smartpocket/language/pt_PT/theme.lang.php | 2 +- .../smartpocket/language/ro_RO/theme.lang.php | 2 +- .../smartpocket/language/ru_RU/theme.lang.php | 2 +- .../smartpocket/language/sh_RS/theme.lang.php | 2 +- .../smartpocket/language/sk_SK/theme.lang.php | 2 +- .../smartpocket/language/sl_SI/theme.lang.php | 2 +- .../smartpocket/language/sr_RS/theme.lang.php | 2 +- .../smartpocket/language/sv_SE/theme.lang.php | 2 +- .../smartpocket/language/ta_IN/theme.lang.php | 2 +- .../smartpocket/language/th_TH/theme.lang.php | 2 +- .../smartpocket/language/tr_TR/theme.lang.php | 2 +- .../smartpocket/language/uk_UA/theme.lang.php | 2 +- .../smartpocket/language/vi_VN/theme.lang.php | 2 +- .../smartpocket/language/zh_CN/theme.lang.php | 2 +- .../smartpocket/language/zh_HK/theme.lang.php | 2 +- .../smartpocket/language/zh_TW/theme.lang.php | 2 +- .../smartpocket/template/identification.tpl | 12 +- .../themes/smartpocket/template/password.tpl | 27 + .../themes/smartpocket/template/search.tpl | 125 +- sources/themes/smartpocket/themeconf.inc.php | 4 +- sources/tools/index.php | 2 +- sources/tools/metadata.php | 2 +- sources/tools/piwigo_upload.pl | 121 + sources/tools/pwg_rel_create.sh | 92 +- sources/tools/replace_version.pl | 39 + sources/tools/translation_analysis.php | 2 +- sources/tools/triggers_list.php | 10 +- sources/tools/ws.htm | 10 +- sources/upgrade.php | 17 +- sources/upgrade_feed.php | 2 +- sources/ws.php | 41 +- 1145 files changed, 37044 insertions(+), 19747 deletions(-) create mode 100644 sources/LICENSE.txt create mode 100644 sources/README.md create mode 100644 sources/galleries/index.php create mode 100644 sources/include/Logger.class.php create mode 100644 sources/include/random_compat/byte_safe_strings.php create mode 100644 sources/include/random_compat/cast_to_int.php create mode 100644 sources/include/random_compat/error_polyfill.php create mode 100644 sources/include/random_compat/random.php create mode 100644 sources/include/random_compat/random_bytes_com_dotnet.php create mode 100644 sources/include/random_compat/random_bytes_dev_urandom.php create mode 100644 sources/include/random_compat/random_bytes_libsodium.php create mode 100644 sources/include/random_compat/random_bytes_libsodium_legacy.php create mode 100644 sources/include/random_compat/random_bytes_mcrypt.php create mode 100644 sources/include/random_compat/random_int.php create mode 100644 sources/include/smarty/.gitattributes create mode 100644 sources/include/smarty/.gitignore create mode 100644 sources/include/smarty/.travis.yml create mode 100644 sources/include/smarty/COMPOSER_RELEASE_NOTES.txt create mode 100644 sources/include/smarty/INHERITANCE_RELEASE_NOTES.txt create mode 100644 sources/include/smarty/NEW_FEATURES.txt create mode 100644 sources/include/smarty/README.md create mode 100644 sources/include/smarty/composer.json create mode 100644 sources/include/smarty/lexer/smarty_internal_configfilelexer.plex create mode 100644 sources/include/smarty/lexer/smarty_internal_configfileparser.y create mode 100644 sources/include/smarty/lexer/smarty_internal_templatelexer.plex create mode 100644 sources/include/smarty/lexer/smarty_internal_templateparser.y create mode 100644 sources/include/smarty/libs/Autoloader.php delete mode 100644 sources/include/smarty/libs/sysplugins/smarty_config_source.php create mode 100644 sources/include/smarty/libs/sysplugins/smarty_data.php create mode 100644 sources/include/smarty/libs/sysplugins/smarty_internal_compile_private_foreachsection.php create mode 100644 sources/include/smarty/libs/sysplugins/smarty_internal_compile_private_php.php create mode 100644 sources/include/smarty/libs/sysplugins/smarty_internal_compile_shared_inheritance.php delete mode 100644 sources/include/smarty/libs/sysplugins/smarty_internal_config.php create mode 100644 sources/include/smarty/libs/sysplugins/smarty_internal_extension_clear.php create mode 100644 sources/include/smarty/libs/sysplugins/smarty_internal_extension_handler.php delete mode 100644 sources/include/smarty/libs/sysplugins/smarty_internal_filter_handler.php delete mode 100644 sources/include/smarty/libs/sysplugins/smarty_internal_function_call_handler.php delete mode 100644 sources/include/smarty/libs/sysplugins/smarty_internal_get_include_path.php create mode 100644 sources/include/smarty/libs/sysplugins/smarty_internal_method_addautoloadfilters.php create mode 100644 sources/include/smarty/libs/sysplugins/smarty_internal_method_adddefaultmodifiers.php create mode 100644 sources/include/smarty/libs/sysplugins/smarty_internal_method_append.php create mode 100644 sources/include/smarty/libs/sysplugins/smarty_internal_method_appendbyref.php create mode 100644 sources/include/smarty/libs/sysplugins/smarty_internal_method_assignbyref.php create mode 100644 sources/include/smarty/libs/sysplugins/smarty_internal_method_assignglobal.php create mode 100644 sources/include/smarty/libs/sysplugins/smarty_internal_method_clearallassign.php create mode 100644 sources/include/smarty/libs/sysplugins/smarty_internal_method_clearallcache.php create mode 100644 sources/include/smarty/libs/sysplugins/smarty_internal_method_clearassign.php create mode 100644 sources/include/smarty/libs/sysplugins/smarty_internal_method_clearcache.php create mode 100644 sources/include/smarty/libs/sysplugins/smarty_internal_method_clearcompiledtemplate.php create mode 100644 sources/include/smarty/libs/sysplugins/smarty_internal_method_clearconfig.php create mode 100644 sources/include/smarty/libs/sysplugins/smarty_internal_method_compileallconfig.php create mode 100644 sources/include/smarty/libs/sysplugins/smarty_internal_method_compilealltemplates.php create mode 100644 sources/include/smarty/libs/sysplugins/smarty_internal_method_configload.php create mode 100644 sources/include/smarty/libs/sysplugins/smarty_internal_method_createdata.php create mode 100644 sources/include/smarty/libs/sysplugins/smarty_internal_method_getautoloadfilters.php create mode 100644 sources/include/smarty/libs/sysplugins/smarty_internal_method_getconfigvars.php create mode 100644 sources/include/smarty/libs/sysplugins/smarty_internal_method_getdebugtemplate.php create mode 100644 sources/include/smarty/libs/sysplugins/smarty_internal_method_getdefaultmodifiers.php create mode 100644 sources/include/smarty/libs/sysplugins/smarty_internal_method_getregisteredobject.php create mode 100644 sources/include/smarty/libs/sysplugins/smarty_internal_method_getstreamvariable.php create mode 100644 sources/include/smarty/libs/sysplugins/smarty_internal_method_gettags.php create mode 100644 sources/include/smarty/libs/sysplugins/smarty_internal_method_gettemplatevars.php create mode 100644 sources/include/smarty/libs/sysplugins/smarty_internal_method_loadfilter.php create mode 100644 sources/include/smarty/libs/sysplugins/smarty_internal_method_loadplugin.php create mode 100644 sources/include/smarty/libs/sysplugins/smarty_internal_method_mustcompile.php create mode 100644 sources/include/smarty/libs/sysplugins/smarty_internal_method_registercacheresource.php create mode 100644 sources/include/smarty/libs/sysplugins/smarty_internal_method_registerclass.php create mode 100644 sources/include/smarty/libs/sysplugins/smarty_internal_method_registerdefaultconfighandler.php create mode 100644 sources/include/smarty/libs/sysplugins/smarty_internal_method_registerdefaultpluginhandler.php create mode 100644 sources/include/smarty/libs/sysplugins/smarty_internal_method_registerdefaulttemplatehandler.php create mode 100644 sources/include/smarty/libs/sysplugins/smarty_internal_method_registerfilter.php create mode 100644 sources/include/smarty/libs/sysplugins/smarty_internal_method_registerobject.php create mode 100644 sources/include/smarty/libs/sysplugins/smarty_internal_method_registerplugin.php create mode 100644 sources/include/smarty/libs/sysplugins/smarty_internal_method_registerresource.php create mode 100644 sources/include/smarty/libs/sysplugins/smarty_internal_method_setautoloadfilters.php create mode 100644 sources/include/smarty/libs/sysplugins/smarty_internal_method_setdebugtemplate.php create mode 100644 sources/include/smarty/libs/sysplugins/smarty_internal_method_setdefaultmodifiers.php create mode 100644 sources/include/smarty/libs/sysplugins/smarty_internal_method_unloadfilter.php create mode 100644 sources/include/smarty/libs/sysplugins/smarty_internal_method_unregistercacheresource.php create mode 100644 sources/include/smarty/libs/sysplugins/smarty_internal_method_unregisterfilter.php create mode 100644 sources/include/smarty/libs/sysplugins/smarty_internal_method_unregisterobject.php create mode 100644 sources/include/smarty/libs/sysplugins/smarty_internal_method_unregisterplugin.php create mode 100644 sources/include/smarty/libs/sysplugins/smarty_internal_method_unregisterresource.php create mode 100644 sources/include/smarty/libs/sysplugins/smarty_internal_parsetree_code.php create mode 100644 sources/include/smarty/libs/sysplugins/smarty_internal_parsetree_dq.php create mode 100644 sources/include/smarty/libs/sysplugins/smarty_internal_parsetree_dqcontent.php create mode 100644 sources/include/smarty/libs/sysplugins/smarty_internal_parsetree_tag.php create mode 100644 sources/include/smarty/libs/sysplugins/smarty_internal_parsetree_template.php create mode 100644 sources/include/smarty/libs/sysplugins/smarty_internal_parsetree_text.php create mode 100644 sources/include/smarty/libs/sysplugins/smarty_internal_runtime_cachemodify.php create mode 100644 sources/include/smarty/libs/sysplugins/smarty_internal_runtime_codeframe.php create mode 100644 sources/include/smarty/libs/sysplugins/smarty_internal_runtime_filterhandler.php create mode 100644 sources/include/smarty/libs/sysplugins/smarty_internal_runtime_foreach.php create mode 100644 sources/include/smarty/libs/sysplugins/smarty_internal_runtime_getincludepath.php create mode 100644 sources/include/smarty/libs/sysplugins/smarty_internal_runtime_hhvm.php create mode 100644 sources/include/smarty/libs/sysplugins/smarty_internal_runtime_inheritance.php create mode 100644 sources/include/smarty/libs/sysplugins/smarty_internal_runtime_subtemplate.php create mode 100644 sources/include/smarty/libs/sysplugins/smarty_internal_runtime_tplfunction.php create mode 100644 sources/include/smarty/libs/sysplugins/smarty_internal_runtime_updatecache.php create mode 100644 sources/include/smarty/libs/sysplugins/smarty_internal_runtime_updatescope.php create mode 100644 sources/include/smarty/libs/sysplugins/smarty_internal_runtime_validatecompiled.php create mode 100644 sources/include/smarty/libs/sysplugins/smarty_internal_runtime_var.php rename sources/include/smarty/libs/sysplugins/{smarty_internal_write_file.php => smarty_internal_runtime_writefile.php} (65%) create mode 100644 sources/include/smarty/libs/sysplugins/smarty_internal_testinstall.php create mode 100644 sources/include/smarty/libs/sysplugins/smarty_internal_undefined.php delete mode 100644 sources/include/smarty/libs/sysplugins/smarty_internal_utility.php create mode 100644 sources/include/smarty/libs/sysplugins/smarty_template_cached.php create mode 100644 sources/include/smarty/libs/sysplugins/smarty_template_compiled.php create mode 100644 sources/include/smarty/libs/sysplugins/smarty_template_config.php create mode 100644 sources/include/smarty/libs/sysplugins/smarty_template_resource_base.php create mode 100644 sources/include/smarty/libs/sysplugins/smarty_template_source.php create mode 100644 sources/include/smarty/libs/sysplugins/smarty_undefined_variable.php create mode 100644 sources/include/smarty/libs/sysplugins/smarty_variable.php create mode 100644 sources/include/smarty/libs/sysplugins/smartycompilerexception.php create mode 100644 sources/include/smarty/libs/sysplugins/smartyexception.php create mode 100644 sources/include/srand.php create mode 100644 sources/install/db/145-database.php create mode 100644 sources/install/db/146-database.php create mode 100644 sources/install/db/147-database.php create mode 100644 sources/install/db/148-database.php create mode 100644 sources/install/upgrade_2.7.0.php create mode 100644 sources/language/ar_EG/ar_EG.jpg create mode 100644 sources/language/ar_EG/common.lang.php create mode 100644 sources/language/ar_EG/index.php create mode 100644 sources/language/ar_EG/install.lang.php create mode 100644 sources/language/ar_EG/iso.txt create mode 100644 sources/language/bg_BG/help/group_list.html create mode 100644 sources/language/bg_BG/help/help_groups.html create mode 100644 sources/language/bg_BG/help/help_misc.html create mode 100644 sources/language/eo_EO/help/help_misc.html create mode 100644 sources/language/id_ID/install.lang.php create mode 100644 sources/language/pt_PT/help/cat_options.html create mode 100644 sources/language/pt_PT/help/cat_perm.html create mode 100644 sources/language/pt_PT/help/permalinks.html create mode 100644 sources/language/sl_SI/help/cat_perm.html create mode 100644 sources/language/sl_SI/help/help_misc.html create mode 100644 sources/language/vi_VN/help/help_misc.html create mode 100644 sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-ar.js create mode 100644 sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-bg.js create mode 100644 sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-bn.js create mode 100644 sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-ca.js create mode 100644 sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-cs.js create mode 100644 sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-da.js create mode 100644 sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-de.js create mode 100644 sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-es.js create mode 100644 sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-et.js create mode 100644 sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-fa.js create mode 100644 sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-fi.js create mode 100644 sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-fr.js create mode 100644 sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-gl.js create mode 100644 sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-gr.js create mode 100644 sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-he.js create mode 100644 sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-hr.js create mode 100644 sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-hu.js create mode 100644 sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-id.js create mode 100644 sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-it.js create mode 100644 sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-ja.js create mode 100644 sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-kr.js create mode 100644 sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-lt.js create mode 100644 sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-lv.js create mode 100644 sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-my.js create mode 100644 sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-nl.js create mode 100644 sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-no.js create mode 100644 sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-pl.js create mode 100644 sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-pt_BR.js create mode 100644 sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-ro.js create mode 100644 sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-ru.js create mode 100644 sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-si.js create mode 100644 sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-sk.js create mode 100644 sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-sr.js create mode 100644 sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-sv.js create mode 100644 sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-tr.js create mode 100644 sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-uk.js create mode 100644 sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-zh_CN.js create mode 100644 sources/themes/default/js/plugins/colorbox/i18n/jquery.colorbox-zh_TW.js delete mode 100644 sources/themes/default/js/plugins/colorbox/style1/images/ie6/borderBottomCenter.png delete mode 100644 sources/themes/default/js/plugins/colorbox/style1/images/ie6/borderBottomLeft.png delete mode 100644 sources/themes/default/js/plugins/colorbox/style1/images/ie6/borderBottomRight.png delete mode 100644 sources/themes/default/js/plugins/colorbox/style1/images/ie6/borderMiddleLeft.png delete mode 100644 sources/themes/default/js/plugins/colorbox/style1/images/ie6/borderMiddleRight.png delete mode 100644 sources/themes/default/js/plugins/colorbox/style1/images/ie6/borderTopCenter.png delete mode 100644 sources/themes/default/js/plugins/colorbox/style1/images/ie6/borderTopLeft.png delete mode 100644 sources/themes/default/js/plugins/colorbox/style1/images/ie6/borderTopRight.png delete mode 100644 sources/themes/default/js/plugins/colorbox/style1/index.html delete mode 100644 sources/themes/default/js/plugins/colorbox/style2/images/controls.png.old delete mode 100644 sources/themes/default/js/plugins/colorbox/style2/index.html create mode 100644 sources/themes/default/js/plugins/colorbox/style3/colorbox.css create mode 100644 sources/themes/default/js/plugins/colorbox/style3/images/controls.png create mode 100644 sources/themes/default/js/plugins/colorbox/style3/images/loading.gif create mode 100644 sources/themes/default/js/plugins/colorbox/style4/colorbox.css create mode 100644 sources/themes/default/js/plugins/colorbox/style4/images/border1.png create mode 100644 sources/themes/default/js/plugins/colorbox/style4/images/border2.png create mode 100644 sources/themes/default/js/plugins/colorbox/style4/images/loading.gif create mode 100644 sources/themes/default/js/plugins/colorbox/style5/colorbox.css create mode 100644 sources/themes/default/js/plugins/colorbox/style5/images/border.png create mode 100644 sources/themes/default/js/plugins/colorbox/style5/images/controls.png create mode 100644 sources/themes/default/js/plugins/colorbox/style5/images/loading.gif create mode 100644 sources/themes/default/js/plugins/colorbox/style5/images/loading_background.png create mode 100644 sources/themes/default/js/plugins/piecon.js create mode 100644 sources/themes/smartpocket/template/password.tpl create mode 100644 sources/tools/piwigo_upload.pl create mode 100644 sources/tools/replace_version.pl diff --git a/sources/LICENSE.txt b/sources/LICENSE.txt new file mode 100644 index 0000000..d159169 --- /dev/null +++ b/sources/LICENSE.txt @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. diff --git a/sources/README.md b/sources/README.md new file mode 100644 index 0000000..673fc96 --- /dev/null +++ b/sources/README.md @@ -0,0 +1,52 @@ +[![Piwigo](http://piwigo.org/screenshots/logos/piwigo@280.png)](http://piwigo.org) +--------- + +Piwigo is photo gallery software for the web, built by an active community of users and developers. + +Extensions make Piwigo easily customizable. Icing on the cake, Piwigo is free and open source. + +![screenshot](http://piwigo.org/screenshots/github-screenshot.jpg) + + * [piwigo.org](http://piwigo.org) + * [Demo](http://piwigo.org/demo) + * [Downloads](http://piwigo.org/basics/downloads) + * [User guide](http://piwigo.org/doc) + * [Plugins and themes](http://piwigo.org/ext) + * [Forum](http://piwigo.org/forum) + * [News](http://piwigo.org/news) + +## Requirements + + * A webserver (Apache or nginx recommended) + * PHP 5.2 or greater + * MySQL 5 or greater or MariaDB equivalent + * ImageMagick (recommended) or PHP GD + +## Quick start install + +### NetInstall + + * Download the [NetInstall script](http://piwigo.org/download/dlcounter.php?code=netinstall) + * Transfer the script to your web space with any FTP client + * Open the script in you web browser (for example http://example.com/piwigo-netinstall.php) and follow the steps + +[More information](http://piwigo.org/basics/installation_netinstall) + +### Manual + + * Download the [latest stable version](http://piwigo.org/download/dlcounter.php?code=latest) and unzip it + * Transfer everything to your web space with any FTP client + * Open your website (for example http://example.com/piwigo) and follow the steps + +[More information](http://piwigo.org/basics/installation_manual) + +If you do not have your own server, consider the [piwigo.com](http://piwigo.com/) hosting solution. + +## Contributing + +Piwigo is widely driven by its community; if you want to improve the code, fork this repo and submit your changes to the `master` branch. + +## License + +Piwigo is released under the GPL v2 license. + diff --git a/sources/about.php b/sources/about.php index 9f6318d..6bd853a 100644 --- a/sources/about.php +++ b/sources/about.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/action.php b/sources/action.php index 4b92e05..5a7ca42 100644 --- a/sources/action.php +++ b/sources/action.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -57,11 +57,34 @@ function do_error( $code, $str ) exit(); } +if ($conf['enable_formats'] and isset($_GET['format'])) +{ + check_input_parameter('format', $_GET, false, PATTERN_ID); + + $query = ' +SELECT + * + FROM '.IMAGE_FORMAT_TABLE.' + WHERE format_id = '.$_GET['format'].' +;'; + $formats = query2array($query); + + if (count($formats) == 0) + { + do_error(400, 'Invalid request - format'); + } + + $format = $formats[0]; + + $_GET['id'] = $format['image_id']; + $_GET['part'] = 'f'; // "f" for "format" +} + if (!isset($_GET['id']) or !is_numeric($_GET['id']) or !isset($_GET['part']) - or !in_array($_GET['part'], array('e','r') ) ) + or !in_array($_GET['part'], array('e','r','f') ) ) { do_error(400, 'Invalid request - id/part'); } @@ -77,6 +100,8 @@ if ( empty($element_info) ) do_error(404, 'Requested id not found'); } +$src_image = new SrcImage($element_info); + // $filter['visible_categories'] and $filter['visible_images'] // are not used because it's not necessary (filter <> restriction) $query=' @@ -103,9 +128,9 @@ $file=''; switch ($_GET['part']) { case 'e': - if ( !$user['enabled_high'] ) - { - $deriv = new DerivativeImage(IMG_XXLARGE, new SrcImage($element_info)); + if ( $src_image->is_original() and !$user['enabled_high'] ) + {// we have a photo and the user has no access to HD + $deriv = new DerivativeImage(IMG_XXLARGE, $src_image); if ( !$deriv->same_as_source() ) { do_error(401, 'Access denied e'); @@ -116,6 +141,10 @@ switch ($_GET['part']) case 'r': $file = original_to_representative( get_element_path($element_info), $element_info['representative_ext'] ); break; + case 'f' : + $file = original_to_format(get_element_path($element_info), $format['ext']); + $element_info['file'] = get_filename_wo_extension($element_info['file']).'.'.$format['ext']; + break; } if ( empty($file) ) @@ -130,6 +159,10 @@ else if ($_GET['part'] == 'e') { pwg_log($_GET['id'], 'other'); } +else if ($_GET['part'] == 'f') +{ + pwg_log($_GET['id'], 'high', $format['format_id']); +} $http_headers = array(); @@ -155,7 +188,7 @@ if (!url_is_remote($file)) // HTTP/1.1 only $http_headers[] = 'Cache-Control: private, must-revalidate, max-age='.$max_age;*/ - if ( isset( $_SERVER['HTTP_IF_MODIFIED_SINCE'] ) ) + if ('f' != $_GET['part'] and isset( $_SERVER['HTTP_IF_MODIFIED_SINCE'] ) ) { set_status_header(304); foreach ($http_headers as $header) diff --git a/sources/admin.php b/sources/admin.php index 213f33b..ac89bab 100644 --- a/sources/admin.php +++ b/sources/admin.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -240,6 +240,19 @@ if ($nb_photos_in_caddie > 0) ); } +// any orphan photo? +$nb_orphans = count(get_orphans()); + +if ($nb_orphans > 0) +{ + $template->assign( + array( + 'NB_ORPHANS' => $nb_orphans, + 'U_ORPHANS' => $link_start.'batch_manager&filter=prefilter-no_album', + ) + ); +} + // +-----------------------------------------------------------------------+ // | Plugin menu | // +-----------------------------------------------------------------------+ diff --git a/sources/admin/album.php b/sources/admin/album.php index d1186aa..f5e692a 100644 --- a/sources/admin/album.php +++ b/sources/admin/album.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/admin/album_notification.php b/sources/admin/album_notification.php index cafaad1..fb2a1b0 100644 --- a/sources/admin/album_notification.php +++ b/sources/admin/album_notification.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -46,7 +46,7 @@ $page['cat'] = $category['id']; // +-----------------------------------------------------------------------+ // info by email to an access granted group of category informations -if (isset($_POST['submitEmail']) and !empty($_POST['group'])) +if (isset($_POST['submitEmail'])) { set_make_full_url(); @@ -54,6 +54,8 @@ if (isset($_POST['submitEmail']) and !empty($_POST['group'])) is empty find child representative_picture_id */ if (!empty($category['representative_picture_id'])) { + $img = array(); + $query = ' SELECT id, file, path, representative_ext FROM '.IMAGES_TABLE.' @@ -65,56 +67,124 @@ SELECT id, file, path, representative_ext { $element = pwg_db_fetch_assoc($result); - $img_url = ''; + $img = array( + 'link' => make_picture_url( + array( + 'image_id' => $element['id'], + 'image_file' => $element['file'], + 'category' => $category + ) + ), + 'src' => DerivativeImage::url(IMG_THUMB, $element), + ); } } - if (!isset($img_url)) - { - $img_url = ''; - } - - pwg_mail_group( - $_POST['group'], - array( - 'subject' => l10n('[%s] Visit album %s', $conf['gallery_title'], trigger_change('render_category_name', $category['name'], 'admin_cat_list')), - // TODO : change this language variable to 'Visit album %s' - // TODO : 'language_selected' => .... - ), - array( - 'filename' => 'cat_group_info', - 'assign' => array( - 'IMG_URL' => $img_url, - 'CAT_NAME' => trigger_change('render_category_name', $category['name'], 'admin_cat_list'), - 'LINK' => make_index_url(array( - 'category' => array( - 'id' => $category['id'], - 'name' => trigger_change('render_category_name', $category['name'], 'admin_cat_list'), - 'permalink' => $category['permalink'] - ) - )), - 'CPL_CONTENT' => empty($_POST['mail_content']) ? '' : stripslashes($_POST['mail_content']), - ) + $args = array( + 'subject' => l10n('[%s] Visit album %s', $conf['gallery_title'], trigger_change('render_category_name', $category['name'], 'admin_cat_list')), + // TODO : change this language variable to 'Visit album %s' + // TODO : 'language_selected' => .... + ); + + $tpl = array( + 'filename' => 'cat_group_info', + 'assign' => array( + 'IMG' => $img, + 'CAT_NAME' => trigger_change('render_category_name', $category['name'], 'admin_cat_list'), + 'LINK' => make_index_url( + array( + 'category' => array( + 'id' => $category['id'], + 'name' => trigger_change('render_category_name', $category['name'], 'admin_cat_list'), + 'permalink' => $category['permalink'] + ) + ) + ), + 'CPL_CONTENT' => empty($_POST['mail_content']) ? '' : stripslashes($_POST['mail_content']), ) ); - unset_make_full_url(); + if ('users' == $_POST['who'] and isset($_POST['users']) and count($_POST['users']) > 0) + { + check_input_parameter('users', $_POST, true, PATTERN_ID); - $query = ' + // TODO code very similar to function pwg_mail_group. We'd better create + // a function pwg_mail_users that could be called from here and from + // pwg_mail_group + + // TODO to make checks even better, we should check that theses users + // have access to this album. No real privacy issue here, even if we + // send the email to a user without permission. + + $query = ' +SELECT + ui.user_id, + ui.status, + ui.language, + u.'.$conf['user_fields']['email'].' AS email, + u.'.$conf['user_fields']['username'].' AS username + FROM '.USER_INFOS_TABLE.' AS ui + JOIN '.USERS_TABLE.' AS u ON u.'.$conf['user_fields']['id'].' = ui.user_id + WHERE ui.user_id IN ('.implode(',', $_POST['users']).') +;'; + $users = query2array($query); + $usernames = array(); + + foreach ($users as $u) + { + $usernames[] = $u['username']; + + $authkey = create_user_auth_key($u['user_id'], $u['status']); + + $user_tpl = $tpl; + + if ($authkey !== false) + { + $user_tpl['assign']['LINK'] = add_url_params($tpl['assign']['LINK'], array('auth' => $authkey['auth_key'])); + + if (isset($user_tpl['assign']['IMG']['link'])) + { + $user_tpl['assign']['IMG']['link'] = add_url_params( + $user_tpl['assign']['IMG']['link'], + array('auth' => $authkey['auth_key']) + ); + } + } + + $user_args = $args; + if (isset($authkey)) + { + $user_args['auth_key'] = $authkey['auth_key']; + } + + switch_lang_to($u['language']); + pwg_mail($u['email'], $user_args, $user_tpl); + switch_lang_back(); + } + + $message = l10n_dec('%d mail was sent.', '%d mails were sent.', count($users)); + $message.= ' ('.implode(', ', $usernames).')'; + + $page['infos'][] = $message; + } + elseif ('group' == $_POST['who'] and !empty($_POST['group'])) + { + check_input_parameter('group', $_POST, false, PATTERN_ID); + + pwg_mail_group($_POST['group'], $args, $tpl); + + $query = ' SELECT name FROM '.GROUPS_TABLE.' WHERE id = '.$_POST['group'].' ;'; - list($group_name) = pwg_db_fetch_row(pwg_query($query)); + list($group_name) = pwg_db_fetch_row(pwg_query($query)); - $page['infos'][] = l10n('An information email was sent to group "%s"', $group_name); + $page['infos'][] = l10n('An information email was sent to group "%s"', $group_name); + } + + unset_make_full_url(); } // +-----------------------------------------------------------------------+ @@ -135,6 +205,19 @@ $template->assign( ) ); +if ($conf['auth_key_duration'] > 0) +{ + $template->assign( + 'auth_key_duration', + time_since( + strtotime('now -'.$conf['auth_key_duration'].' second'), + 'second', + null, + false + ) + ); +} + // +-----------------------------------------------------------------------+ // | form construction | // +-----------------------------------------------------------------------+ @@ -189,6 +272,64 @@ SELECT } } +// all users with status != guest and permitted to this this album (for a +// perfect search, we should also check that album is not only filled with +// private photos) +$query = ' +SELECT + user_id + FROM '.USER_INFOS_TABLE.' + WHERE status != \'guest\' +;'; +$all_user_ids = query2array($query, null, 'user_id'); + +if ('private' == $category['status']) +{ + $user_ids_access_indirect = array(); + + if (isset($group_ids) and count($group_ids) > 0) + { + $query = ' +SELECT + user_id + FROM '.USER_GROUP_TABLE.' + WHERE group_id IN ('.implode(',', $group_ids).') +'; + $user_ids_access_indirect = query2array($query, null, 'user_id'); + } + + $query = ' +SELECT + user_id + FROM '.USER_ACCESS_TABLE.' + WHERE cat_id = '.$category['id'].' +;'; + $user_ids_access_direct = query2array($query, null, 'user_id'); + + $user_ids_access = array_unique(array_merge($user_ids_access_direct, $user_ids_access_indirect)); + + $user_ids = array_intersect($user_ids_access, $all_user_ids); +} +else +{ + $user_ids = $all_user_ids; +} + +if (count($user_ids) > 0) +{ + $query = ' +SELECT + '.$conf['user_fields']['id'].' AS id, + '.$conf['user_fields']['username'].' AS username + FROM '.USERS_TABLE.' + WHERE id IN ('.implode(',', $user_ids).') +;'; + + $users = query2array($query, 'id', 'username'); + + $template->assign('user_options', $users); +} + // +-----------------------------------------------------------------------+ // | sending html code | // +-----------------------------------------------------------------------+ diff --git a/sources/admin/batch_manager.php b/sources/admin/batch_manager.php index 257b11b..e81c59f 100644 --- a/sources/admin/batch_manager.php +++ b/sources/admin/batch_manager.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -63,6 +63,21 @@ DELETE FROM '.CADDIE_TABLE.' redirect(get_root_url().'admin.php?page='.$_GET['page']); } + + if ('delete_orphans' == $_GET['action']) + { + $deleted_count = delete_elements(get_orphans(), true); + + if ($deleted_count > 0) + { + $_SESSION['page_infos'][] = l10n_dec( + '%d photo was deleted', '%d photos were deleted', + $deleted_count + ); + + redirect(get_root_url().'admin.php?page='.$_GET['page']); + } + } } // +-----------------------------------------------------------------------+ @@ -323,15 +338,7 @@ SELECT id break; case 'no_album': - $query = ' -SELECT - id - FROM '.IMAGES_TABLE.' - LEFT JOIN '.IMAGE_CATEGORY_TABLE.' ON id = image_id - WHERE category_id is null -;'; - $filter_sets[] = query2array($query, null, 'id'); - + $filter_sets[] = get_orphans(); break; case 'no_tag': diff --git a/sources/admin/batch_manager_global.php b/sources/admin/batch_manager_global.php index 4179ed2..1d5cb74 100644 --- a/sources/admin/batch_manager_global.php +++ b/sources/admin/batch_manager_global.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -44,7 +44,6 @@ trigger_notify('loc_begin_element_set_global'); check_input_parameter('del_tags', $_POST, true, PATTERN_ID); check_input_parameter('associate', $_POST, false, PATTERN_ID); -check_input_parameter('move', $_POST, false, PATTERN_ID); check_input_parameter('dissociate', $_POST, false, PATTERN_ID); // +-----------------------------------------------------------------------+ @@ -173,7 +172,7 @@ DELETE else if ('move' == $action) { - move_images_to_categories($collection, array($_POST['move'])); + move_images_to_categories($collection, array($_POST['associate'])); $_SESSION['page_infos'] = array( l10n('Information data registered in database') @@ -187,7 +186,7 @@ DELETE else if ('no_virtual_album' == $page['prefilter']) { - $category_info = get_cat_info($_POST['move']); + $category_info = get_cat_info($_POST['associate']); if (empty($category_info['dir'])) { $redirect = true; @@ -430,7 +429,7 @@ $prefilters = array( array('ID' => 'caddie', 'NAME' => l10n('Caddie')), array('ID' => 'favorites', 'NAME' => l10n('Your favorites')), array('ID' => 'last_import', 'NAME' => l10n('Last import')), - array('ID' => 'no_album', 'NAME' => l10n('With no album')), + array('ID' => 'no_album', 'NAME' => l10n('With no album').' ('.l10n('Orphans').')'), array('ID' => 'no_tag', 'NAME' => l10n('With no tag')), array('ID' => 'duplicates', 'NAME' => l10n('Duplicates')), array('ID' => 'all_photos', 'NAME' => l10n('All')) diff --git a/sources/admin/batch_manager_unit.php b/sources/admin/batch_manager_unit.php index bed0cdc..f4d69d5 100644 --- a/sources/admin/batch_manager_unit.php +++ b/sources/admin/batch_manager_unit.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/admin/cat_list.php b/sources/admin/cat_list.php index 54cb445..81e7c18 100644 --- a/sources/admin/cat_list.php +++ b/sources/admin/cat_list.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -281,7 +281,7 @@ SELECT id, name, id_uppercat } else { - $sort[] = $row['name']; + $sort[] = remove_accents($row['name']); } $categories[] = array( diff --git a/sources/admin/cat_modify.php b/sources/admin/cat_modify.php index 3cf8239..3e50d8f 100644 --- a/sources/admin/cat_modify.php +++ b/sources/admin/cat_modify.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -172,21 +172,6 @@ UPDATE '.CATEGORIES_TABLE.' $_SESSION['page_infos'][] = l10n('Album updated successfully'); $redirect = true; } -elseif (isset($_POST['set_random_representant'])) -{ - set_random_representant(array($_GET['cat_id'])); - $redirect = true; -} -elseif (isset($_POST['delete_representant'])) -{ - $query = ' -UPDATE '.CATEGORIES_TABLE.' - SET representative_picture_id = NULL - WHERE id = '.$_GET['cat_id'].' -;'; - pwg_query($query); - $redirect = true; -} if (isset($redirect)) { @@ -336,8 +321,7 @@ else } // representant management -if ($category['has_images'] - or !empty($category['representative_picture_id'])) +if ($category['has_images'] or !empty($category['representative_picture_id'])) { $tpl_representant = array(); @@ -345,20 +329,7 @@ if ($category['has_images'] // representant ? if (!empty($category['representative_picture_id'])) { - $query = ' -SELECT id,representative_ext,path - FROM '.IMAGES_TABLE.' - WHERE id = '.$category['representative_picture_id'].' -;'; - $row = pwg_db_fetch_assoc(pwg_query($query)); - $src = DerivativeImage::thumb_url($row); - $url = get_root_url().'admin.php?page=photo-'.$category['representative_picture_id']; - - $tpl_representant['picture'] = - array( - 'SRC' => $src, - 'URL' => $url - ); + $tpl_representant['picture'] = get_category_representant_properties($category['representative_picture_id']); } // can the admin choose to set a new random representant ? diff --git a/sources/admin/cat_move.php b/sources/admin/cat_move.php index d596d4e..9e7e0b8 100644 --- a/sources/admin/cat_move.php +++ b/sources/admin/cat_move.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/admin/cat_options.php b/sources/admin/cat_options.php index f191095..41d5cd7 100644 --- a/sources/admin/cat_options.php +++ b/sources/admin/cat_options.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/admin/cat_perm.php b/sources/admin/cat_perm.php index c42b3ea..eb55f3e 100644 --- a/sources/admin/cat_perm.php +++ b/sources/admin/cat_perm.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/admin/comments.php b/sources/admin/comments.php index 0f09faf..580f03b 100644 --- a/sources/admin/comments.php +++ b/sources/admin/comments.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/admin/configuration.php b/sources/admin/configuration.php index e7e6033..4a9c3c3 100644 --- a/sources/admin/configuration.php +++ b/sources/admin/configuration.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -578,7 +578,7 @@ switch ($page['section']) $position = 'bottomright'; } - if ($wm->xrepeat != 0) + if ($wm->xrepeat != 0 || $wm->yrepeat != 0) { $position = 'custom'; } @@ -592,6 +592,7 @@ switch ($page['section']) 'xpos' => $wm->xpos, 'ypos' => $wm->ypos, 'xrepeat' => $wm->xrepeat, + 'yrepeat' => $wm->yrepeat, 'opacity' => $wm->opacity, 'position' => $position, ) diff --git a/sources/admin/element_set_ranks.php b/sources/admin/element_set_ranks.php index 8b68ce6..7ff57fa 100644 --- a/sources/admin/element_set_ranks.php +++ b/sources/admin/element_set_ranks.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -45,38 +45,6 @@ if (!isset($_GET['cat_id']) or !is_numeric($_GET['cat_id'])) $page['category_id'] = $_GET['cat_id']; -// +-----------------------------------------------------------------------+ -// | functions | -// +-----------------------------------------------------------------------+ - -/** - * save the rank depending on given images order - * - * The list of ordered images id is supposed to be in the same parent - * category - * - * @param array categories - * @return void - */ -function save_images_order($category_id, $images) -{ - $current_rank = 0; - $datas = array(); - foreach ($images as $id) - { - $datas[] = array( - 'category_id' => $category_id, - 'image_id' => $id, - 'rank' => ++$current_rank, - ); - } - $fields = array( - 'primary' => array('image_id', 'category_id'), - 'update' => array('rank') - ); - mass_updates(IMAGE_CATEGORY_TABLE, $fields, $datas); -} - // +-----------------------------------------------------------------------+ // | global mode form submission | // +-----------------------------------------------------------------------+ diff --git a/sources/admin/extend_for_templates.php b/sources/admin/extend_for_templates.php index 0bab121..66b8009 100644 --- a/sources/admin/extend_for_templates.php +++ b/sources/admin/extend_for_templates.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/admin/group_list.php b/sources/admin/group_list.php index 5c53a8b..9691f49 100644 --- a/sources/admin/group_list.php +++ b/sources/admin/group_list.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/admin/group_perm.php b/sources/admin/group_perm.php index 28ea481..d4311e0 100644 --- a/sources/admin/group_perm.php +++ b/sources/admin/group_perm.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/admin/help.php b/sources/admin/help.php index 0625ea6..cdc3bdf 100644 --- a/sources/admin/help.php +++ b/sources/admin/help.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/admin/history.php b/sources/admin/history.php index 26855bb..40648e4 100644 --- a/sources/admin/history.php +++ b/sources/admin/history.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -50,7 +50,7 @@ else $page['start'] = 0; } -$types = array('none', 'picture', 'high', 'other'); +$types = array_merge(array('none'), get_enums(HISTORY_TABLE, 'image_type')); $display_thumbnails = array('no_display_thumbnail' => l10n('No display'), 'display_thumbnail_classic' => l10n('Classic display'), diff --git a/sources/admin/include/add_core_tabs.inc.php b/sources/admin/include/add_core_tabs.inc.php index 28cf1ce..9cef0f0 100644 --- a/sources/admin/include/add_core_tabs.inc.php +++ b/sources/admin/include/add_core_tabs.inc.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/admin/include/albums_tab.inc.php b/sources/admin/include/albums_tab.inc.php index 399778d..8bccb53 100644 --- a/sources/admin/include/albums_tab.inc.php +++ b/sources/admin/include/albums_tab.inc.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/admin/include/c13y_internal.class.php b/sources/admin/include/c13y_internal.class.php index 1037509..acf4a32 100644 --- a/sources/admin/include/c13y_internal.class.php +++ b/sources/admin/include/c13y_internal.class.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -23,7 +23,7 @@ class c13y_internal { - function c13y_internal() + function __construct() { add_event_handler('list_check_integrity', array(&$this, 'c13y_version')); add_event_handler('list_check_integrity', array(&$this, 'c13y_exif')); diff --git a/sources/admin/include/check_integrity.class.php b/sources/admin/include/check_integrity.class.php index 66ff1db..bf21041 100644 --- a/sources/admin/include/check_integrity.class.php +++ b/sources/admin/include/check_integrity.class.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -27,7 +27,7 @@ class check_integrity var $retrieve_list; var $build_ignore_list; - function check_integrity() + function __construct() { $this->ignore_list = array(); $this->retrieve_list = array(); diff --git a/sources/admin/include/configuration_sizes_process.inc.php b/sources/admin/include/configuration_sizes_process.inc.php index a731aa5..92d746d 100644 --- a/sources/admin/include/configuration_sizes_process.inc.php +++ b/sources/admin/include/configuration_sizes_process.inc.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/admin/include/configuration_watermark_process.inc.php b/sources/admin/include/configuration_watermark_process.inc.php index ad23d92..bc14517 100644 --- a/sources/admin/include/configuration_watermark_process.inc.php +++ b/sources/admin/include/configuration_watermark_process.inc.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -126,6 +126,7 @@ if (count($errors) == 0) $watermark->xpos = intval($pwatermark['xpos']); $watermark->ypos = intval($pwatermark['ypos']); $watermark->xrepeat = intval($pwatermark['xrepeat']); + $watermark->yrepeat = intval($pwatermark['yrepeat']); $watermark->opacity = intval($pwatermark['opacity']); $watermark->min_size = array(intval($pwatermark['minw']),intval($pwatermark['minh'])); @@ -135,6 +136,7 @@ if (count($errors) == 0) || $watermark->xpos != $old_watermark->xpos || $watermark->ypos != $old_watermark->ypos || $watermark->xrepeat != $old_watermark->xrepeat + || $watermark->yrepeat != $old_watermark->yrepeat || $watermark->opacity != $old_watermark->opacity; // save the new watermark configuration diff --git a/sources/admin/include/functions.php b/sources/admin/include/functions.php index 7d29f57..9a827d1 100644 --- a/sources/admin/include/functions.php +++ b/sources/admin/include/functions.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -180,6 +180,25 @@ function delete_element_files($ids) } $new_ids = array(); + $formats_of = array(); + + $query = ' +SELECT + image_id, + ext + FROM '.IMAGE_FORMAT_TABLE.' + WHERE image_id IN ('.implode(',', $ids).') +;'; + $result = pwg_query($query); + while ($row = pwg_db_fetch_assoc($result)) + { + if (!isset($formats_of[ $row['image_id'] ])) + { + $formats_of[ $row['image_id'] ] = array(); + } + + $formats_of[ $row['image_id'] ][] = $row['ext']; + } $query = ' SELECT @@ -205,6 +224,14 @@ SELECT $files[] = original_to_representative( $files[0], $row['representative_ext']); } + if (isset($formats_of[ $row['id'] ])) + { + foreach ($formats_of[ $row['id'] ] as $format_ext) + { + $files[] = original_to_format($files[0], $format_ext); + } + } + $ok = true; if (!isset($conf['never_delete_originals'])) { @@ -277,6 +304,13 @@ DELETE FROM '.IMAGE_CATEGORY_TABLE.' ;'; pwg_query($query); + // destruction of the formats + $query = ' +DELETE FROM '.IMAGE_FORMAT_TABLE.' + WHERE image_id IN ('. $ids_str .') +;'; + pwg_query($query); + // destruction of the links between images and tags $query = ' DELETE FROM '.IMAGE_TAG_TABLE.' @@ -358,6 +392,7 @@ function delete_user($user_id) CADDIE_TABLE, // deletion of piwigo specific informations USER_INFOS_TABLE, + USER_AUTH_KEYS_TABLE ); foreach ($tables as $table) @@ -370,11 +405,7 @@ DELETE FROM '.$table.' } // purge of sessions - $query = ' -DELETE FROM '.SESSIONS_TABLE.' - WHERE data LIKE \'pwg_uid|i:'.(int)$user_id.';%\' -;'; - pwg_query($query); + delete_user_sessions($user_id); // destruction of the user $query = ' @@ -540,6 +571,7 @@ function get_fs_directories($path, $recursive = true) '.', '..', '.svn', 'thumbnail', 'pwg_high', 'pwg_representative', + 'pwg_format', ) ); $exclude_folders = array_flip($exclude_folders); @@ -886,6 +918,25 @@ SELECT uppercats return $uppercats; } +/** + */ +function get_category_representant_properties($image_id) +{ + $query = ' +SELECT id,representative_ext,path + FROM '.IMAGES_TABLE.' + WHERE id = '.$image_id.' +;'; + $row = pwg_db_fetch_assoc(pwg_query($query)); + $src = DerivativeImage::thumb_url($row); + $url = get_root_url().'admin.php?page=photo-'.$image_id; + + return array( + 'src' => $src, + 'url' => $url + ); +} + /** * Set a new random representant to the categories. * @@ -2025,6 +2076,8 @@ function cat_admin_access($category_id) */ function fetchRemote($src, &$dest, $get_data=array(), $post_data=array(), $user_agent='Piwigo', $step=0) { + global $conf; + // Try to retrieve data from local file? if (!url_is_remote($src)) { @@ -2060,6 +2113,17 @@ function fetchRemote($src, &$dest, $get_data=array(), $post_data=array(), $user_ if (function_exists('curl_init') && function_exists('curl_exec')) { $ch = @curl_init(); + + if (isset($conf['use_proxy']) && $conf['use_proxy']) + { + @curl_setopt($ch, CURLOPT_HTTPPROXYTUNNEL, 0); + @curl_setopt($ch, CURLOPT_PROXY, $conf['proxy_server']); + if (isset($conf['proxy_auth']) && !empty($conf['proxy_auth'])) + { + @curl_setopt($ch, CURLOPT_PROXYUSERPWD, $conf['proxy_auth']); + } + } + @curl_setopt($ch, CURLOPT_URL, $src); @curl_setopt($ch, CURLOPT_HEADER, 1); @curl_setopt($ch, CURLOPT_USERAGENT, $user_agent); @@ -2775,4 +2839,51 @@ SELECT CONCAT( } return $keys; -} \ No newline at end of file +} + +/** + * Return the list of image ids associated to no album + * + * @return int[] $image_ids + */ +function get_orphans() +{ + $query = ' +SELECT + id + FROM '.IMAGES_TABLE.' + LEFT JOIN '.IMAGE_CATEGORY_TABLE.' ON id = image_id + WHERE category_id is null +;'; + + return query2array($query, null, 'id'); +} + +/** + * save the rank depending on given images order + * + * The list of ordered images id is supposed to be in the same parent + * category + * + * @param int category_id + * @param int[] images + * @return void + */ +function save_images_order($category_id, $images) +{ + $current_rank = 0; + $datas = array(); + foreach ($images as $id) + { + $datas[] = array( + 'category_id' => $category_id, + 'image_id' => $id, + 'rank' => ++$current_rank, + ); + } + $fields = array( + 'primary' => array('image_id', 'category_id'), + 'update' => array('rank') + ); + mass_updates(IMAGE_CATEGORY_TABLE, $fields, $datas); +} diff --git a/sources/admin/include/functions_history.inc.php b/sources/admin/include/functions_history.inc.php index e2bcc4d..55783fd 100644 --- a/sources/admin/include/functions_history.inc.php +++ b/sources/admin/include/functions_history.inc.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/admin/include/functions_install.inc.php b/sources/admin/include/functions_install.inc.php index a978355..5a68964 100644 --- a/sources/admin/include/functions_install.inc.php +++ b/sources/admin/include/functions_install.inc.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/admin/include/functions_metadata.php b/sources/admin/include/functions_metadata.php index d969d06..01b4538 100644 --- a/sources/admin/include/functions_metadata.php +++ b/sources/admin/include/functions_metadata.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -68,20 +68,7 @@ function get_sync_iptc_data($file) if (isset($iptc['keywords'])) { - // official keywords separator is the comma - $iptc['keywords'] = preg_replace('/[.;]/', ',', $iptc['keywords']); - $iptc['keywords'] = preg_replace('/,+/', ',', $iptc['keywords']); - $iptc['keywords'] = preg_replace('/^,+|,+$/', '', $iptc['keywords']); - - $iptc['keywords'] = implode( - ',', - array_unique( - explode( - ',', - $iptc['keywords'] - ) - ) - ); + $iptc['keywords'] = metadata_normalize_keywords_string($iptc['keywords']); } foreach ($iptc as $pwg_key => $value) @@ -122,6 +109,12 @@ function get_sync_exif_data($file) continue; } } + + if (in_array($pwg_key, array('keywords', 'tags'))) + { + $exif[$pwg_key] = metadata_normalize_keywords_string($exif[$pwg_key]); + } + $exif[$pwg_key] = addslashes($exif[$pwg_key]); } @@ -180,8 +173,24 @@ function get_sync_metadata($infos) $infos['filesize'] = floor($fs/1024); + $is_tiff = false; + if (isset($infos['representative_ext'])) { + if ($image_size = @getimagesize($file)) + { + $type = $image_size[2]; + + if (IMAGETYPE_TIFF_MM == $type or IMAGETYPE_TIFF_II == $type) + { + // in case of TIFF files, we want to use the original file and not + // the representative for EXIF/IPTC, but we need the representative + // for width/height (to compute the multiple size dimensions) + $is_tiff = true; + } + + } + $file = original_to_representative($file, $infos['representative_ext']); } @@ -191,6 +200,12 @@ function get_sync_metadata($infos) $infos['height'] = $image_size[1]; } + if ($is_tiff) + { + // back to original file + $file = PHPWG_ROOT_PATH.$infos['path']; + } + if ($conf['use_exif']) { $exif = get_sync_exif_data($file); @@ -351,4 +366,31 @@ SELECT id, path, representative_ext return hash_from_query($query, 'id'); } +/** + * Returns the list of keywords (future tags) correctly separated with + * commas. Other separators are converted into commas. + * + * @param string $keywords_string + * @return string + */ +function metadata_normalize_keywords_string($keywords_string) +{ + global $conf; + + $keywords_string = preg_replace($conf['metadata_keyword_separator_regex'], ',', $keywords_string); + $keywords_string = preg_replace('/,+/', ',', $keywords_string); + $keywords_string = preg_replace('/^,+|,+$/', '', $keywords_string); + + $keywords_string = implode( + ',', + array_unique( + explode( + ',', + $keywords_string + ) + ) + ); + + return $keywords_string; +} ?> \ No newline at end of file diff --git a/sources/admin/include/functions_notification_by_mail.inc.php b/sources/admin/include/functions_notification_by_mail.inc.php index 8d0fe26..204be5c 100644 --- a/sources/admin/include/functions_notification_by_mail.inc.php +++ b/sources/admin/include/functions_notification_by_mail.inc.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -125,12 +125,12 @@ select U.'.$conf['user_fields']['username'].' as username, U.'.$conf['user_fields']['email'].' as mail_address, N.enabled, - N.last_send -from - '.USER_MAIL_NOTIFICATION_TABLE.' as N, - '.USERS_TABLE.' as U -where - N.user_id = U.'.$conf['user_fields']['id']; + N.last_send, + UI.status +from '.USER_MAIL_NOTIFICATION_TABLE.' as N + JOIN '.USERS_TABLE.' as U on N.user_id = U.'.$conf['user_fields']['id'].' + JOIN '.USER_INFOS_TABLE.' as UI on UI.user_id = N.user_id +where 1=1'; if ($action == 'send') { @@ -159,7 +159,7 @@ order by'; else { $query .= ' - username;'; + username'; } $query .= ';'; diff --git a/sources/admin/include/functions_permalinks.php b/sources/admin/include/functions_permalinks.php index 6c8ae4a..db06796 100644 --- a/sources/admin/include/functions_permalinks.php +++ b/sources/admin/include/functions_permalinks.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/admin/include/functions_plugins.inc.php b/sources/admin/include/functions_plugins.inc.php index fb98c79..8605f1f 100644 --- a/sources/admin/include/functions_plugins.inc.php +++ b/sources/admin/include/functions_plugins.inc.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/admin/include/functions_upgrade.php b/sources/admin/include/functions_upgrade.php index b7a8763..bf6ef2b 100644 --- a/sources/admin/include/functions_upgrade.php +++ b/sources/admin/include/functions_upgrade.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -174,10 +174,7 @@ UPDATE '.PREFIX_TABLE.'user_infos // Deactivate all templates function deactivate_templates() { - $query = ' - UPDATE '.PREFIX_TABLE.'config - SET value = \''. array() .'\' - WHERE param = \'extents_for_templates\';'; + conf_update_param('extents_for_templates', array()); } // Check access rights @@ -322,4 +319,4 @@ function upgrade_db_connect() my_error(l10n($e->getMessage()), true); } } -?> \ No newline at end of file +?> diff --git a/sources/admin/include/functions_upload.inc.php b/sources/admin/include/functions_upload.inc.php index d0ef6e6..900612f 100644 --- a/sources/admin/include/functions_upload.inc.php +++ b/sources/admin/include/functions_upload.inc.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -268,104 +268,19 @@ SELECT } @chmod($file_path, 0644); - if ($is_tiff and pwg_image::get_library() == 'ext_imagick') - { - // move the uploaded file to pwg_representative sub-directory - $representative_file_path = dirname($file_path).'/pwg_representative/'; - $representative_file_path.= get_filename_wo_extension(basename($file_path)).'.'; + // handle the uploaded file type by potentially making a + // pwg_representative file. + $representative_ext = trigger_change('upload_file', null, $file_path); - $representative_ext = $conf['tiff_representative_ext']; - $representative_file_path.= $representative_ext; - - prepare_directory(dirname($representative_file_path)); - - $exec = $conf['ext_imagick_dir'].'convert'; - - if ('jpg' == $conf['tiff_representative_ext']) - { - $exec .= ' -quality 98'; - } - - $exec .= ' "'.realpath($file_path).'"'; - - $dest = pathinfo($representative_file_path); - $exec .= ' "'.realpath($dest['dirname']).'/'.$dest['basename'].'"'; - - $exec .= ' 2>&1'; - @exec($exec, $returnarray); - - // sometimes ImageMagick creates file-0.jpg (full size) + file-1.jpg - // (thumbnail). I don't know how to avoid it. - $representative_file_abspath = realpath($dest['dirname']).'/'.$dest['basename']; - if (!file_exists($representative_file_abspath)) - { - $first_file_abspath = preg_replace( - '/\.'.$representative_ext.'$/', - '-0.'.$representative_ext, - $representative_file_abspath - ); - - if (file_exists($first_file_abspath)) - { - rename($first_file_abspath, $representative_file_abspath); - } - } - } - - // - // generate pwg_representative in case of video - // - $ffmpeg_video_exts = array( // extensions tested with FFmpeg - 'wmv','mov','mkv','mp4','mpg','flv','asf','xvid','divx','mpeg', - 'avi','rm', - ); + global $logger; + $logger->info("Handling " . (string)$file_path . " got " . (string)$representative_ext); - if (isset($original_extension) and in_array($original_extension, $ffmpeg_video_exts)) - { - $representative_file_path = dirname($file_path).'/pwg_representative/'; - $representative_file_path.= get_filename_wo_extension(basename($file_path)).'.'; - - $representative_ext = 'jpg'; - $representative_file_path.= $representative_ext; - - prepare_directory(dirname($representative_file_path)); - - $second = 1; - - $ffmpeg = $conf['ffmpeg_dir'].'ffmpeg'; - $ffmpeg.= ' -i "'.$file_path.'"'; - $ffmpeg.= ' -an -ss '.$second; - $ffmpeg.= ' -t 1 -r 1 -y -vcodec mjpeg -f mjpeg'; - $ffmpeg.= ' "'.$representative_file_path.'"'; - - // file_put_contents('/tmp/ffmpeg.log', "\n==== ".date('c')."\n".__FUNCTION__.' : '.$ffmpeg."\n", FILE_APPEND); - - @exec($ffmpeg); - - if (!file_exists($representative_file_path)) - { - $representative_ext = null; - } - } - - if (isset($original_extension) and 'pdf' == $original_extension and pwg_image::get_library() == 'ext_imagick') - { - $representative_file_path = dirname($file_path).'/pwg_representative/'; - $representative_file_path.= get_filename_wo_extension(basename($file_path)).'.'; - - $representative_ext = 'jpg'; - $representative_file_path.= $representative_ext; - - prepare_directory(dirname($representative_file_path)); - - $exec = $conf['ext_imagick_dir'].'convert'; - $exec.= ' -quality 98'; - $exec.= ' "'.realpath($file_path).'"[0]'; - - $dest = pathinfo($representative_file_path); - $exec.= ' "'.realpath($dest['dirname']).'/'.$dest['basename'].'"'; - $exec.= ' 2>&1'; - @exec($exec, $returnarray); + // If it is set to either true (the file didn't need a + // representative generated) or false (the generation of the + // representative failed), set it to null because we have no + // representative file. + if (is_bool($representative_ext)) { + $representative_ext = null; } if (pwg_image::get_library() != 'gd') @@ -492,6 +407,168 @@ SELECT return $image_id; } +add_event_handler('upload_file', 'upload_file_pdf'); +function upload_file_pdf($representative_ext, $file_path) +{ + global $logger, $conf; + + $logger->info(__FUNCTION__.', $file_path = '.$file_path.', $representative_ext = '.$representative_ext); + + if (isset($representative_ext)) + { + return $representative_ext; + } + + if (pwg_image::get_library() != 'ext_imagick') + { + return $representative_ext; + } + + if (!in_array(strtolower(get_extension($file_path)), array('pdf'))) + { + return $representative_ext; + } + + $ext = conf_get_param('pdf_representative_ext', 'jpg'); + $jpg_quality = conf_get_param('pdf_jpg_quality', 90); + + // move the uploaded file to pwg_representative sub-directory + $representative_file_path = original_to_representative($file_path, $ext); + prepare_directory(dirname($representative_file_path)); + + $exec = $conf['ext_imagick_dir'].'convert'; + if ('jpg' == $ext) + { + $exec.= ' -quality '.$jpg_quality; + } + $exec.= ' "'.realpath($file_path).'"[0]'; + $exec.= ' "'.$representative_file_path.'"'; + $exec.= ' 2>&1'; + @exec($exec, $returnarray); + + // Return the extension (if successful) or false (if failed) + if (file_exists($representative_file_path)) + { + $representative_ext = $ext; + } + + return $representative_ext; +} + +add_event_handler('upload_file', 'upload_file_tiff'); +function upload_file_tiff($representative_ext, $file_path) +{ + global $logger, $conf; + + $logger->info(__FUNCTION__.', $file_path = '.$file_path.', $representative_ext = '.$representative_ext); + + if (isset($representative_ext)) + { + return $representative_ext; + } + + if (pwg_image::get_library() != 'ext_imagick') + { + return $representative_ext; + } + + if (!in_array(strtolower(get_extension($file_path)), array('tif', 'tiff'))) + { + return $representative_ext; + } + + // move the uploaded file to pwg_representative sub-directory + $representative_file_path = dirname($file_path).'/pwg_representative/'; + $representative_file_path.= get_filename_wo_extension(basename($file_path)).'.'; + + $representative_ext = $conf['tiff_representative_ext']; + $representative_file_path.= $representative_ext; + + prepare_directory(dirname($representative_file_path)); + + $exec = $conf['ext_imagick_dir'].'convert'; + + if ('jpg' == $conf['tiff_representative_ext']) + { + $exec .= ' -quality 98'; + } + + $exec .= ' "'.realpath($file_path).'"'; + + $dest = pathinfo($representative_file_path); + $exec .= ' "'.realpath($dest['dirname']).'/'.$dest['basename'].'"'; + + $exec .= ' 2>&1'; + @exec($exec, $returnarray); + + // sometimes ImageMagick creates file-0.jpg (full size) + file-1.jpg + // (thumbnail). I don't know how to avoid it. + $representative_file_abspath = realpath($dest['dirname']).'/'.$dest['basename']; + if (!file_exists($representative_file_abspath)) + { + $first_file_abspath = preg_replace( + '/\.'.$representative_ext.'$/', + '-0.'.$representative_ext, + $representative_file_abspath + ); + + if (file_exists($first_file_abspath)) + { + rename($first_file_abspath, $representative_file_abspath); + } + } + + return get_extension($representative_file_abspath); +} + +add_event_handler('upload_file', 'upload_file_video'); +function upload_file_video($representative_ext, $file_path) +{ + global $logger, $conf; + + $logger->info(__FUNCTION__.', $file_path = '.$file_path.', $representative_ext = '.$representative_ext); + + if (isset($representative_ext)) + { + return $representative_ext; + } + + $ffmpeg_video_exts = array( // extensions tested with FFmpeg + 'wmv','mov','mkv','mp4','mpg','flv','asf','xvid','divx','mpeg', + 'avi','rm', 'm4v', 'ogg', 'ogv', 'webm', 'webmv', + ); + + if (!in_array(strtolower(get_extension($file_path)), $ffmpeg_video_exts)) + { + return $representative_ext; + } + + $representative_file_path = dirname($file_path).'/pwg_representative/'; + $representative_file_path.= get_filename_wo_extension(basename($file_path)).'.'; + + $representative_ext = 'jpg'; + $representative_file_path.= $representative_ext; + + prepare_directory(dirname($representative_file_path)); + + $second = 1; + + $ffmpeg = $conf['ffmpeg_dir'].'ffmpeg'; + $ffmpeg.= ' -i "'.$file_path.'"'; + $ffmpeg.= ' -an -ss '.$second; + $ffmpeg.= ' -t 1 -r 1 -y -vcodec mjpeg -f mjpeg'; + $ffmpeg.= ' "'.$representative_file_path.'"'; + + @exec($ffmpeg); + + if (!file_exists($representative_file_path)) + { + return null; + } + + return $representative_ext; +} + function prepare_directory($directory) { if (!is_dir($directory)) { diff --git a/sources/admin/include/image.class.php b/sources/admin/include/image.class.php index e776997..e713a84 100644 --- a/sources/admin/include/image.class.php +++ b/sources/admin/include/image.class.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -621,6 +621,8 @@ class image_ext_imagick implements imageInterface function write($destination_filepath) { + global $logger; + $this->add_command('interlace', 'line'); // progressive rendering // use 4:2:2 chroma subsampling (reduce file size by 20-30% with "almost" no human perception) // @@ -648,13 +650,13 @@ class image_ext_imagick implements imageInterface $dest = pathinfo($destination_filepath); $exec .= ' "'.realpath($dest['dirname']).'/'.$dest['basename'].'" 2>&1'; + $logger->debug($exec, 'i.php'); @exec($exec, $returnarray); - if (function_exists('ilog')) ilog($exec); if (is_array($returnarray) && (count($returnarray)>0) ) { - if (function_exists('ilog')) ilog('ERROR', $returnarray); - foreach($returnarray as $line) + $logger->error('', 'i.php', $returnarray); + foreach ($returnarray as $line) trigger_error($line, E_USER_WARNING); } return is_array($returnarray); diff --git a/sources/admin/include/index.php b/sources/admin/include/index.php index c8de97f..0b96c3e 100644 --- a/sources/admin/include/index.php +++ b/sources/admin/include/index.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/admin/include/languages.class.php b/sources/admin/include/languages.class.php index 351e36d..6f67805 100644 --- a/sources/admin/include/languages.class.php +++ b/sources/admin/include/languages.class.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -30,7 +30,7 @@ class languages /** * Initialize $fs_languages and $db_languages */ - function languages($target_charset = null) + function __construct($target_charset = null) { $this->get_fs_languages($target_charset); } @@ -408,4 +408,4 @@ UPDATE '.USER_INFOS_TABLE.' return strcmp(strtolower($a['extension_name']), strtolower($b['extension_name'])); } } -?> \ No newline at end of file +?> diff --git a/sources/admin/include/mysqldump.php b/sources/admin/include/mysqldump.php index 515d86a..1432675 100644 --- a/sources/admin/include/mysqldump.php +++ b/sources/admin/include/mysqldump.php @@ -59,7 +59,7 @@ class MySQLDump { * @param boolean $compress It defines if the output file is compress (gzip) or not * @param boolean $hexValue It defines if the outup values are base-16 or not */ - function MYSQLDump($db = null, $filepath = 'dump.sql', $compress = false, $hexValue = false){ + function __construct($db = null, $filepath = 'dump.sql', $compress = false, $hexValue = false){ $this->compress = $compress; if ( !$this->setOutputFile($filepath) ) return false; @@ -418,4 +418,4 @@ class MySQLDump { @fclose($file); } } -?> \ No newline at end of file +?> diff --git a/sources/admin/include/pclzip.lib.php b/sources/admin/include/pclzip.lib.php index e7facc1..c2d09a5 100644 --- a/sources/admin/include/pclzip.lib.php +++ b/sources/admin/include/pclzip.lib.php @@ -212,7 +212,7 @@ // Note that no real action is taken, if the archive does not exist it is not // created. Use create() for that. // -------------------------------------------------------------------------------- - function PclZip($p_zipname) + function __construct($p_zipname) { // ----- Tests the zlib diff --git a/sources/admin/include/photos_add_direct_prepare.inc.php b/sources/admin/include/photos_add_direct_prepare.inc.php index 34b025f..a795247 100644 --- a/sources/admin/include/photos_add_direct_prepare.inc.php +++ b/sources/admin/include/photos_add_direct_prepare.inc.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -25,25 +25,10 @@ // | Photo selection | // +-----------------------------------------------------------------------+ -$upload_max_filesize = min( - get_ini_size('upload_max_filesize'), - get_ini_size('post_max_size') - ); - -if ($upload_max_filesize == get_ini_size('upload_max_filesize')) -{ - $upload_max_filesize_shorthand = get_ini_size('upload_max_filesize', false); -} -else -{ - $upload_max_filesize_shorthand = get_ini_size('post_max_filesize', false); -} - $template->assign( array( 'F_ADD_ACTION'=> PHOTOS_ADD_BASE_URL, - 'upload_max_filesize' => $upload_max_filesize, - 'upload_max_filesize_shorthand' => $upload_max_filesize_shorthand, + 'chunk_size' => $conf['upload_form_chunk_size'], ) ); @@ -221,6 +206,16 @@ if (!isset($_SESSION['upload_hide_warnings'])) get_ini_size('post_max_size', false) ); } + + if (get_ini_size('upload_max_filesize') < $conf['upload_form_chunk_size']*1024) + { + $setup_warnings[] = sprintf( + 'Piwigo setting upload_form_chunk_size (%ukB) should be smaller than PHP configuration setting upload_max_filesize (%ukB)', + $conf['upload_form_chunk_size'], + ceil(get_ini_size('upload_max_filesize') / 1024) + ); + } + $template->assign( array( 'setup_warnings' => $setup_warnings, @@ -229,4 +224,4 @@ if (!isset($_SESSION['upload_hide_warnings'])) ); } -?> \ No newline at end of file +?> diff --git a/sources/admin/include/plugins.class.php b/sources/admin/include/plugins.class.php index 71093a6..8b4b82b 100644 --- a/sources/admin/include/plugins.class.php +++ b/sources/admin/include/plugins.class.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -69,7 +69,7 @@ class plugins /** * Initialize $fs_plugins and $db_plugins_by_id */ - function plugins() + function __construct() { $this->get_fs_plugins(); @@ -716,4 +716,4 @@ DELETE FROM '. PLUGINS_TABLE .' $this->fs_plugins = $active_plugins + $inactive_plugins + $not_installed; } } -?> \ No newline at end of file +?> diff --git a/sources/admin/include/tabsheet.class.php b/sources/admin/include/tabsheet.class.php index c7681b6..cb89886 100644 --- a/sources/admin/include/tabsheet.class.php +++ b/sources/admin/include/tabsheet.class.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -33,7 +33,7 @@ class tabsheet $name is the tabsheet's name inside the template .tpl file $titlename in the template is affected by $titlename value */ - function tabsheet($name = 'TABSHEET', $titlename = 'TABSHEET_TITLE') + function __construct($name = 'TABSHEET', $titlename = 'TABSHEET_TITLE') { $this->sheets = array(); $this->uniqid = null; diff --git a/sources/admin/include/themes.class.php b/sources/admin/include/themes.class.php index df0e29e..6d55e11 100644 --- a/sources/admin/include/themes.class.php +++ b/sources/admin/include/themes.class.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -60,7 +60,7 @@ class themes /** * Initialize $fs_themes and $db_themes_by_id */ - function themes() + function __construct() { $this->get_fs_themes(); @@ -736,4 +736,4 @@ SELECT } } -?> \ No newline at end of file +?> diff --git a/sources/admin/include/updates.class.php b/sources/admin/include/updates.class.php index 17a3b25..d4e178f 100644 --- a/sources/admin/include/updates.class.php +++ b/sources/admin/include/updates.class.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -135,15 +135,33 @@ class updates { return false; } + + $servers = array(); + foreach ($pem_exts as $ext) { if (isset($ext_to_check[$ext['extension_id']])) { - $server = 'server_'.$ext_to_check[$ext['extension_id']]; - $this->$ext_to_check[$ext['extension_id']]->$server += array($ext['extension_id'] => $ext); + $type = $ext_to_check[$ext['extension_id']]; + + if (!isset($servers[$type])) + { + $servers[$type] = array(); + } + + $servers[$type][ $ext['extension_id'] ] = $ext; + unset($ext_to_check[$ext['extension_id']]); } } + + foreach ($servers as $server_type => $extension_list) + { + $server_string = 'server_'.$server_type; + + $this->$server_type->$server_string = $extension_list; + } + $this->check_missing_extensions($ext_to_check); return true; } diff --git a/sources/admin/index.php b/sources/admin/index.php index c8de97f..0b96c3e 100644 --- a/sources/admin/index.php +++ b/sources/admin/index.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/admin/intro.php b/sources/admin/intro.php index ee01498..96b07d2 100644 --- a/sources/admin/intro.php +++ b/sources/admin/intro.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/admin/languages.php b/sources/admin/languages.php index c901d92..0ea4c17 100644 --- a/sources/admin/languages.php +++ b/sources/admin/languages.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/admin/languages_installed.php b/sources/admin/languages_installed.php index eb0a895..16d9df6 100644 --- a/sources/admin/languages_installed.php +++ b/sources/admin/languages_installed.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/admin/languages_new.php b/sources/admin/languages_new.php index bf46cbb..afa756c 100644 --- a/sources/admin/languages_new.php +++ b/sources/admin/languages_new.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/admin/maintenance.php b/sources/admin/maintenance.php index 5c93346..3728d60 100644 --- a/sources/admin/maintenance.php +++ b/sources/admin/maintenance.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -109,6 +109,46 @@ DELETE case 'sessions' : { pwg_session_gc(); + + // delete all sessions associated to invalid user ids (it should never happen) + $query = ' +SELECT + id, + data + FROM '.SESSIONS_TABLE.' +;'; + $sessions = query2array($query); + + $query = ' +SELECT + '.$conf['user_fields']['id'].' AS id + FROM '.USERS_TABLE.' +;'; + $all_user_ids = query2array($query, 'id', null); + + $sessions_to_delete = array(); + + foreach ($sessions as $session) + { + if (preg_match('/pwg_uid\|i:(\d+);/', $session['data'], $matches)) + { + if (!isset($all_user_ids[ $matches[1] ])) + { + $sessions_to_delete[] = $session['id']; + } + } + } + + if (count($sessions_to_delete) > 0) + { + $query = ' +DELETE + FROM '.SESSIONS_TABLE.' + WHERE id IN (\''.implode("','", $sessions_to_delete).'\') +;'; + pwg_query($query); + } + break; } case 'feeds' : diff --git a/sources/admin/menubar.php b/sources/admin/menubar.php index 69e363c..e884fab 100644 --- a/sources/admin/menubar.php +++ b/sources/admin/menubar.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/admin/notification_by_mail.php b/sources/admin/notification_by_mail.php index 38cadff..ca3d412 100644 --- a/sources/admin/notification_by_mail.php +++ b/sources/admin/notification_by_mail.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -289,13 +289,24 @@ function do_action_send_mail_notification($action = 'list_to_send', $check_key_l if ($is_action_send) { + $auth = null; + $add_url_params = array(); + + $auth_key = create_user_auth_key($nbm_user['user_id'], $nbm_user['status']); + + if ($auth_key !== false) + { + $auth = $auth_key['auth_key']; + $add_url_params['auth'] = $auth; + } + set_make_full_url(); // Fill return list of "treated" check_key for 'send' $return_list[] = $nbm_user['check_key']; if ($conf['nbm_send_detailed_content']) { - $news = news($nbm_user['last_send'], $dbnow, false, $conf['nbm_send_html_mail']); + $news = news($nbm_user['last_send'], $dbnow, false, $conf['nbm_send_html_mail'], $auth); $exist_data = count($news) > 0; } else @@ -362,7 +373,7 @@ function do_action_send_mail_notification($action = 'list_to_send', $check_key_l array ( 'TITLE' => get_title_recent_post_date($date_detail), - 'HTML_DATA' => get_html_description_recent_post_date($date_detail) + 'HTML_DATA' => get_html_description_recent_post_date($date_detail, $auth) ) ); } @@ -373,7 +384,7 @@ function do_action_send_mail_notification($action = 'list_to_send', $check_key_l array ( 'GOTO_GALLERY_TITLE' => $conf['gallery_title'], - 'GOTO_GALLERY_URL' => get_gallery_home_url(), + 'GOTO_GALLERY_URL' => add_url_params(get_gallery_home_url(), $add_url_params), 'SEND_AS_NAME' => $env_nbm['send_as_name'], ) ); @@ -389,6 +400,7 @@ function do_action_send_mail_notification($action = 'list_to_send', $check_key_l 'email_format' => $env_nbm['email_format'], 'content' => $env_nbm['mail_template']->parse('notification_by_mail', true), 'content_format' => $env_nbm['email_format'], + 'auth_key' => $auth, ) ); @@ -707,6 +719,20 @@ switch ($page['mode']) } } $template->assign($page['mode'], $tpl_var); + + if ($conf['auth_key_duration'] > 0) + { + $template->assign( + 'auth_key_duration', + time_since( + strtotime('now -'.$conf['auth_key_duration'].' second'), + 'second', + null, + false + ) + ); + } + break; } } diff --git a/sources/admin/permalinks.php b/sources/admin/permalinks.php index 72f9513..e09a213 100644 --- a/sources/admin/permalinks.php +++ b/sources/admin/permalinks.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/admin/photo.php b/sources/admin/photo.php index b99a76c..c1d0687 100644 --- a/sources/admin/photo.php +++ b/sources/admin/photo.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/admin/photos_add.php b/sources/admin/photos_add.php index 72bf991..457e281 100644 --- a/sources/admin/photos_add.php +++ b/sources/admin/photos_add.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/admin/photos_add_applications.php b/sources/admin/photos_add_applications.php index 82c95fd..1cb35e9 100644 --- a/sources/admin/photos_add_applications.php +++ b/sources/admin/photos_add_applications.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/admin/photos_add_direct.php b/sources/admin/photos_add_direct.php index 9f3e888..fd4efe5 100644 --- a/sources/admin/photos_add_direct.php +++ b/sources/admin/photos_add_direct.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/admin/photos_add_ftp.php b/sources/admin/photos_add_ftp.php index 5655d0f..e48a237 100644 --- a/sources/admin/photos_add_ftp.php +++ b/sources/admin/photos_add_ftp.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/admin/picture_coi.php b/sources/admin/picture_coi.php index 6ad8fa9..26540d6 100644 --- a/sources/admin/picture_coi.php +++ b/sources/admin/picture_coi.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/admin/picture_modify.php b/sources/admin/picture_modify.php index bf0e458..ab62c56 100644 --- a/sources/admin/picture_modify.php +++ b/sources/admin/picture_modify.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -306,6 +306,25 @@ SELECT $intro_vars['stats'].= ', '.sprintf(l10n('Rated %d times, score : %.2f'), $row['nb_rates'], $row['rating_score']); } +$query = ' +SELECT * + FROM '.IMAGE_FORMAT_TABLE.' + WHERE image_id = '.$row['id'].' +;'; +$formats = query2array($query); + +if (!empty($formats)) +{ + $format_strings = array(); + + foreach ($formats as $format) + { + $format_strings[] = sprintf('%s (%.2fMB)', $format['ext'], $format['filesize']/1024); + } + + $intro_vars['formats'] = l10n('Formats: %s', implode(', ', $format_strings)); +} + $template->assign('INTRO', $intro_vars); diff --git a/sources/admin/plugin.php b/sources/admin/plugin.php index 2acc2b7..68e0c50 100644 --- a/sources/admin/plugin.php +++ b/sources/admin/plugin.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -65,4 +65,4 @@ else { die('Missing file '.$filename); } -?> +?> \ No newline at end of file diff --git a/sources/admin/plugins.php b/sources/admin/plugins.php index efe3bd8..9377aff 100644 --- a/sources/admin/plugins.php +++ b/sources/admin/plugins.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/admin/plugins_installed.php b/sources/admin/plugins_installed.php index a804e21..b87921c 100644 --- a/sources/admin/plugins_installed.php +++ b/sources/admin/plugins_installed.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/admin/plugins_new.php b/sources/admin/plugins_new.php index a8df935..2ef02f1 100644 --- a/sources/admin/plugins_new.php +++ b/sources/admin/plugins_new.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/admin/popuphelp.php b/sources/admin/popuphelp.php index 7d0a0cf..51820fe 100644 --- a/sources/admin/popuphelp.php +++ b/sources/admin/popuphelp.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/admin/profile.php b/sources/admin/profile.php index 5554fe1..71a9299 100644 --- a/sources/admin/profile.php +++ b/sources/admin/profile.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/admin/rating.php b/sources/admin/rating.php index 1592125..3525cbd 100644 --- a/sources/admin/rating.php +++ b/sources/admin/rating.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/admin/rating_user.php b/sources/admin/rating_user.php index e6eea9e..e778993 100644 --- a/sources/admin/rating_user.php +++ b/sources/admin/rating_user.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/admin/site_manager.php b/sources/admin/site_manager.php index 21fdebd..0712da3 100644 --- a/sources/admin/site_manager.php +++ b/sources/admin/site_manager.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/admin/site_reader_local.php b/sources/admin/site_reader_local.php index 7e618ca..661825f 100644 --- a/sources/admin/site_reader_local.php +++ b/sources/admin/site_reader_local.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -27,7 +27,7 @@ class LocalSiteReader var $site_url; -function LocalSiteReader($url) +function __construct($url) { $this->site_url = $url; global $conf; @@ -100,14 +100,19 @@ function get_elements($path) { $representative_ext = $this->get_representative_ext($path, $filename_wo_ext); } - $fs[ $path.'/'.$node ] = array( - 'representative_ext' => $representative_ext, - ); + + $fs[ $path.'/'.$node ] = array('representative_ext' => $representative_ext); + + if ($conf['enable_formats']) + { + $fs[ $path.'/'.$node ]['formats'] = $this->get_formats($path, $filename_wo_ext); + } } } else if (is_dir($path.'/'.$node) and $node != 'pwg_high' and $node != 'pwg_representative' + and $node != 'pwg_format' and $node != 'thumbnail' ) { $subdirs[] = $node; @@ -182,6 +187,26 @@ function get_representative_ext($path, $filename_wo_ext) return null; } +function get_formats($path, $filename_wo_ext) +{ + global $conf; + + $formats = array(); + + $base_test = $path.'/pwg_format/'.$filename_wo_ext.'.'; + + foreach ($conf['format_ext'] as $ext) + { + $test = $base_test.$ext; + + if (is_file($test)) + { + $formats[$ext] = floor(filesize($test) / 1024); + } + } + + return $formats; +} } ?> \ No newline at end of file diff --git a/sources/admin/site_update.php b/sources/admin/site_update.php index 5bcaea1..ad3ccba 100644 --- a/sources/admin/site_update.php +++ b/sources/admin/site_update.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -457,6 +457,7 @@ if (isset($_POST['submit']) and $_POST['sync'] == 'files' $start= $start_files; $fs = $site_reader->get_elements($basedir); + $template->append('footer_elements', '' ); @@ -486,6 +487,8 @@ SELECT id, path $inserts = array(); $insert_links = array(); + $insert_formats = array(); + $formats_to_delete = array(); foreach (array_diff(array_keys($fs), $db_elements) as $path) { @@ -535,20 +538,119 @@ SELECT id, path 'info' => l10n('added') ); + if ($conf['enable_formats']) + { + foreach ($fs[$path]['formats'] as $ext => $filesize) + { + $insert_formats[] = array( + 'image_id' => $insert['id'], + 'ext' => $ext, + 'filesize' => $filesize, + ); + + $infos[] = array( + 'path' => $insert['path'], + 'info' => l10n('format %s added', $ext) + ); + } + } + $caddiables[] = $insert['id']; } - if (count($inserts) > 0) + // search new/removed formats on photos already registered in database + if ($conf['enable_formats']) { - if (!$simulate) + $db_elements_flip = array_flip($db_elements); + + $existing_ids = array(); + + foreach (array_intersect_key($fs, $db_elements_flip) as $path => $existing) + { + $existing_ids[] = $db_elements_flip[$path]; + } + + $logger->debug('existing_ids', 'sync', $existing_ids); + + if (count($existing_ids) > 0) + { + $db_formats = array(); + + // find formats for existing photos (already in database) + $query = ' +SELECT * + FROM '.IMAGE_FORMAT_TABLE.' + WHERE image_id IN ('.implode(',', $existing_ids).') +;'; + $result = pwg_query($query); + while ($row = pwg_db_fetch_assoc($result)) + { + if (!isset($db_formats[$row['image_id']])) + { + $db_formats[$row['image_id']] = array(); + } + + $db_formats[$row['image_id']][$row['ext']] = $row['format_id']; + } + + // first we search the formats that were removed + foreach ($db_formats as $image_id => $formats) + { + $image_formats_to_delete = array_diff_key($formats, $fs[ $db_elements[$image_id] ]['formats']); + $logger->debug('image_formats_to_delete', 'sync', $image_formats_to_delete); + foreach ($image_formats_to_delete as $ext => $format_id) + { + $formats_to_delete[] = $format_id; + + $infos[] = array( + 'path' => $db_elements[$image_id], + 'info' => l10n('format %s removed', $ext) + ); + } + } + + // then we search for new formats on existing photos + foreach ($existing_ids as $image_id) + { + $path = $db_elements[$image_id]; + + $formats = array(); + if (isset($db_formats[$image_id])) + { + $formats = $db_formats[$image_id]; + } + + $image_formats_to_insert = array_diff_key($fs[$path]['formats'], $formats); + $logger->debug('image_formats_to_insert', 'sync', $image_formats_to_insert); + foreach ($image_formats_to_insert as $ext => $filesize) + { + $insert_formats[] = array( + 'image_id' => $image_id, + 'ext' => $ext, + 'filesize' => $filesize, + ); + + $infos[] = array( + 'path' => $db_elements[$image_id], + 'info' => l10n('format %s added', $ext) + ); + } + } + } + } + + + if (!$simulate) + { + // inserts all new elements + if (count($inserts) > 0) { - // inserts all new elements mass_inserts( IMAGES_TABLE, array_keys($inserts[0]), $inserts ); - + // inserts all links between new elements and their storage category mass_inserts( IMAGE_CATEGORY_TABLE, @@ -562,9 +664,30 @@ SELECT id, path fill_caddie($caddiables); } } - $counts['new_elements'] = count($inserts); + + // inserts all formats + if (count($insert_formats) > 0) + { + mass_inserts( + IMAGE_FORMAT_TABLE, + array_keys($insert_formats[0]), + $insert_formats + ); + } + + if (count($formats_to_delete) > 0) + { + $query = ' +DELETE + FROM '.IMAGE_FORMAT_TABLE.' + WHERE format_id IN ('.implode(',', $formats_to_delete).') +;'; + pwg_query($query); + } } + $counts['new_elements'] = count($inserts); + // delete elements that are in database but not in the filesystem $to_delete_elements = array(); foreach (array_diff($db_elements, array_keys($fs)) as $path) diff --git a/sources/admin/stats.php b/sources/admin/stats.php index e103c2e..5398d0b 100644 --- a/sources/admin/stats.php +++ b/sources/admin/stats.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/admin/tags.php b/sources/admin/tags.php index c643391..ce503ba 100644 --- a/sources/admin/tags.php +++ b/sources/admin/tags.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/admin/theme.php b/sources/admin/theme.php index 984ac45..eef3fb1 100644 --- a/sources/admin/theme.php +++ b/sources/admin/theme.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/admin/themes.php b/sources/admin/themes.php index 5359974..a903ddb 100644 --- a/sources/admin/themes.php +++ b/sources/admin/themes.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/admin/themes/clear/icon/index.php b/sources/admin/themes/clear/icon/index.php index e336595..6a7aa65 100644 --- a/sources/admin/themes/clear/icon/index.php +++ b/sources/admin/themes/clear/icon/index.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/admin/themes/clear/index.php b/sources/admin/themes/clear/index.php index d959f2c..f08fc44 100644 --- a/sources/admin/themes/clear/index.php +++ b/sources/admin/themes/clear/index.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/admin/themes/default/fontello/README.txt b/sources/admin/themes/default/fontello/README.txt index 43e23f2..a91438a 100644 --- a/sources/admin/themes/default/fontello/README.txt +++ b/sources/admin/themes/default/fontello/README.txt @@ -11,7 +11,7 @@ webfont pack. Details available in LICENSE.txt file. - If your project is open-source, usually, it will be ok to make LICENSE.txt file publically available in your repository. -- Fonts, used in Fontello, don't require to make clickable links on your site. +- Fonts, used in Fontello, don't require a clickable link on your site. But any kind of additional authors crediting is welcome. ================================================================================ @@ -29,8 +29,8 @@ Comments on archive content - LICENSE.txt - license info about source fonts, used to build your one. -- config.json - keeps your settings. You can import it back to fontello anytime, - to continue your work +- config.json - keeps your settings. You can import it back into fontello + anytime, to continue your work Why so many CSS files ? @@ -38,17 +38,17 @@ Why so many CSS files ? Because we like to fit all your needs :) -- basic file, .css - is usually enougth, in contains @font-face - and character codes definition +- basic file, .css - is usually enough, it contains @font-face + and character code definitions - *-ie7.css - if you need IE7 support, but still don't wish to put char codes directly into html - *-codes.css and *-ie7-codes.css - if you like to use your own @font-face - rules, but still wish to benefit of css generation. That can be very - convenient for automated assets build systems. When you need to update font - - no needs to manually edit files, just override old version with archive - content. See fontello source codes for example. + rules, but still wish to benefit from css generation. That can be very + convenient for automated asset build systems. When you need to update font - + no need to manually edit files, just override old version with archive + content. See fontello source code for examples. - *-embedded.css - basic css file, but with embedded WOFF font, to avoid CORS issues in Firefox and IE9+, when fonts are hosted on the separate domain. @@ -63,11 +63,11 @@ Because we like to fit all your needs :) Attention for server setup -------------------------- -You MUST setup server to reply with proper `mime-types` for font files. In other -case, some browsers will fail to show fonts. +You MUST setup server to reply with proper `mime-types` for font files - +otherwise some browsers will fail to show fonts. Usually, `apache` already has necessary settings, but `nginx` and other -webservers should be tuned. Here is list of mime types for our file extentions: +webservers should be tuned. Here is list of mime types for our file extensions: - `application/vnd.ms-fontobject` - eot - `application/x-font-woff` - woff diff --git a/sources/admin/themes/default/fontello/config.json b/sources/admin/themes/default/fontello/config.json index 16b7c60..20c3fe7 100644 --- a/sources/admin/themes/default/fontello/config.json +++ b/sources/admin/themes/default/fontello/config.json @@ -384,6 +384,12 @@ "code": 59407, "src": "iconic" }, + { + "uid": "862129f833b09f3d34ae39acf8484a7b", + "css": "heart-broken", + "code": 59429, + "src": "mfglabs" + }, { "uid": "05ef9b5e8742971aa85b23cfcbe71594", "css": "users", diff --git a/sources/admin/themes/default/fontello/css/fontello-codes.css b/sources/admin/themes/default/fontello/css/fontello-codes.css index b569e79..d31cf34 100644 --- a/sources/admin/themes/default/fontello/css/fontello-codes.css +++ b/sources/admin/themes/default/fontello/css/fontello-codes.css @@ -52,6 +52,7 @@ .icon-cancel:before { content: '\e822'; } /* '' */ .icon-plus:before { content: '\e823'; } /* '' */ .icon-ok-circled:before { content: '\e824'; } /* '' */ +.icon-heart-broken:before { content: '\e825'; } /* '' */ .icon-zoom-in:before { content: '\e827'; } /* '' */ .icon-zoom-out:before { content: '\e828'; } /* '' */ .icon-tasks:before { content: '\f0ae'; } /* '' */ diff --git a/sources/admin/themes/default/fontello/css/fontello-embedded.css b/sources/admin/themes/default/fontello/css/fontello-embedded.css index c30c9f7..e17d676 100644 --- a/sources/admin/themes/default/fontello/css/fontello-embedded.css +++ b/sources/admin/themes/default/fontello/css/fontello-embedded.css @@ -2,16 +2,16 @@ @font-face { font-family: 'fontello'; - src: url('../font/fontello.eot?76878460'); - src: url('../font/fontello.eot?76878460#iefix') format('embedded-opentype'), - url('../font/fontello.svg?76878460#fontello') format('svg'); + src: url('../font/fontello.eot?37675340'); + src: url('../font/fontello.eot?37675340#iefix') format('embedded-opentype'), + url('../font/fontello.svg?37675340#fontello') format('svg'); font-weight: normal; font-style: normal; } @font-face { font-family: 'fontello'; - src: url('data:application/octet-stream;base64,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') format('woff'), - url('data:application/octet-stream;base64,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IzixKwEUKy2wQSyxCAQlQrAAFrAEJbAEJSAuRyNHI2EgsAQjQrAJQysgsGBQWCCwQFFYswIgAyAbswImAxpZQkIjIEewBEOwAmIgsABQWLBAYFlmsAFjYCCwASsgiophILACQ2BkI7ADQ2FkUFiwAkNhG7ADQ2BZsAMlsAJiILAAUFiwQGBZZrABY2GwAiVGYTgjIDwjOBshICBGI0ewASsjYTghWbErARQrLbBCLLA1Ky6xKwEUKy2wQyywNishIyAgPLAEI0IjOLErARQrsARDLrArKy2wRCywABUgR7AAI0KyAAEBFRQTLrAxKi2wRSywABUgR7AAI0KyAAEBFRQTLrAxKi2wRiyxAAEUE7AyKi2wRyywNCotsEgssAAWRSMgLiBGiiNhOLErARQrLbBJLLAII0KwSCstsEossgAAQSstsEsssgABQSstsEwssgEAQSstsE0ssgEBQSstsE4ssgAAQistsE8ssgABQistsFAssgEAQistsFEssgEBQistsFIssgAAPistsFMssgABPistsFQssgEAPistsFUssgEBPistsFYssgAAQCstsFcssgABQCstsFgssgEAQCstsFkssgEBQCstsFossgAAQystsFsssgABQystsFwssgEAQystsF0ssgEBQystsF4ssgAAPystsF8ssgABPystsGAssgEAPystsGEssgEBPystsGIssDcrLrErARQrLbBjLLA3K7A7Ky2wZCywNyuwPCstsGUssAAWsDcrsD0rLbBmLLA4Ky6xKwEUKy2wZyywOCuwOystsGgssDgrsDwrLbBpLLA4K7A9Ky2waiywOSsusSsBFCstsGsssDkrsDsrLbBsLLA5K7A8Ky2wbSywOSuwPSstsG4ssDorLrErARQrLbBvLLA6K7A7Ky2wcCywOiuwPCstsHEssDorsD0rLbByLLMJBAIDRVghGyMhWUIrsAhlsAMkUHiwARUwLQBLuADIUlixAQGOWbABuQgACABjcLEABUKxAAAqsQAFQrEACCqxAAVCsQAIKrEABUK5AAAACSqxAAVCuQAAAAkqsQMARLEkAYhRWLBAiFixA2REsSYBiFFYugiAAAEEQIhjVFixAwBEWVlZWbEADCq4Af+FsASNsQIARAA=') format('truetype'); + src: url('data:application/octet-stream;base64,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') format('woff'), + url('data:application/octet-stream;base64,AAEAAAAOAIAAAwBgT1MvMnwtYSoAAADsAAAAVmNtYXCdxeuOAAABRAAAA1ZjdnQgAAAAAAAAPsgAAAAKZnBnbYiQkFkAAD7UAAALcGdhc3AAAAAQAAA+wAAAAAhnbHlmb9Zo6QAABJwAADKWaGVhZAhDqAMAADc0AAAANmhoZWEIYARGAAA3bAAAACRobXR489wAAAAAN5AAAAEQbG9jYdViyOIAADigAAAAim1heHAA+wx2AAA5LAAAACBuYW1lzJ0bHQAAOUwAAALNcG9zdFs+fpAAADwcAAACoXByZXDdawOFAABKRAAAAHsAAQOWAZAABQAIAnoCvAAAAIwCegK8AAAB4AAxAQIAAAIABQMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUGZFZABAJgX//wNS/2oAWgNYAJYAAAABAAAAAAAAAAAABAAAAAMAAAAkAAEAAAAAAOQAAwABAAAAJAADAAoAAAHqAAQAwAAAACwAIAAEAAwAACYGJpkm7ycJJw4nleCt5wrnDecg5ynnPee26CXoKPCu8LDw4PDo8SX//wAAAAAmBSaZJu8nCScOJ5XgrecK5w3nIOcp5z3ntugA6CfwrvCw8ODw6PEl//8AANn82WrZFdj82PjYch9bGP8Y/RjrGOMY0BhYGA8YDg+JD4gPWQ9SDxYAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAAAAFsAAAAAAAAAB0AAAAAAAAAAAAAAAAAACYFAAAmBgAAAAEAACaZAAAmmQAAAAMAACbvAAAm7wAAAAQAACcJAAAnCQAAAAUAACcOAAAnDgAAAAYAACeVAAAnlQAAAAcAAOCtAADgrQAAAAgAAOcKAADnCgAAAAkAAOcNAADnDQAAAAoAAOcgAADnIAAAAAsAAOcpAADnKQAAAAwAAOc9AADnPQAAAA0AAOe2AADntgAAAA4AAOgAAADoJQAAAA8AAOgnAADoKAAAADUAAPCuAADwrgAAADcAAPCwAADwsAAAADgAAPDgAADw4AAAADkAAPDoAADw6AAAADoAAPElAADxJQAAADsAAfMEAAHzBAAAADwAAfRkAAH0ZAAAAD0AAfUAAAH1AAAAAD4AAfUSAAH1EgAAAD8AAfUXAAH1FwAAAEAAAfUnAAH1JwAAAEEAAfVUAAH1VAAAAEIAAfarAAH2qwAAAEMAAAABAAD/ygOhA0AAIAAGsxsJAS0rARQPARMWFRQOAS8BBwYiJjU0NxMnJjU0NyU3NjIfAQUWA6EPyzABDBUM+/oNFQwBMMsOHwEYfgsgDH0BGCAB6QwPxf7pBAgLEAEHhIQHEgoECAEXxQ8MFQUo/hcX/igFAAIAAP/KA6EDQAAJACoACLUlEQcDAi0rATcvAQ8BFwc3FxMUDwETFhUUIyIvAQcGIiY1NDcTJyY1NDclNzYyHwEFFgJ6q+tqaeyrKdPT/g/LMAEXCgz7+g0VDAEwyw4fARh+CyAMfQEYIAEipSPV1SOl629vAbIMD8X+6QQIHAeEhAcSCgQIARfFDwwVBSj+Fxf+KAUAAAAAAgAA/7EDWgMKAAgAaAAItVEgBgICLSsBNCYiDgEWMjYlFRQGDwEGBxYXFhQHDgEnIi8BBgcGBwYrASImNScmJwcGIicmJyY0Nz4BNyYvAS4BJzU0Nj8BNjcmJyY0Nz4BMzIfATY3Njc2OwEyFh8BFhc3NjIXFhcWFA8BFh8BHgECO1J4UgJWdFYBHAgHaAoLEygGBQ9QDQcHTRkaCQcEEHwIDBAbF08GEAZGFgQFCCgKDwhmBwgBCgVoCA4XJQYFD1ANBwhNGBoJCAMRfAcMAQ8cFlAFDwdIFAQEOw4JZgcKAV47VFR2VFR4fAcMARAeFRsyBg4GFVABBTwNCEwcEAoHZwkMPAUGQB4FDgYMMg8cGw8BDAd8BwwBEBkaIC0HDAcUUAU8DQhMHA8ICGcJDDwFBUMcBQ4GTRwbDwEMAAAGAAD/cgQvA0kACAASABsAewC3APMAEUAO4MKlhmMzGRUQCwYCBi0rATQmIgYUFjI2BTQmDgEXFBYyNgM0JiIGHgEyNgcVFAYPAQYHFhcWFAcOASMiLwEGBwYHBisBIiY1JyYnBwYiJyY1NDc+ATcmLwEuAT0BNDY/ATY3JicmNDc+ATMyHwE2NzY3NjsBMhYfARYXNzYyFxYVFA8BBgcWHwEeAQEVFAcGBxYVFAcGIyIvAQYiJw4BByInJjU0NyYnJj0BNDc2NyY1ND8BNjMyFhc3FzY/ATIXFhUUBxYXFhEVFAcGBxYVFAcGIyImJwYiJw4BIicmNTQ3JicmPQE0NzY3JjU0PwE2MzIWFzYyFzY/ATIXFhUUBxYXFgH0VHZUVHZUAa0sOCwBKjosASw4LAEqOizYCAVWBgwTHwQEDUILBgVAFRYGBwQNaAYKDRMXQgQNBlAEBSQIDQdVBQgIBVYHCxMfBAQMRAoGBkATGAYHAw1oBgoBDRMWQgUNBVEEGBEIDQZVBQgBZVMGChwCRAEFFR0LDAsHLAMBRAMdCgdTUwcKHQM0EAEEKggRERwXBAJDAhwJB1NTBgocAkQBBSoICwwLBywERAMdCgdTUwcKHQM0EAEEKggMCgwcFwQCQwIcCQdTAV47VFR2VFTjHSwCKB8dKioCWR0qKjsqKs1nBgoBDhMXGyUGDAQRQgQyCwY8Gw0IBlUGDDIEBEsPBQUILAwYFg0BCAdnBgoBDhMXGyUGDAQRQgQyCgg8Gg0IBlUGCzEEBEsPBQUeFQ0bEwwCCP7PTgkIDw4/DgICKBslAQELNAEoAgIOPw4PCAlOCQkQDT8OAgIeCTQMAQEoFwEnAgIOPw0QCQIzTgkJDw4/DgICJzQMAQEMNCcCAg4/Dg8JCU4JCBANPw4CAh4JNAwCAigXAScCAg4/DRAIAAP///+xA+gCwwAZADcARwAKt0M8LSAVAQMtKyURBgcGBw4CKwEiJi8BJicmJxEUFjMhMjYTNS8BJgYnISIGBxQfAR4EFzMyPgM/AT4BNxEUBgchIiY3ETQ2MyEyFgOhEhWVWRwkPBsCGj4RLliWFRIMBgM2BwoBAgMDBAb8ygcKAVLgBCASIBgMAgsaHhQeBeAeNEc0JfzKJDYBNCUDNiU0CwGsFBFyShgcGhoOJkpyERT+VAgKCgJSDg4FBQIDDAZeQbECHA4WCAEKFBAaA7EYUjX9oSU0ATYkAl8lNDQABAAA/7EDTQL/AAYAFAAZACQADUAKIB0XFQ8IAgAELSsXNycHFTMVATQjIgcBBhUUMzI3ATYnFwEjNQEUDwEnNzYyHwEWyzKDM0gBXwwFBP7RBA0FBAEvAx7o/jDoA00UXehdFDsWgxQHM4MzPEcCBgwE/tIEBgwEAS4Ecej+L+kBmh0VXelcFRWDFgAC//3/sQNfAwsAIwAwAAi1LScbCQItKwE1NCYHIzU0JicjIgYHFSMiBhcVFBY7ARUUFhczMjY3NTMyNjcUDgEiLgI+ATIeAQKnFg6PFg5HDxQBjw4WARQPjxYORw8UAY8OFrJyxujIbgZ6vPS6fgE6SA4WAY8PFAEWDo8UD0gOFo4PFAEWDo4WMnXEdHTE6sR0dMQABP/9/8ID1QMBAC0ANwBBAEsADUAKSUQ/OjUwKQIELSsTJjYWHwEGFxYXHgE3MjcWNjceATc+AT8BNic1Fjc+ARcWBgcOAwcGIyEmJxMmNhYfARYGJicTPgEWHwEUBiYnEz4BFhcHDgEmJwEEJjQJNQ8BBh4HMigvGyJiGRtYHQwQAwUCARojMXgmIQQhPVYwRCwVLf6iVBVCBjY6CBUEKjIMeAI8QAQIODoBmARCOgEGBToyBAK8JSAWG7gdIx6uNDwBJScEJyUIHxAgFSEMHCYKIi1CGRhGFBlybnwfEgZwAZotKBgk0SksDiYBHykeICH4OyIqKQEAKxgmIf4vJigvAAADAAD/+QPoAn0AEQAiADMACrcwJxsUDwIDLSsBJicWFRQGIiY1NDcGBx4BIDYBNCYHIgYVFB4BNjU0NjMyNgUUBwYEICQnJjQ3NiwBBBcWA6FVgCKS0JIigFVL4AEE4P65EAtGZBAWEEQwCxAB2QtO/vj+2v74TgsLTgEIASYBCE4LATqEQTpDaJKSaEM6QYRyiIgBSQsQAWRFDA4CEgowRBDMExOBmpqBEyYUgJoCnn4UAAADAAD/vQQkAwsACAAdADQACrctIhcNBwIDLSsTNCYOAR4CNgEUBwEGIicBLgE9ATQ2NzMyFhcBFhcUBwEGIyImJwE2NCcBLgEjMzIWFwEW+io6LAIoPiYCVRT+7hY7FP5xFR4qHekdSBUBjxTXFf7uFh0UGhABBhUV/nEVSB19HUgVAY8VAlgeKgImQCQGMP7ZHhX+7hUVAY8VSB3oHSoBHhX+cRUdHhX+7hUQEQEGFTsVAY8VHh4V/nEVAAIAAP+wA+gCwwAlAEsACLVJNiIKAi0rARQOASMiJwYHBgcjIiY1JjQ2NT8CNgc3PgI3LgEnND4BMh4BFxQGBx4BHwEWHwMUBw4BJyYnJicGIyInFjMyNjc+ASc0Jx4BAxJqtGswMkZVFRsCBgwBAgEEAwMBHAUODgRFTgFqtNa0atZQRAUMCBsJBAUEAwECCggbFVVGMjCXcCARWqRCRUwBDUhUAaVNhEwJMRcFBAoHAQQEAQMGAwMBHgUYEhAodENOhExMhNxDdicOFgohCwMFBgoBAggKAQQFFzEJSgMyLzSGSisqJ3gAAAAABgAA/7EDEgMLAA8AHwAvADsAQwBnABFADl9MQDw2MSsjGxMLAwYtKwERFAYrASImNRE0NjsBMhYXERQGKwEiJjURNDY7ATIWFxEUBisBIiY1ETQ2OwEyFhMRIREUHgEzITI+AQEzJyYnIwYHBRUUBisBERQGIyEiJicRIyImPQE0NjsBNz4BNzMyFh8BMzIWAR4KCCQICgoIJAgKjwoIJAgKCggkCAqOCgckCAoKCCQHCkj+DAgIAgHQAggI/on6GwQFsQYEAesKCDY0Jf4wJTQBNQgKCgisJwksFrIWLAgnrQgKAbf+vwgKCggBQQgKCgj+vwgKCggBQQgKCgj+vwgKCggBQQgKCv5kAhH97wwUCgoUAmVBBQEBBVMkCAr97y5EQi4CEwoIJAgKXRUcAR4UXQoAAAAAA////7ADoQLEAAgAEQA7AAq3Lx8PDAYDAy0rBRQOAS4BNh4BBRQOASY+AR4BExEUBgcFFhQHITIWDgEjISImNTQ+AjUDIyIuATYXMzIeAgYWByEyFgFlKjoqAi42LgHyKjosAig+JkoUDP25Bw0CAQ8WAhIR/cUOFgoIEGJyDxQCGA2PCQ4GCgIIAQKeDhYHHSoCLjYuBCYfHSoCLjYuBCYCQP7iDRQCRCIOGxYcFhYOBhgQHAIBzBQeFgEGDBAMFgMWAAH////KAqYC8QBPAAazPh0BLSsBIgYUFjcyNzYWFxUUBisBIiY3NjU0JiIGBxQXFgYnIyImJzU0NhcWMzI2NCYnIgcGJjc1NDY7ATI2JyY1NDYyFgcUBwYWNzMyFh0BFAYnJgJKJTY2JRYVGhYBMB+PEA4JFURiRAENEQoUjyEsARIWGBsmNjYmFRUaGAEuII8TDBEORmBGARUKEA+PHzAUFBgBkkRgSAINEQwSkB8uEhYZGiY0NCYWFhoWAS4fkBAOChREZEACDREKFFshLhQbFBgmNDQmGhkVFAEuIVsQDgoUAAUAAP/iA/oC2gA5AEEASwBjAGYAD0AMZmRgUEdCPTsoAwUtKwEWBgciLwEmNz4BJw4DJy4BNTQ3NjcnDgEnNCY1JjYzNzQnNDMyNzIdATYzNhcUFhUWDwEVMzIWBRY3JwYHBhQ3PgInJiMiBiMlFhIWFCsBIjUnIwYHFCsBIjU2EzY7ATIDMwMD3B5QXgoCIAIEVj4qEC5IZDg0QDwyQAKMDAQKAgYEnAIILgYKngYIAggECLAMVnz+phwiBCIaLKgcPB4IJDwCCAL+PgpWUARWBjKwMAIGVgQKpgIIYAqCkEgBMlK8QgImBgQ8uDgmTFQuCAZGOlRAMhBkGAIGAjYEAgQcbgQIAghoFgQKAioECgIeZkjgBgzWDBwsghYYWEYGEgKyHP7u+AYEpqQCBAQSAhYI/rwBCAAAAAAFAAD/sQPoAwsADwAfAC8APwBPAA9ADEtDOzMrIxsTCwMFLSs3FRQGKwEiJj0BNDY7ATIWNxUUBisBIiY9ATQ2OwEyFjcRFAYrASImNRE0NjsBMhY3ERQGKwEiJjURNDY7ATIWExEUBisBIiY1ETQ2OwEyFo8KCGsICgoIawgK1goIawgKCghrCArWCgdsBwoKB2wHCtcKCGsICgoIawgK1goIawgKCghrCAouawgKCghrCAoKQLMICgoIswgKCof+vggKCggBQggKCs796AgKCggCGAgKCgEW/MoICgoIAzYICgoAAAAAAgAA/4kEsQMyADEAZQAItVE5MBYCLSs1Nj8BNjc+ATc0JyYnJjU0NyYnJj4BNzIeAgcGBxYVFAcGBwYVFBYXHgIXHgEVFyEBNDcmJyY+AR4CBwYHFhUUBwYHDgIXFBYXHgIXFSM1NC4CJy4BJzY1NC8BJicmJyYUKEUdFSUoAR8TDi0OBQQFPmo5K1Q+IgMEBA4tDxEgKCYdfmQQEhQB/JICwQwFAgQyWFxWNAQCBgwkDA8JCAoBIh4RMkYP/gYIFgwXPDEbBQgDCQ4NJTEHDxoLCxNKJxslFScSOisSJys3aj4BJj5SKjcbEyo6EikTJRsnShMPLigSETwVFQHTIhAgIy1YOAI0XCsjIBAiMA4hEQoMFAogPBAJFBgHhwsHJiIqDBkmEiIsCgoQBgoPIhAAAAAE//r/mgPzAxoAKwA3AFYAXgANQApbWEg/NzEaCAQtKxMOARQjBwYHBi8BJjc+ATc2Mj4BNzI+ATc2NzIXMgcGBwYXFhcWDwEGJy4BFwEWDwEGJwEmPwE2JRYHBicmDwEnNz4BJjc2NzYWBwYHBhYXFjc+ATc2FgE3FwcGLwEmmwgGAhEPBBAMRgsNAiAEBioeCAYCDiYWhjR6GgwUeCBQLCIECApMDgQqOvgBmhIUMBYQ/mIICEgMAjIQIDJoOCxSREQYDgIGDIAMDAQMIg4EJjomBigCBBL8qP5M9hQSLhYB+ggcFg8NBA4STAwMAhgEBhwwBg4eEFoGAgg0GDg6LgIIBkYIBDAYMv4kFhAqDhIB2AgMPgjAaD5YGgwsTk5GGDpIFjg4BhIGDEQKMhwoPgw6BAoC/UT4VvIUEC4SAAIAAP+xA1sDCwAkAEcACLU/KBAEAi0rARQVDgEjIiYnBwYiJj0BNDY7ATIWBg8BHgEzMjY3Njc2OwEyFhMVFAYrASImNj8BJiMiBgcGBwYrASImNzU+ATMyFhc3NjIWA0sk5JlRmDxICxwWFg76DhYCCU0oZDdKgicGFwUMawgKDhQQ+g4WAglNUnBLgicGFwUMbwcMASTmmVGaPEgLHBgBBQMBlro+OUgLFg76DhYWHAtNJShKPgo4DQwBuPoOFhYcC01NSj4KOA0MBgSWuj45SAsWAAAAAAL////DA+kCsQAYADEACLUtHREJAi0rJRUUBgchFRQGByIvASY0PwE2MhYdASEyFgMUDwEGIiY9ASEiJjc1NDYzITU0NjIfARYD6AoI/QAKCAYHsgUFswUPCgMABwwBBbMFDwr9AAcMAQoIAwAKDgeyBb1rBwoBawcKAQayBRAFsgUKCGsKASgIBbMFDAZrDAZrCAprCAoFsgUAAAL////5BBkDCwASACkACLUgGg4FAi0rARQPAQ4BIyEiLgE/AT4BMyEyFicVISIGDwInJjcRNDY7ATIWHQEhMhYEGRK7GFYm/aETHAERvBhWJQJfEx7A/jA1ciO8AgEBAUozszNKAS8zSgE/EhPdHCgOIhTdHCgOr1o0Kd0DBwUCAhgzSkozEkoAAAAAAv/8/34D2ANKAA0AHwAItR8UCAECLSs3Nh4CBwYHBjc0Nz4BARYABwYHBicmJyYnJjc2NzYAdiZeUgwkVo5UBAY0GANsGv6kdiZWCAgSHiAiEAhAKHYBxKoiClBeJFQSDBoEBjyqAqga/kR0JkIGDiIeIBAGClQmdAFWAAQAAP+6AoADAgAsADUAPgBHAA1ACkM/OjYzLxoQBC0rARQHDgMHDgMHFhUUBiImNTQ3ESY1NDYyFhUUBxU2Nz4CNyY1NDYyFgUUFjI2NCYiBhMyNjQmIgYUFgEyNjQmIgYUFgKASgYsTjouKio0GARGRmRGSEhGZEZIKGI6NDIERkZkRv20KDgqKjgoRBwqKjgoKAGsHCoqOCgoAopQHjpWNBgODhAgMCQeUDJGRjJOIgF6IkwyRkYyTCLMHh4SFjwuIEwyRkYyHCgoOigo/UYoOigoOigCWCg6KCg6KAAAAwAA//kDWgLEAA8AHwAvAAq3KyQbEwwEAy0rJRUUBgchIiYnNTQ2NyEyFgMVFAYnISImJzU0NhchMhYDFRQGByEiJic1NDYXITIWA1kUEPzvDxQBFg4DEQ8WARQQ/O8PFAEWDgMRDxYBFBD87w8UARYOAxEPFmRHDxQBFg5HDxQBFgEQSA4WARQPSA4WARQBDkcPFAEWDkcPFgEUAAAAAAMAAP+5BBYCugAUACQAOQAKtzQnIBgKAgMtKyUHBiInASY0NwE2Mh8BFhQPARcWFAEDDgEvAS4BNxM+AR8BHgEJAQYiLwEmND8BJyY0PwE2MhcBFhQBWBwFDgb+/AYGAQQFEAQcBgbb2wYBRNACDgYiCAYB0AMMByMHCAFs/vwGDgYcBQXb2wUFHAYOBgEEBUUcBQUBBAYOBgEEBgYcBRAE3NsGDgJO/S8HCAMJAwwIAtAIBgEKAg7+jv78BQUcBg4G29wFDgYcBgb+/AUQAAACAAD/nAPoAyAAKAA0AAi1My0YAwItKyUWHQEhNTY3PgE1NCYnLgEnNDY/ASYnJjYyFg8BFhUOAwcOARUUFiUzFSMVIzUjNTM1MwJstPzgJC5eRi4IAioECgQECAQGXORcBA4SAg4ODgIKLkgBRJaWZJaWZIBAOmrKDgwiRjwWNDAMGjAQFAIEMiY2dHQ2WAgiHB4EDAwuNhY8Ru5klpZklgAAAAH//v+xA1kDCwAwAAazKSEBLSsBFRQGKwEiJj8BJiMiDgIeAzMyNjc+AR8BHgEHDgEHIi4CPgMzMhYXNzYWA1kUEPoXExFNUnA6akwwBChUYj5CdikEEQZMBQIGPK5fV6BwSARAeJhbUpg9SBAtAsP6DhYtEE1NLkxqdGpMLjo1BgEFTQQOBkpQAUR0nq6edEQ+OUgSEwAAAwAAAAAD6AK2ABYAMABHAAq3QTUtIRQKAy0rPQE0PwEmJzQ3NjcyFwYXBg8BBgcVIyIXNTQ/Ai4BNzQ2MhYVFAcfARYdAQYHIS4BATYnNjcyFxYVFAcXFh0BFAcjNTQvASYSq0ICIyU1HyAxSAwNcjAEchm/Fpg5JS4BXIBaTj2SGAIj/eMOFAHZRC4fIzEpI0GoEht2Mm4PaoYaBlAnXDgvKQITfXALCDcXPY8ZqBsKRhwXVjNMbGxMajQeRgobqCUEAhgBWWp9EwIrKT5SMVAKFoYgAo85GzUIAAH//P/MA4gC8gAaAAazGAgBLSsBFgYrAREUDgErAREjESMiJjURIyImNwE2MhcDeBAKFlQCDhDMzMIcDlQWChABkBAsEAFQEBb+yg4ODAE2/soUFAE2FhABkhAQAAAAAAMAAP+fA48DHgAUACgAPAAKtzkuJRoQBQMtKyUVIxUUBiImPQEjNTMRNDY3MhYHEQEVIxEUBiImNREjNTM1ND4BFgcVBRUjERQGIiYnESM1MxE0PgEWFRECQDciLCI4OCIVGCIBAYY3IDAgODggLiQC/Zk3IC8gATg4IDAg73CnFyIiF6dwAfcYHgEgF/4JAU9w/goXIiIXAfZwqBgeAiIWqHBv/nkXIiIXAYdvARgYHgIiFv7oAAACAAAAAAOPAq0ABAAJAAi1CQcCAAItKwElNSEVASURIREB0/4/A33+RAG8/IMBbtJtbf6z0v5LAbYAAAACAAD/wgMiAuoAEQAaAAi1GBQMBAItKyUWDwEGLwEGIyImEDYgFhUUByUUFjI2NCYiBgMEHhguJCC+SlKAvrQBAMAu/hiIsH6IsH5OIhwuICC+Kr4BALa+gFhKqliIfrKGfgAAAQAA/2oD6ANSAEQABrMzEQEtKwEUDwEGIiY9ASMVMzIWFA8BBiIvASY0NjsBNSMVFAYiLwEmND8BNjIWHQEzNSMiJjQ/ATYyHwEWFAYrARUzNTQ2Mh8BFgPoC44LHhTXSA4WC48KHgqPCxYOSNcUHguOCwuOCx4U10gOFguPCxwLjwsWDkjXFB4LjgsBXg4LjwsWDkjXFB4LjgsLjgseFNdIDhYLjwscC48LFg5I1xQeC44LC44LHhTXSA4WC48KAAAAAAL/+P+2A+wDCAAGACMACLUWDQMAAi0rAQUjESMRIwEeAQ8BDgEjISImLwEmPwEzBzMyHwEhNzY7ASczAfQBBKS+pgLYEhIGHAQkFvzQFiQEHAoqnmKqsggEKAEsKAgEsqpiAwj0/wABAP6yCiwSmhQaGhSaMBhsgghubgiCAAAAAQAAAAAD6AKkAB0ABrMYBAEtKwEyFhQGKwE1MycHMxUjIiY0NjMyFyY1NDYzMhYXNgL4ZIyMZL5qsK5o+EpsakwOBgKcblqMGBwB7ojEiL7m5r5okmgCDBpsmGhSBAAAAv/6/3ADGgNWABkALQAItSodGAwCLSsBFgYHBicPAgYPAQYmLwEmNwEmJyY2NzYWBzYuAQYHDgEfAR4BHwEeAjI+AQMGFGBmQkB2RmgOIEwMFAIQCBQBAhgOEo5yarJsHhJUZB4ICAMFAhYHQxAOGA4UEAJkdMYSDArCDKYcBA4EEA5iHhoBgjJGaqIUFIK8LGo+FCwMFgkQBxQFMQwIEAIOAAAIAAD/kgOYAyoADwAbACcANwBCAE4AXQBpABVAEmVeVU9NRT48MCgmIRgUBgIILSsTIgcmJzY3FhcGFRQXBgcmBxQXBgcmNTQ3FhcGASIHJic2MzIXBgcmEyYnNjU0JzY3FjMyNxYXBhc2NzY3Bgc2NTQmJwYHJic2NxYzMjcWARYVFAcGByYnJic2PQE2AxYXFhUUBwYjIic24BYUMCw2Slw8BgQ+NhBuFDwUQjImLggBUBwWOjhUTnhuTFYaaqCCBA4mPBoeDhheKBB2JhA6Mi54BgKWvnJaRAxEBg4eFo4BYJYEQEIYQDBkCmQaDhICDlZsOjZuAfgKNExKLCYsEBAGEDA4BGIiGnJ2aoJuYD4yGAEwDiocHj4OJBr+NBhYFAoYHCwuFAhshA6WDi4EDpJWMDIKJExgsCRKkIICDmIB0ojMFiwSBjgEknYUFgoq/ewKCBIiUEAqDKAAAAAAA//8/5ADmgMsAAgAEwApAAq3HhQOCQUBAy0rATYAEgAEAAIAFyIGFQYWMzI2NTQDMjY3JwYjIj8BNiMiBgcXNjMyDwEGAca+ARAG/vb+hP7uBgEM8iouAiIgJi60Hmw0EjAYDgoqGjAedjgQNBYMDCQaAyoC/vj+hP7uBgEKAXwBEpYwGhwgLCA6/a40NBgkJqBgOi4aIiKYaAAADwAA/2oDoQNTAAMABwALAA8AEwAXABsAHwAjADMANwA7AD8ATwBzACNAIGBTS0Q+PDo4NjQvKCIgHhwaGBYUEhAODAoIBgQCAA8tKxczNSMXMzUjJzM1IxczNSMnMzUjATM1IyczNSMBMzUjJzM1IwM1NCYnIyIGBxUUFjczMjYBMzUjJzM1IxczNSM3NTQmJyMiBh0BFBY3MzI2NxEUBiMhIiY1ETQ2OwE1NDYXMzIWHQEzNTQ2FzMyFhcVMzIWR6GhxbKyxaGhxbKyxaGhAZuzs9aysgGsoaHWs7PEDAYkBwoBDAYkBwoBm6Gh1rOz1qGhEgoIIwgKCggjCArXLBz87h0qKh1INCUkJTTWNiQjJTQBRx0qT6GhoSSysrIkof3Eofqh/cShJLIBMKEHCgEMBqEHDAEK/iayJKGhoWuhBwoBDAahBwwBCiz9NR0qKh0Cyx0qNiQ2ATQlNjYkNgE0JTYqAAAAAQAAAAADpAKYABUABrMRBAEtKwEUBwEGIicBJjQ/ATYyHwEBNjIfARYDpA/+IBAsEP7qDw9MECwQpAFuECwQTA8CFhYQ/iAPDwEWECwQTBAQpQFvEBBMEAAAAAAD//z/kAOaAywACAAWAD8ACrc3Gw4JBQEDLSsBNgASAAQAAgATMjY1NiYrASIGBxQWFxM2NTQmIyIHBgcVMzU0NzYyFxYVFAcGDwEGDwEGBwYHFTM1NDc2PwE2Aca+ARAG/vb+hP7uBgEMvB4mAiYeAhwmAiYcqBpqUkAoRARuEBBODBAQCAwWCgoVCwYOBGwEBhYcLgMqAv74/oT+7gYBCgF8ARL9HiYcHiYkHB4mAgFIIixOTBoqaAQEGhwYFBQYEhYMCA8HCBEJCBQ6CAQMEBQQEiIAAAACAAD/+QNrAsMAJwBAAAi1PCwOBwItKyUUFg8BDgEHIyImNRE0NjsBMhYVFxYPAQ4BJyMiBgcRFBYXMzIeAgEUBwEGIiY9ASMiJj0BNDY3MzU0NhYXARYBZQIBAgEICLJDXl5DsggKAQEBAgEICLIlNAE2JLQGAgYCAgYL/tELHBb6DhYWDvoWHAsBLwsuAhIFDgkEAV5DAYhDXgoICwkGDQcIATYk/nglNAEEAggBLA4L/tAKFA+hFg7WDxQBoQ4WAgn+0AoAAAEAAP+2A4gDEgAWAAazEQwBLSsBNhYHDgIuAgYHEyMDNz4BHgM2A2oOEAhgiFQ+OkR2UFpkuFxafEg4RFqoAmgGDgyKlh4aMCAoQv6gAtAiQigiREoyCgAB//n/ewP4A1gAJQAGsx8BAS0rJQYkJyYCNz4BNzYWFx4BBwYHBgIXFiQ3PgEnJiQHNTYEFxYCBwYDV5f+apSPDoEIEQocQBkWCA4GCmkGZ3oBOGxQLTBD/uSftwFHTjQpUxAJjQ6MlQGEngoSBhEHFxg8HAwKdv7ebHEddl7vdpZ6MgE7iq1//vxqFgAAAAADAAD/agIwA1IAGwAoAGIACrdNMiYgGAoDLSsBFA4BFB4BHQEUBiImPQE0PgE0LgE9ATQ2MhYVBQcGFxYzMjc2JyYjIhM0PgI/ATY1NwYiJxcUHwMWJhYjFA4CDwIGJgY1Bh0BPgI1NDIVFB4BFzU0LwImLwEuAQIwYGJiYKzYrGBiYmCu1K7+HhIECFx8hFgOHmBqeJAIHAwZHVwCZPRkBFotExERDB4MAgoGCAwPDwIiWgh0RDRCegZcKxINBQwHBAJuLGhePFxmLnYiTk4idi5mXDxeaCx2IE5OIAYOCAY0MgoUNv5KEh4kDhgcXB4yNjYyIForExUVAjAKEhIOCg8QEAIiAVogQgQmMCIeHiIwJgRCHlwpEw4IFAwWAAACAAD/+QOgAwsALgBDAAi1PjEMAwItKwEVFAYjISImNRE0NjchMhceAQ8BBiMiJyYjISIGBxEUFhchMjY9ATQ/ATYzMhcWEwEGIi8BJjQ/ATYyHwEBNjIfARYUAxJeQ/4wQ15eQwHQIx4JAwcbBgcCAw0M/jAlNAE2JAHQJTQFJAYHAwQLgf45DSQO8A4OPQ4kDpMBaQ0kDj4NAUuxQ15eQwHQQl4BDgQTBhwFAQM0Jf4wJTQBNiSNCAUjBgIEAQX+Og4O8A0kDj4NDZMBaQ0NPQ4kAAIAAP/5AxMDCwAPAB8ACLUcEwgAAi0rASEiBgcRFBYXITI2NRE0JhcRFAYjISImNRE0NjchMhYCcf4wJTQBNiQB0CU0NHxeQ/4wQ15eQwHQQmACwzQl/jAlNAE2JAHQJTRZ/jBDXl5DAdBCXgFgAAAC//3/sQNfAwsAJAAxAAi1LigbCQItKyU0LwE3NjQvASYiDwEnJiIPAQYUHwEHBhQfARYyPwEXFjI/ATY3FA4BIi4CPgEyHgECgQplZQoKMwoeCmVlCx4KMgsLZWULCzIKHgtlZQoeCjMK2HLG6MhuBnq89Lp+4A4LZWULHQsyCwtlZQsLMgsdC2VlCx0LMgsLZWULCzILjXXEdHTE6sR0dMQAAAEAAP/vAtQChgAkAAazFgQBLSslFA8BBiIvAQcGIi8BJjQ/AScmND8BNjIfATc2Mh8BFhQPARcWAtQPTBAsEKSkECwQTBAQpKQQEEwQLBCkpBAsEEwPD6SkD3AWEEwPD6WlDw9MECwQpKQQLBBMEBCkpBAQTA8uD6SkDwABAAD/+QMSAwsAIwAGsxoJAS0rARUUBicjFRQGByMiJjc1IyImJzU0NjczNTQ2OwEyFhcVMzIWAxIgFuggFmsWIAHoFx4BIBboHhdrFx4B6BYgAbdrFiAB6RYeASAV6R4XaxceAegWICAW6CAAAAAAAv/9/7EDXwMLABUAIgAItR8ZEQQCLSsBNC8BJiIPAScmIg8BBhQfARYyNwE2FxQOASIuAj4BMh4BAs0LMgscDON+CxwMMgoKygoeCgEvC4xyxujIbgZ6vPS6fgG4EAoyCwvjfgsLMgofCsoKCgEvCkt1xHR0xOrEdHTEAAEAAP+7A6oDCwAnAAazIwIBLSsRNDYzMhcHFBYXMzIWDwEGFjcTNiYrASImPwE2MzIWBxQHAQYiJwEmkmhRQg4SDAoMDAM5BAQHwgcGDU0MCgRSOUNnlAE//qkZShr+qkACEmeSL/oMEAEQDKwMAgkBCwkOEAq3IJJnXkj+bR4eAZNIAAP///9qA6EDDQAjACwARQAKtz0vKicaCAMtKwEVFAYnIxUUBicjIiY3NSMiJic1NDY7ATU0NjsBMhYXFTMyFhc0LgEGHgE+AQEUBiIvAQYjIi4CPgQeAhcUBxcWAjsKB30MBiQHDAF9BwoBDAZ9CggkBwoBfQcKSJTMlgSO1IwBIio8FL9ke1CSaEACPGyOpIxwOANFvxUBlCQHDAF9BwwBCgh9CggkBwp9CAoKCH0KGWeSApbKmAaM/podKhW/RT5qkKKObjoEQmaWTXtkvxUAAAAAA////2oDoQMNAA8AGAAxAAq3KRsWEwsDAy0rARUUBichIiYnNTQ2MyEyFhc0LgEGHgE+AQEUBiIvAQYjIi4CPgQeAhcUBxcWAjsKB/6+BwoBDAYBQgcKSJTMlgSO1IwBIio8FL9ke1CSaEACPGyOpIxwOANFvxUBlCQHDAEKCCQHCgoZZ5IClsqYBoz+mh0qFb9FPmqQoo5uOgRCZpZNe2S/FQAGAAD/+QPoAwsAAwAHAAsAGwArADsAEUAONzAoHxcQCggGBAIABi0rJSE1ISchNSElMzUjARUUBgchIiYnNTQ2FyEyFhMVFAYnISImJzU0NjchMhYTFRQGByEiJic1NDYzITIWAjsBZv6a1gI8/cQBZdfXAR4WDvxgDxQBFg4DoA8UARYO/GAPFAEWDgOgDxQBFg78YA8UARYOA6APFEBI1kfXR/3ojg8UARYOjg8WARQBDo8OFgEUD48PFAEWARCPDxQBFg6PDhYWAAAB//n/sQMYAsMAFAAGsxEHAS0rARYHAREUBwYjIi8BJjURASY2MyEyAw8JEf7tFgcHDwqPCv7tEhMYAsoXAq0XEP7t/mIXCgMLjwoPAQ8BExAtAAAC////sQPoAsMAGQA2AAi1MiMEAAItKwERFAYHISImNxEWFxYXHgI3MzI+ATc2NzY3FAYHBg8BDgInIyIuAS8CJicuASc0NjMhMhYD6DQl/MokNgEZH8pMICZEGwIcQigfX7cgGDYp0jQ1DCIgCwIMHiQLNZNgEiM8AS4rAzYkNAHG/kUlNAE2JAG7HBWJNxgaHAEaHBdEfBa/LFAdkiMnCRIMAQoUCCdlQg4XUiQrOjQAAAABAAD/sQPoAwsAVQAGs0IDAS0rJRUUBisBIiY9ATQ2FzM1IRUzMhYXFRQGKwEiJic1NDYXMzUhFTMyFh0BFAYrASImJzU0NhczNTQ2FyE1IyImJzU0NjsBMhYXFRQGJyMVITIWBxUzMhYD6CAWshYgIBY1/uM1Fx4BIBayFx4BIBY1/uM1FiAgFrIXHgEgFjUqHgEdNRceASAWshceASAWNQEdHSwBNRcemrMWICAWsxYgAWtrHhezFiAgFrMWIAFrax4XsxYgIBazFiABax0sAWseF7MWICAWsxYgAWsqHmseAAADAAD/agOhAwsAAgAFADcACrcuDgQDAgADLSslIREJASEBFRQGKwEVFAYrASImPQEhIiY1ESMiJj0BNDY7ATU0NjsBMhYdASE3NjIWFA8BETMyFgE3AUz+mwFM/rQCgwoIfQoIawgK/h4ICn0ICgoIfQoIawgKAduJBRAKBYp9CAqIAUz+zQFM/olrCAp9CAoKCH0KCAHiCghrCAp9BwoKB32KBQsOBon+JQoABP///7EELwMLAAgADwAfAC8ADUAKLCQfFw8KBgMELSsBFA4BJjQ2MhYBFSE1NxcBJSEiBgcRFBYzITI2JxE0JhcRFAYHISImNxE0NjchMhYBZT5aPj5aPgI8/O6yWgEdAR78gwcKAQwGA30HDAEKUTQl/IMkNgE0JQN9JTQCES0+AkJWQED+/vprs1kBHaEKCP1aCAoKCAKmBwwT/VolNAE2JAKmJTQBNgAAAAIAAP+xAxMDDAAfACgACLUmIg4CAi0rJRQGIyEiJjU0PgUXMh4CMj4CMzIeBQMUBiImPgEeAQMSUkP+GENSBAwSHiY6IQUmLExKSjAiByI4KBwUCga0frCABHi4dkJDTk5DHjhCNjgiGgIYHhgYHhgWJjQ6PjwB1lh+frCAAnwAAwAA/8MD6ANAABIANwBxAAq3bVApFw8CAy0rAQYHJy4DJyMiJj0BNDY7ATIBFA8BBiImPQEjIgYvAS4FJzY3HgQ3MzU0NjIfARYRFA8BBiImPQEjIg4CBwYHDgIPAQ4CJyMiJj0BNDY7ATI+Ajc2PwE+BTczNTQ2Mh8BFgF0IisUCB4aLhZ9CAoKCH2LAs4FswUPCjAeHhonDS4YKBokDSErDBAeGiwYjwoOB7IFBbMFDwqPGywgGgwSGRAYJBIpFzZCJn0ICgoIfRsqJBQQERocDCQkLjZAKI8KDgeyBQJGNGUpECYaDAIKCGsICv3FCAWzBQwGawICAwEKChYWJhQ0ZBkeKhQUAmsICgWyBQHsCAWzBQwGaxAiJBkiPSUyRBUvGhgWAQoIawgKEiAkGSM9PhpAMCwgEAFrCAoFsgUAAAAAAgAA//kCgwMLAAcAHwAItRgMBAACLSsTITU0Jg4BFwURFAYHISImJxE0NhczNTQ2MhYHFTMyFrMBHVR2VAEB0CAW/ekXHgEgFhGUzJYCEhceAaVsO1QCUD2h/r4WHgEgFQFCFiABbGaUlGZsHgAAAAMAAP+6A5gDSQAcADkAWgAKt04+KSEYBAMtKyU0LwEmIgcXHgEfARQGByIuAS8BBhQfARYyPwE2ATQvASYiDwEGFB8BFjI3Jy4CNTQ2FzIeAR8BNgEUDwEGIi8BJjQ3JwYiLwEmND8BNjIfARYUBxc2Mh8BFgMsD3QQLhAWAwwBAiAWCA4OBBYTEHMPLRBSD/54D3MQLBBSEBB0Dy4RFwMKBB4XCQ4OAxcSAfQwUi6HLnMuMTEwhy90Ly9SL4Yvci8xMTCHL3QvqxcPdBASFgMQBg8XHgEECgQWES4PdA8PURABnxYQcxAPUg8sEHQPERcDDg4JFiABBAoDFxH+jkMuUS8wcy+HMDExL3Qvhi5SLi90LogwMTEvdC8AAwAA/3YDoAMLAAgAFAAuAAq3HxkSCwYCAy0rNzQmDgEeATI2JQEGIi8BJjQ3AR4BJRQHDgEnIiY0NjcyFhcWFA8BFRc2PwE2MhbWFB4WAhIiEAFq/oMVOhY7FRUBfBZUAZgMG4JPaJKSaCBGGQkJo2wCKkshDwodDhYCEiAUFPr+gxQUPRQ7FgF8N1TdFiVLXgGS0JACFBAGEgdefTwCGS0UCgAD//3/sQNfAwsAFAAhAC4ACrcrJR8YEAMDLSsBFRQGKwEiJj0BNDY7ATU0NjsBMhYXNC4BDgMeAj4BNxQOASIuAj4BMh4BAfQKCLIICgoIfQoHJAgK6FKKpoxQAlSIqoZWe3LG6MhuBnq89Lp+AiL6BwoKByQICsQICgrMU4pUAlCOoo5QAlSKU3XEdHTE6sR0dMQAA////7ADWQMQAAkAEgAjAAq3IBcMCgQCAy0rATQnARYzMj4CBQEmIyIOAQcUJRQOAi4DPgQeAgLcMP5bTFo+cFAy/dIBpUtcU4xQAQLcRHKgrKJwRgJCdJ6wnHZAAWBaSv5cMjJQcmkBpTJQkFBbW1igckYCQnactJp4PgZKbKYAAAAAAQAAAAEAAB7akRNfDzz1AAsD6AAAAADSPcdGAAAAANI9nRb/+P9qBLEDWAAAAAgAAgAAAAAAAAABAAADUv9qAFoEsQAA/+YEsQABAAAAAAAAAAAAAAAAAAAARAPoAAADoAAAA6AAAANZAAAELwAAA+gAAANZAAADWQAAA9MAAAPoAAAELwAAA+gAAAMRAAADoAAAAqYAAAPpAAAD6AAABLEAAAPoAAADWQAAA+gAAAQvAAADwgAAAoAAAANZAAAELwAAA+gAAANZAAAD6AAAA4QAAAOgAAADoAAAAxUAAAPoAAAD6AAAA+gAAAMMAAADmAAAA5gAAAOgAAAD6AAAA5gAAAOgAAADhAAAA+gAAAIwAAADoAAAAxEAAANZAAADEQAAAxEAAANZAAADqQAAA6AAAAOgAAAD6AAAAxEAAAPoAAAD6AAAA6AAAAQvAAADEQAAA+gAAAKCAAADoAAAA6AAAANZAAADWQAAAAAAAAA6AIYBJgKGAvYDPAOGBAgEYgTABTYF0gY0BqYHRAe4CFII8gleCawJ8gowCqAK8AtYC6oL9gxkDJQM8A0ODUANog3iDhIOZA8UD2IQFhBEELARFBFAEYgSGBKCEroTDBNKE4ITwBQCFGwUvhUkFU4VqBYaFnAWxhcGF6gX4BhuGMAZChlLAAAAAQAAAEQA9AAPAAAAAAACAAAAEABzAAAANAtwAAAAAAAAABIA3gABAAAAAAAAADUAAAABAAAAAAABAAgANQABAAAAAAACAAcAPQABAAAAAAADAAgARAABAAAAAAAEAAgATAABAAAAAAAFAAsAVAABAAAAAAAGAAgAXwABAAAAAAAKACsAZwABAAAAAAALABMAkgADAAEECQAAAGoApQADAAEECQABABABDwADAAEECQACAA4BHwADAAEECQADABABLQADAAEECQAEABABPQADAAEECQAFABYBTQADAAEECQAGABABYwADAAEECQAKAFYBcwADAAEECQALACYByUNvcHlyaWdodCAoQykgMjAxNSBieSBvcmlnaW5hbCBhdXRob3JzIEAgZm9udGVsbG8uY29tZm9udGVsbG9SZWd1bGFyZm9udGVsbG9mb250ZWxsb1ZlcnNpb24gMS4wZm9udGVsbG9HZW5lcmF0ZWQgYnkgc3ZnMnR0ZiBmcm9tIEZvbnRlbGxvIHByb2plY3QuaHR0cDovL2ZvbnRlbGxvLmNvbQBDAG8AcAB5AHIAaQBnAGgAdAAgACgAQwApACAAMgAwADEANQAgAGIAeQAgAG8AcgBpAGcAaQBuAGEAbAAgAGEAdQB0AGgAbwByAHMAIABAACAAZgBvAG4AdABlAGwAbABvAC4AYwBvAG0AZgBvAG4AdABlAGwAbABvAFIAZQBnAHUAbABhAHIAZgBvAG4AdABlAGwAbABvAGYAbwBuAHQAZQBsAGwAbwBWAGUAcgBzAGkAbwBuACAAMQAuADAAZgBvAG4AdABlAGwAbABvAEcAZQBuAGUAcgBhAHQAZQBkACAAYgB5ACAAcwB2AGcAMgB0AHQAZgAgAGYAcgBvAG0AIABGAG8AbgB0AGUAbABsAG8AIABwAHIAbwBqAGUAYwB0AC4AaAB0AHQAcAA6AC8ALwBmAG8AbgB0AGUAbABsAG8ALgBjAG8AbQAAAAACAAAAAAAAAAoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEQAAAECAQMBBAEFAQYBBwEIAQkBCgELAQwBDQEOAQ8BEAERARIBEwEUARUBFgEXARgBGQEaARsBHAEdAR4BHwEgASEBIgEjASQBJQEmAScBKAEpASoBKwEsAS0BLgEvATABMQEyATMBNAE1ATYBNwE4ATkBOgE7ATwBPQE+AT8BQAFBAUIBQwFEBHN0YXIKc3Rhci1lbXB0eQNjb2cHY29nLWFsdARtYWlsBnBlbmNpbAxwbHVzLWNpcmNsZWQDYXNsA2V5ZQR0YWdzBGNoYXQFdHJhc2gGYmFza2V0BnB1enpsZQhsYW5ndWFnZQZzaWduYWwFdXNlcnMFdG9vbHMJYXJyb3dzLWN3CGV4Y2hhbmdlC2ZvbGRlci1vcGVuBWJydXNoC2Zsb3ctYnJhbmNoBG1lbnUEY29kZQh1c2VyLWFkZAJjdwVncm91cARob21lCWVxdWFsaXplcgZtYWlsLTEGc2VhcmNoBG1vdmUGdXBsb2FkDHVwbG9hZC1jbG91ZANrZXkHbmV0d29yaw5pbmZvLWNpcmNsZWQtMQhjYWxlbmRhcgJvawxoZWxwLWNpcmNsZWQGbG9nb3V0BGZsYWcFc3BpbjYJaG91cmdsYXNzBWNoZWNrC2NoZWNrLWVtcHR5DmNhbmNlbC1jaXJjbGVkBmNhbmNlbARwbHVzCm9rLWNpcmNsZWQMaGVhcnQtYnJva2VuB3pvb20taW4Iem9vbS1vdXQFdGFza3MGZmlsdGVyCG1haWwtYWx0B3NpdGVtYXAEY3JvcAdwaWN0dXJlBHVzZXIHc2h1ZmZsZQRsb2NrBGxpbmsGd3JlbmNoBWNsb2NrBWJsb2NrAAAAAAAAAQAB//8ADwAAAAAAAAAAAAAAALAALCCwAFVYRVkgIEu4AA5RS7AGU1pYsDQbsChZYGYgilVYsAIlYbkIAAgAY2MjYhshIbAAWbAAQyNEsgABAENgQi2wASywIGBmLbACLCBkILDAULAEJlqyKAEKQ0VjRVJbWCEjIRuKWCCwUFBYIbBAWRsgsDhQWCGwOFlZILEBCkNFY0VhZLAoUFghsQEKQ0VjRSCwMFBYIbAwWRsgsMBQWCBmIIqKYSCwClBYYBsgsCBQWCGwCmAbILA2UFghsDZgG2BZWVkbsAErWVkjsABQWGVZWS2wAywgRSCwBCVhZCCwBUNQWLAFI0KwBiNCGyEhWbABYC2wBCwjISMhIGSxBWJCILAGI0KxAQpDRWOxAQpDsABgRWOwAyohILAGQyCKIIqwASuxMAUlsAQmUVhgUBthUllYI1khILBAU1iwASsbIbBAWSOwAFBYZVktsAUssAdDK7IAAgBDYEItsAYssAcjQiMgsAAjQmGwAmJmsAFjsAFgsAUqLbAHLCAgRSCwC0NjuAQAYiCwAFBYsEBgWWawAWNgRLABYC2wCCyyBwsAQ0VCKiGyAAEAQ2BCLbAJLLAAQyNEsgABAENgQi2wCiwgIEUgsAErI7AAQ7AEJWAgRYojYSBkILAgUFghsAAbsDBQWLAgG7BAWVkjsABQWGVZsAMlI2FERLABYC2wCywgIEUgsAErI7AAQ7AEJWAgRYojYSBksCRQWLAAG7BAWSOwAFBYZVmwAyUjYUREsAFgLbAMLCCwACNCsgsKA0VYIRsjIVkqIS2wDSyxAgJFsGRhRC2wDiywAWAgILAMQ0qwAFBYILAMI0JZsA1DSrAAUlggsA0jQlktsA8sILAQYmawAWMguAQAY4ojYbAOQ2AgimAgsA4jQiMtsBAsS1RYsQRkRFkksA1lI3gtsBEsS1FYS1NYsQRkRFkbIVkksBNlI3gtsBIssQAPQ1VYsQ8PQ7ABYUKwDytZsABDsAIlQrEMAiVCsQ0CJUKwARYjILADJVBYsQEAQ2CwBCVCioogiiNhsA4qISOwAWEgiiNhsA4qIRuxAQBDYLACJUKwAiVhsA4qIVmwDENHsA1DR2CwAmIgsABQWLBAYFlmsAFjILALQ2O4BABiILAAUFiwQGBZZrABY2CxAAATI0SwAUOwAD6yAQEBQ2BCLbATLACxAAJFVFiwDyNCIEWwCyNCsAojsABgQiBgsAFhtRAQAQAOAEJCimCxEgYrsHIrGyJZLbAULLEAEystsBUssQETKy2wFiyxAhMrLbAXLLEDEystsBgssQQTKy2wGSyxBRMrLbAaLLEGEystsBsssQcTKy2wHCyxCBMrLbAdLLEJEystsB4sALANK7EAAkVUWLAPI0IgRbALI0KwCiOwAGBCIGCwAWG1EBABAA4AQkKKYLESBiuwcisbIlktsB8ssQAeKy2wICyxAR4rLbAhLLECHistsCIssQMeKy2wIyyxBB4rLbAkLLEFHistsCUssQYeKy2wJiyxBx4rLbAnLLEIHistsCgssQkeKy2wKSwgPLABYC2wKiwgYLAQYCBDI7ABYEOwAiVhsAFgsCkqIS2wKyywKiuwKiotsCwsICBHICCwC0NjuAQAYiCwAFBYsEBgWWawAWNgI2E4IyCKVVggRyAgsAtDY7gEAGIgsABQWLBAYFlmsAFjYCNhOBshWS2wLSwAsQACRVRYsAEWsCwqsAEVMBsiWS2wLiwAsA0rsQACRVRYsAEWsCwqsAEVMBsiWS2wLywgNbABYC2wMCwAsAFFY7gEAGIgsABQWLBAYFlmsAFjsAErsAtDY7gEAGIgsABQWLBAYFlmsAFjsAErsAAWtAAAAAAARD4jOLEvARUqLbAxLCA8IEcgsAtDY7gEAGIgsABQWLBAYFlmsAFjYLAAQ2E4LbAyLC4XPC2wMywgPCBHILALQ2O4BABiILAAUFiwQGBZZrABY2CwAENhsAFDYzgtsDQssQIAFiUgLiBHsAAjQrACJUmKikcjRyNhIFhiGyFZsAEjQrIzAQEVFCotsDUssAAWsAQlsAQlRyNHI2GwCUMrZYouIyAgPIo4LbA2LLAAFrAEJbAEJSAuRyNHI2EgsAQjQrAJQysgsGBQWCCwQFFYswIgAyAbswImAxpZQkIjILAIQyCKI0cjRyNhI0ZgsARDsAJiILAAUFiwQGBZZrABY2AgsAErIIqKYSCwAkNgZCOwA0NhZFBYsAJDYRuwA0NgWbADJbACYiCwAFBYsEBgWWawAWNhIyAgsAQmI0ZhOBsjsAhDRrACJbAIQ0cjRyNhYCCwBEOwAmIgsABQWLBAYFlmsAFjYCMgsAErI7AEQ2CwASuwBSVhsAUlsAJiILAAUFiwQGBZZrABY7AEJmEgsAQlYGQjsAMlYGRQWCEbIyFZIyAgsAQmI0ZhOFktsDcssAAWICAgsAUmIC5HI0cjYSM8OC2wOCywABYgsAgjQiAgIEYjR7ABKyNhOC2wOSywABawAyWwAiVHI0cjYbAAVFguIDwjIRuwAiWwAiVHI0cjYSCwBSWwBCVHI0cjYbAGJbAFJUmwAiVhuQgACABjYyMgWGIbIVljuAQAYiCwAFBYsEBgWWawAWNgIy4jICA8ijgjIVktsDossAAWILAIQyAuRyNHI2EgYLAgYGawAmIgsABQWLBAYFlmsAFjIyAgPIo4LbA7LCMgLkawAiVGUlggPFkusSsBFCstsDwsIyAuRrACJUZQWCA8WS6xKwEUKy2wPSwjIC5GsAIlRlJYIDxZIyAuRrACJUZQWCA8WS6xKwEUKy2wPiywNSsjIC5GsAIlRlJYIDxZLrErARQrLbA/LLA2K4ogIDywBCNCijgjIC5GsAIlRlJYIDxZLrErARQrsARDLrArKy2wQCywABawBCWwBCYgLkcjRyNhsAlDKyMgPCAuIzixKwEUKy2wQSyxCAQlQrAAFrAEJbAEJSAuRyNHI2EgsAQjQrAJQysgsGBQWCCwQFFYswIgAyAbswImAxpZQkIjIEewBEOwAmIgsABQWLBAYFlmsAFjYCCwASsgiophILACQ2BkI7ADQ2FkUFiwAkNhG7ADQ2BZsAMlsAJiILAAUFiwQGBZZrABY2GwAiVGYTgjIDwjOBshICBGI0ewASsjYTghWbErARQrLbBCLLA1Ky6xKwEUKy2wQyywNishIyAgPLAEI0IjOLErARQrsARDLrArKy2wRCywABUgR7AAI0KyAAEBFRQTLrAxKi2wRSywABUgR7AAI0KyAAEBFRQTLrAxKi2wRiyxAAEUE7AyKi2wRyywNCotsEgssAAWRSMgLiBGiiNhOLErARQrLbBJLLAII0KwSCstsEossgAAQSstsEsssgABQSstsEwssgEAQSstsE0ssgEBQSstsE4ssgAAQistsE8ssgABQistsFAssgEAQistsFEssgEBQistsFIssgAAPistsFMssgABPistsFQssgEAPistsFUssgEBPistsFYssgAAQCstsFcssgABQCstsFgssgEAQCstsFkssgEBQCstsFossgAAQystsFsssgABQystsFwssgEAQystsF0ssgEBQystsF4ssgAAPystsF8ssgABPystsGAssgEAPystsGEssgEBPystsGIssDcrLrErARQrLbBjLLA3K7A7Ky2wZCywNyuwPCstsGUssAAWsDcrsD0rLbBmLLA4Ky6xKwEUKy2wZyywOCuwOystsGgssDgrsDwrLbBpLLA4K7A9Ky2waiywOSsusSsBFCstsGsssDkrsDsrLbBsLLA5K7A8Ky2wbSywOSuwPSstsG4ssDorLrErARQrLbBvLLA6K7A7Ky2wcCywOiuwPCstsHEssDorsD0rLbByLLMJBAIDRVghGyMhWUIrsAhlsAMkUHiwARUwLQBLuADIUlixAQGOWbABuQgACABjcLEABUKxAAAqsQAFQrEACCqxAAVCsQAIKrEABUK5AAAACSqxAAVCuQAAAAkqsQMARLEkAYhRWLBAiFixA2REsSYBiFFYugiAAAEEQIhjVFixAwBEWVlZWbEADCq4Af+FsASNsQIARAA=') format('truetype'); } /* Chrome hack: SVG is rendered more smooth in Windozze. 100% magic, uncomment if you need it. */ /* Note, that will break hinting! In other OS-es font will be not as sharp as it could be */ @@ -19,7 +19,7 @@ @media screen and (-webkit-min-device-pixel-ratio:0) { @font-face { font-family: 'fontello'; - src: url('../font/fontello.svg?76878460#fontello') format('svg'); + src: url('../font/fontello.svg?37675340#fontello') format('svg'); } } */ @@ -105,6 +105,7 @@ .icon-cancel:before { content: '\e822'; } /* '' */ .icon-plus:before { content: '\e823'; } /* '' */ .icon-ok-circled:before { content: '\e824'; } /* '' */ +.icon-heart-broken:before { content: '\e825'; } /* '' */ .icon-zoom-in:before { content: '\e827'; } /* '' */ .icon-zoom-out:before { content: '\e828'; } /* '' */ .icon-tasks:before { content: '\f0ae'; } /* '' */ diff --git a/sources/admin/themes/default/fontello/css/fontello-ie7-codes.css b/sources/admin/themes/default/fontello/css/fontello-ie7-codes.css index 49cd553..708cfdf 100644 --- a/sources/admin/themes/default/fontello/css/fontello-ie7-codes.css +++ b/sources/admin/themes/default/fontello/css/fontello-ie7-codes.css @@ -50,6 +50,7 @@ .icon-cancel { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } .icon-plus { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } .icon-ok-circled { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-heart-broken { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } .icon-zoom-in { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } .icon-zoom-out { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } .icon-tasks { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } diff --git a/sources/admin/themes/default/fontello/css/fontello-ie7.css b/sources/admin/themes/default/fontello/css/fontello-ie7.css index 9eec9e6..c1e1ec5 100644 --- a/sources/admin/themes/default/fontello/css/fontello-ie7.css +++ b/sources/admin/themes/default/fontello/css/fontello-ie7.css @@ -61,6 +61,7 @@ .icon-cancel { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } .icon-plus { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } .icon-ok-circled { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-heart-broken { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } .icon-zoom-in { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } .icon-zoom-out { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } .icon-tasks { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } diff --git a/sources/admin/themes/default/fontello/css/fontello.css b/sources/admin/themes/default/fontello/css/fontello.css index 9b3319d..40777f1 100644 --- a/sources/admin/themes/default/fontello/css/fontello.css +++ b/sources/admin/themes/default/fontello/css/fontello.css @@ -2,11 +2,11 @@ @font-face { font-family: 'fontello'; - src: url('../font/fontello.eot?80487531'); - src: url('../font/fontello.eot?80487531#iefix') format('embedded-opentype'), - url('../font/fontello.woff?80487531') format('woff'), - url('../font/fontello.ttf?80487531') format('truetype'), - url('../font/fontello.svg?80487531#fontello') format('svg'); + src: url('../font/fontello.eot?38260160'); + src: url('../font/fontello.eot?38260160#iefix') format('embedded-opentype'), + url('../font/fontello.woff?38260160') format('woff'), + url('../font/fontello.ttf?38260160') format('truetype'), + url('../font/fontello.svg?38260160#fontello') format('svg'); font-weight: normal; font-style: normal; } @@ -16,7 +16,7 @@ @media screen and (-webkit-min-device-pixel-ratio:0) { @font-face { font-family: 'fontello'; - src: url('../font/fontello.svg?80487531#fontello') format('svg'); + src: url('../font/fontello.svg?38260160#fontello') format('svg'); } } */ @@ -37,7 +37,7 @@ /* For safety - reset parent styles, that can break glyph codes*/ font-variant: normal; text-transform: none; - + /* fix buttons height, for twitter bootstrap */ line-height: 1em; @@ -48,6 +48,10 @@ /* you can be more comfortable with increased icons size */ /* font-size: 120%; */ + /* Font smoothing. That was taken from TWBS */ + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + /* Uncomment for 3D effect */ /* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */ } @@ -103,6 +107,7 @@ .icon-cancel:before { content: '\e822'; } /* '' */ .icon-plus:before { content: '\e823'; } /* '' */ .icon-ok-circled:before { content: '\e824'; } /* '' */ +.icon-heart-broken:before { content: '\e825'; } /* '' */ .icon-zoom-in:before { content: '\e827'; } /* '' */ .icon-zoom-out:before { content: '\e828'; } /* '' */ .icon-tasks:before { content: '\f0ae'; } /* '' */ diff --git a/sources/admin/themes/default/fontello/demo.html b/sources/admin/themes/default/fontello/demo.html index eeb1903..c7bd65f 100644 --- a/sources/admin/themes/default/fontello/demo.html +++ b/sources/admin/themes/default/fontello/demo.html @@ -227,8 +227,54 @@ body { .i-code { display: none; } - - +@font-face { + font-family: 'fontello'; + src: url('./font/fontello.eot?58887028'); + src: url('./font/fontello.eot?58887028#iefix') format('embedded-opentype'), + url('./font/fontello.woff?58887028') format('woff'), + url('./font/fontello.ttf?58887028') format('truetype'), + url('./font/fontello.svg?58887028#fontello') format('svg'); + font-weight: normal; + font-style: normal; + } + + + .demo-icon + { + font-family: "fontello"; + font-style: normal; + font-weight: normal; + speak: none; + + display: inline-block; + text-decoration: inherit; + width: 1em; + margin-right: .2em; + text-align: center; + /* opacity: .8; */ + + /* For safety - reset parent styles, that can break glyph codes*/ + font-variant: normal; + text-transform: none; + + /* fix buttons height, for twitter bootstrap */ + line-height: 1em; + + /* Animation center compensation - margins should be symmetric */ + /* remove if not needed */ + margin-left: .2em; + + /* You can be more comfortable with increased icons size */ + /* font-size: 120%; */ + + /* Font smoothing. That was taken from TWBS */ + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + + /* Uncomment for 3D effect */ + /* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */ + } + + +
+
+
\ No newline at end of file diff --git a/sources/admin/themes/default/theme.css b/sources/admin/themes/default/theme.css index 4a151b9..0aa0dba 100644 --- a/sources/admin/themes/default/theme.css +++ b/sources/admin/themes/default/theme.css @@ -213,7 +213,7 @@ LI.menuLi { } /* */ -FORM#catModify TABLE { width: auto; } +#catModify TABLE { width: auto; } #catModify p { line-height: 20px; @@ -221,6 +221,11 @@ FORM#catModify TABLE { width: auto; } text-align: left; } +#catModify p.albumThumbnailActions { + text-align:center; + white-space:nowrap; +} + FIELDSET.elementEdit .thumb { display: block; float: right; @@ -1223,6 +1228,21 @@ a.group_perm { .userProperty {width:340px;float:left;margin-bottom:15px;} .userActions {float:right;text-align:right;} +.user_form_popin { + width:750px; + height:430px; + padding:20px; +} + +.userProperties form { + text-align:left; +} + +.popinWait { + padding-top:200px; +} + + .preview-box.icon-zoom-in { display:block; position:relative; diff --git a/sources/admin/themes/roma/index.php b/sources/admin/themes/roma/index.php index c8de97f..0b96c3e 100644 --- a/sources/admin/themes/roma/index.php +++ b/sources/admin/themes/roma/index.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/admin/themes/roma/theme.css b/sources/admin/themes/roma/theme.css index c436bd2..26c2a65 100644 --- a/sources/admin/themes/roma/theme.css +++ b/sources/admin/themes/roma/theme.css @@ -358,4 +358,6 @@ table.qsearch_help_table td { border-color: #444; } -.font-checkbox [class*=icon-check]:before { color:#aaa; } \ No newline at end of file +.font-checkbox [class*=icon-check]:before { color:#aaa; } + +#cboxLoadedContent { background-color:#222 !important; } \ No newline at end of file diff --git a/sources/admin/themes_installed.php b/sources/admin/themes_installed.php index eb16dc1..f798f21 100644 --- a/sources/admin/themes_installed.php +++ b/sources/admin/themes_installed.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/admin/themes_new.php b/sources/admin/themes_new.php index 803327e..e136079 100644 --- a/sources/admin/themes_new.php +++ b/sources/admin/themes_new.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/admin/updates.php b/sources/admin/updates.php index bfd6b6a..a38a0e5 100644 --- a/sources/admin/updates.php +++ b/sources/admin/updates.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/admin/updates_ext.php b/sources/admin/updates_ext.php index 72b2e13..c8586f0 100644 --- a/sources/admin/updates_ext.php +++ b/sources/admin/updates_ext.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/admin/updates_pwg.php b/sources/admin/updates_pwg.php index 4619ad3..023ff8e 100644 --- a/sources/admin/updates_pwg.php +++ b/sources/admin/updates_pwg.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/admin/user_list.php b/sources/admin/user_list.php index 83815f6..6a7a0a2 100644 --- a/sources/admin/user_list.php +++ b/sources/admin/user_list.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -100,6 +100,8 @@ $protected_users = array( $conf['webmaster_id'], ); +$password_protected_users = array($conf['guest_id']); + // an admin can't delete other admin/webmaster if ('admin' == $user['status']) { @@ -109,7 +111,12 @@ SELECT FROM '.USER_INFOS_TABLE.' WHERE status IN (\'webmaster\', \'admin\') ;'; - $protected_users = array_merge($protected_users, query2array($query, null, 'user_id')); + $admin_ids = query2array($query, null, 'user_id'); + + $protected_users = array_merge($protected_users, $admin_ids); + + // we add all admin+webmaster users BUT the user herself + $password_protected_users = array_merge($password_protected_users, array_diff($admin_ids, array($user['id']))); } $template->assign( @@ -123,6 +130,7 @@ $template->assign( 'language_selected' => get_default_language(), 'association_options' => $groups, 'protected_users' => implode(',', array_unique($protected_users)), + 'password_protected_users' => implode(',', array_unique($password_protected_users)), 'guest_user' => $conf['guest_id'], ) ); @@ -135,7 +143,7 @@ foreach (get_enums(USER_INFOS_TABLE, 'status') as $status) $pref_status_options = $label_of_status; -// a simple "admin" can set/remove statuses webmaster/admin +// a simple "admin" can't set/remove statuses webmaster/admin if ('admin' == $user['status']) { unset($pref_status_options['webmaster']); diff --git a/sources/admin/user_list_backend.php b/sources/admin/user_list_backend.php index 1edaa13..290873c 100644 --- a/sources/admin/user_list_backend.php +++ b/sources/admin/user_list_backend.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/admin/user_perm.php b/sources/admin/user_perm.php index e40c064..68b8c60 100644 --- a/sources/admin/user_perm.php +++ b/sources/admin/user_perm.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/comments.php b/sources/comments.php index c3c4702..7b05249 100644 --- a/sources/comments.php +++ b/sources/comments.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/doc/index.php b/sources/doc/index.php index c8de97f..0b96c3e 100644 --- a/sources/doc/index.php +++ b/sources/doc/index.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/feed.php b/sources/feed.php index 24e9f68..6a7a808 100644 --- a/sources/feed.php +++ b/sources/feed.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/galleries/index.php b/sources/galleries/index.php new file mode 100644 index 0000000..0b96c3e --- /dev/null +++ b/sources/galleries/index.php @@ -0,0 +1,30 @@ + diff --git a/sources/i.php b/sources/i.php index 32f99da..8b3e89b 100644 --- a/sources/i.php +++ b/sources/i.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // +-----------------------------------------------------------------------+ // | This program is free software; you can redistribute it and/or modify | // | it under the terms of the GNU General Public License as published by | @@ -30,6 +30,17 @@ defined('PWG_DERIVATIVE_DIR') or define('PWG_DERIVATIVE_DIR', $conf['data_locati @include(PHPWG_ROOT_PATH.PWG_LOCAL_DIR .'config/database.inc.php'); +include(PHPWG_ROOT_PATH . 'include/Logger.class.php'); + +$logger = new Logger(array( + 'directory' => PHPWG_ROOT_PATH . $conf['data_location'] . $conf['log_dir'], + 'severity' => $conf['log_level'], + // we use an hashed filename to prevent direct file access, and we salt with + // the db_password instead of secret_key because the log must be usable in i.php + // (secret_key is in the database) + 'filename' => 'log_' . date('Y-m-d') . '_' . sha1(date('Y-m-d') . $conf['db_password']) . '.txt', + )); + function trigger_notify() {} function get_extension( $filename ) @@ -66,33 +77,9 @@ function mkgetdir($dir) // end fast bootstrap -function ilog() -{ - global $conf; - if (!$conf['enable_i_log']) return; - - $line = date("c"); - foreach( func_get_args() as $arg) - { - $line .= ' '; - if (is_array($arg)) - { - $line .= implode(' ', $arg); - } - else - { - $line .= $arg; - } - } - $file=PHPWG_ROOT_PATH.$conf['data_location'].'tmp/i.log'; - if (false == file_put_contents($file, $line."\n", FILE_APPEND)) - { - mkgetdir(dirname($file)); - } -} - function ierror($msg, $code) { + global $logger; if ($code==301 || $code==302) { if (ob_get_length () !== FALSE) @@ -101,10 +88,12 @@ function ierror($msg, $code) } // default url is on html format $url = html_entity_decode($msg); + $logger->debug($code . ' ' . $url, 'i.php', array( + 'url' => $_SERVER['REQUEST_URI'], + )); header('Request-URI: '.$url); header('Content-Location: '.$url); header('Location: '.$url); - ilog('WARN', $code, $url, $_SERVER['REQUEST_URI']); exit; } if ($code>=400) @@ -117,7 +106,9 @@ function ierror($msg, $code) } //todo improve echo $msg; - ilog('ERROR', $code, $msg, $_SERVER['REQUEST_URI']); + $logger->error($code . ' ' . $msg, 'i.php', array( + 'url' => $_SERVER['REQUEST_URI'], + )); exit; } @@ -322,6 +313,8 @@ function try_switch_source(DerivativeParams $params, $original_mtime) } else { + if ($use_watermark && $candidate->use_watermark) + continue; //a square that requires watermark should not be generated from a larger derivative with watermark, because if the watermark is not centered on the large image, it will be cropped. if ($candidate->sizing->max_crop!=0) continue; // this could be optimized if ($candidate_size[0] < $params->sizing->min_size[0] || $candidate_size[1] < $params->sizing->min_size[1] ) @@ -404,7 +397,7 @@ try } catch (Exception $e) { - ilog("db error", $e->getMessage()); + $logger->error($e->getMessage(), 'i.php'); } pwg_db_check_charset(); @@ -501,7 +494,7 @@ SELECT * } catch (Exception $e) { - ilog("db error", $e->getMessage()); + $logger->error($e->getMessage(), 'i.php'); } } else @@ -582,17 +575,23 @@ if ($params->will_watermark($d_size)) if ($image->compose($wm_image, $x, $y, $wm->opacity)) { $changes++; - if ($wm->xrepeat) + if ($wm->xrepeat || $wm->yrepeat) { - // todo - $pad = $wm_size[0] + max(30, round($wm_size[0]/4)); + $xpad = $wm_size[0] + max(30, round($wm_size[0]/4)); + $ypad = $wm_size[1] + max(30, round($wm_size[1]/4)); + for($i=-$wm->xrepeat; $i<=$wm->xrepeat; $i++) { - if (!$i) continue; - $x2 = $x + $i * $pad; - if ($x2>=0 && $x2+$wm_size[0]<$d_size[0]) - if (!$image->compose($wm_image, $x2, $y, $wm->opacity)) - break; + for($j=-$wm->yrepeat; $j<=$wm->yrepeat; $j++) + { + if (!$i && !$j) continue; + $x2 = $x + $i * $xpad; + $y2 = $y + $j * $ypad; + if ($x2>=0 && $x2+$wm_size[0]<$d_size[0] && + $y2>=0 && $y2+$wm_size[1]<$d_size[1] ) + if (!$image->compose($wm_image, $x2, $y2, $wm->opacity)) + break; + } } } } @@ -621,10 +620,16 @@ $timing['save'] = time_step($step); send_derivative($expires); $timing['send'] = time_step($step); -ilog('perf', - basename($page['src_path']), $o_size, $o_size[0]*$o_size[1], - basename($page['derivative_path']), $d_size, $d_size[0]*$d_size[1], - function_exists('memory_get_peak_usage') ? round( memory_get_peak_usage()/(1024*1024), 1) : '', - time_step($begin), - '|', $timing); -?> \ No newline at end of file +$timing['total'] = time_step($begin); + +if ($logger->severity() >= Logger::DEBUG) +{ + $logger->debug('', 'i.php', array( + 'src_path' => basename($page['src_path']), + 'derivative_path' => basename($page['derivative_path']), + 'o_size' => $o_size[0] . ' ' . $o_size[1] . ' ' . ($o_size[0]*$o_size[1]), + 'd_size' => $d_size[0] . ' ' . $d_size[1] . ' ' . ($d_size[0]*$d_size[1]), + 'mem_usage' => function_exists('memory_get_peak_usage') ? round( memory_get_peak_usage()/(1024*1024), 1) : '', + 'timing' => $timing, + )); +} \ No newline at end of file diff --git a/sources/identification.php b/sources/identification.php index fe8a802..be22eb5 100644 --- a/sources/identification.php +++ b/sources/identification.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/include/Logger.class.php b/sources/include/Logger.class.php new file mode 100644 index 0000000..73a2934 --- /dev/null +++ b/sources/include/Logger.class.php @@ -0,0 +1,489 @@ + + * + * @package logger + */ + +class Logger +{ + /** + * Error severity, from low to high. From BSD syslog RFC, section 4.1.1 + * @link http://www.faqs.org/rfcs/rfc3164.html + */ + const EMERGENCY = 0; // Emergency: system is unusable + const ALERT = 1; // Alert: action must be taken immediately + const CRITICAL = 2; // Critical: critical conditions + const ERROR = 3; // Error: error conditions + const WARNING = 4; // Warning: warning conditions + const NOTICE = 5; // Notice: normal but significant condition + const INFO = 6; // Informational: informational messages + const DEBUG = 7; // Debug: debug messages + + /** + * Custom "disable" level. + */ + const OFF = -1; // Log nothing at all + + /** + * Internal status codes. + */ + const STATUS_LOG_OPEN = 1; + const STATUS_OPEN_FAILED = 2; + const STATUS_LOG_CLOSED = 3; + + /** + * Disable archive purge. + */ + const ARCHIVE_NO_PURGE = -1; + + /** + * Standard messages produced by the class. + * @var array + */ + private static $_messages = array( + 'writefail' => 'The file could not be written to. Check that appropriate permissions have been set.', + 'opensuccess' => 'The log file was opened successfully.', + 'openfail' => 'The file could not be opened. Check permissions.', + ); + + /** + * Instance options. + * @var array + */ + private $options = array( + 'directory' => null, // Log files directory + 'filename' => null, // Path to the log file + 'globPattern' => 'log_*.txt', // Pattern to select all log files with glob() + 'severity' => self::DEBUG, // Current minimum logging threshold + 'dateFormat' => 'Y-m-d G:i:s', // Date format + 'archiveDays' => self::ARCHIVE_NO_PURGE, // Number of files to keep + ); + + /** + * Current status of the logger. + * @var integer + */ + private $_logStatus = self::STATUS_LOG_CLOSED; + /** + * File handle for this instance's log file. + * @var resource + */ + private $_fileHandle = null; + + + /** + * Class constructor. + * + * @param array $options + * @return void + */ + public function __construct($options) + { + $this->options = array_merge($this->options, $options); + + if (is_string($this->options['severity'])) + { + $this->options['severity'] = self::codeToLevel($this->options['severity']); + } + + if ($this->options['severity'] === self::OFF) + { + return; + } + + $this->options['directory'] = rtrim($this->options['directory'], '\\/') . DIRECTORY_SEPARATOR; + + if ($this->options['filename'] == null) + { + $this->options['filename'] = 'log_' . date('Y-m-d') . '.txt'; + } + + $this->options['filePath'] = $this->options['directory'] . $this->options['filename']; + + if ($this->options['archiveDays'] != self::ARCHIVE_NO_PURGE && rand() % 97 == 0) + { + $this->purge(); + } + } + + /** + * Open the log file if not already oppenned + */ + private function open() + { + if ($this->status() == self::STATUS_LOG_CLOSED) + { + if (!file_exists($this->options['directory'])) + { + mkgetdir($this->options['directory'], MKGETDIR_DEFAULT|MKGETDIR_PROTECT_HTACCESS); + } + + if (file_exists($this->options['filePath']) && !is_writable($this->options['filePath'])) + { + $this->_logStatus = self::STATUS_OPEN_FAILED; + throw new RuntimeException(self::$_messages['writefail']); + return; + } + + if (($this->_fileHandle = fopen($this->options['filePath'], 'a')) != false) + { + $this->_logStatus = self::STATUS_LOG_OPEN; + } + else + { + $this->_logStatus = self::STATUS_OPEN_FAILED; + throw new RuntimeException(self::$_messages['openfail']); + } + } + } + + /** + * Class destructor. + */ + public function __destruct() + { + if ($this->_fileHandle) + { + fclose($this->_fileHandle); + } + } + + /** + * Returns logger status. + * + * @return int + */ + public function status() + { + return $this->_logStatus; + } + + /** + * Returns logger severity threshold. + * + * @return int + */ + public function severity() + { + return $this->options['severity']; + } + + /** + * Writes a $line to the log with a severity level of DEBUG. + * + * @param string $line + * @param string $cat + * @param array $args + */ + public function debug($line, $cat = null, $args = array()) + { + $this->log(self::DEBUG, $line, $cat, $args); + } + + /** + * Writes a $line to the log with a severity level of INFO. + * + * @param string $line + * @param string $cat + * @param array $args + */ + public function info($line, $cat = null, $args = array()) + { + $this->log(self::INFO, $line, $cat, $args); + } + + /** + * Writes a $line to the log with a severity level of NOTICE. + * + * @param string $line + * @param string $cat + * @param array $args + */ + public function notice($line, $cat = null, $args = array()) + { + $this->log(self::NOTICE, $line, $cat, $args); + } + + /** + * Writes a $line to the log with a severity level of WARNING. + * + * @param string $line + * @param string $cat + * @param array $args + */ + public function warn($line, $cat = null, $args = array()) + { + $this->log(self::WARNING, $line, $cat, $args); + } + + /** + * Writes a $line to the log with a severity level of ERROR. + * + * @param string $line + * @param string $cat + * @param array $args + */ + public function error($line, $cat = null, $args = array()) + { + $this->log(self::ERROR, $line, $cat, $args); + } + + /** + * Writes a $line to the log with a severity level of ALERT. + * + * @param string $line + * @param string $cat + * @param array $args + */ + public function alert($line, $cat = null, $args = array()) + { + $this->log(self::ALERT, $line, $cat, $args); + } + + /** + * Writes a $line to the log with a severity level of CRITICAL. + * + * @param string $line + * @param string $cat + * @param array $args + */ + public function critical($line, $cat = null, $args = array()) + { + $this->log(self::CRITICAL, $line, $cat, $args); + } + + /** + * Writes a $line to the log with a severity level of EMERGENCY. + * + * @param string $line + * @param string $cat + * @param array $args + */ + public function emergency($line, $cat = null, $args = array()) + { + $this->log(self::EMERGENCY, $line, $cat, $args); + } + + /** + * Writes a $line to the log with the given severity. + * + * @param integer $severity + * @param string $line + * @param string $cat + * @param array $args + */ + public function log($severity, $message, $cat = null, $args = array()) + { + if ($this->severity() >= $severity) + { + if (is_array($cat)) + { + $args = $cat; + $cat = null; + } + $line = $this->formatMessage($severity, $message, $cat, $args); + $this->write($line); + } + } + + /** + * Directly writes a line to the log without adding level and time. + * + * @param string $line + */ + public function write($line) + { + $this->open(); + if ($this->status() == self::STATUS_LOG_OPEN) + { + if (fwrite($this->_fileHandle, $line) === false) + { + throw new RuntimeException(self::$_messages['writefail']); + } + } + } + + /** + * Purges files matching 'globPattern' older than 'archiveDays'. + */ + public function purge() + { + $files = glob($this->options['directory'] . $this->options['globPattern']); + $limit = time() - $this->options['archiveDays'] * 86400; + + foreach ($files as $file) + { + if (@filemtime($file) < $limit) + { + @unlink($file); + } + } + } + + /** + * Formats the message for logging. + * + * @param string $level + * @param string $message + * @param array $context + * @return string + */ + private function formatMessage($level, $message, $cat, $context) + { + if (!empty($context)) + { + $message.= "\n" . $this->indent($this->contextToString($context)); + } + $line = "[" . $this->getTimestamp() . "]\t[" . self::levelToCode($level) . "]\t"; + if ($cat != null) + { + $line.= "[" . $cat . "]\t"; + } + return $line . $message . "\n"; + } + + /** + * Gets the formatted Date/Time for the log entry. + * + * PHP DateTime is dumb, and you have to resort to trickery to get microseconds + * to work correctly, so here it is. + * + * @return string + */ + private function getTimestamp() + { + $originalTime = microtime(true); + $micro = sprintf('%06d', ($originalTime - floor($originalTime)) * 1000000); + $date = new DateTime(date('Y-m-d H:i:s.'.$micro, $originalTime)); + return $date->format($this->options['dateFormat']); + } + + /** + * Takes the given context and converts it to a string. + * + * @param array $context + * @return string + */ + private function contextToString($context) + { + $export = ''; + foreach ($context as $key => $value) + { + $export.= $key . ': '; + $export.= preg_replace(array( + '/=>\s+([a-zA-Z])/im', + '/array\(\s+\)/im', + '/^ |\G /m' + ), + array( + '=> $1', + 'array()', + ' ' + ), + str_replace('array (', 'array(', var_export($value, true)) + ); + $export.= PHP_EOL; + } + return str_replace(array('\\\\', '\\\''), array('\\', '\''), rtrim($export)); + } + + /** + * Indents the given string with the given indent. + * + * @param string $string The string to indent + * @param string $indent What to use as the indent. + * @return string + */ + private function indent($string, $indent = ' ') + { + return $indent . str_replace("\n", "\n" . $indent, $string); + } + + /** + * Converts level constants to string name. + * + * @param int $level + * @return string + */ + static function levelToCode($level) + { + switch ($level) + { + case self::EMERGENCY: + return 'EMERGENCY'; + case self::ALERT: + return 'ALERT'; + case self::CRITICAL: + return 'CRITICAL'; + case self::NOTICE: + return 'NOTICE'; + case self::INFO: + return 'INFO'; + case self::WARNING: + return 'WARNING'; + case self::DEBUG: + return 'DEBUG'; + case self::ERROR: + return 'ERROR'; + default: + throw new RuntimeException('Unknown severity level ' . $level); + } + } + + /** + * Converts level names to constant. + * + * @param string $code + * @return int + */ + static function codeToLevel($code) + { + switch (strtoupper($code)) + { + case 'EMERGENCY': + return self::EMERGENCY; + case 'ALERT': + return self::ALERT; + case 'CRITICAL': + return self::CRITICAL; + case 'NOTICE': + return self::NOTICE; + case 'INFO': + return self::INFO; + case 'WARNING': + return self::WARNING; + case 'DEBUG': + return self::DEBUG; + case 'ERROR': + return self::ERROR; + default: + throw new RuntimeException('Unknown severity code ' . $code); + } + } +} +?> \ No newline at end of file diff --git a/sources/include/block.class.php b/sources/include/block.class.php index cce92ec..ea11cb8 100644 --- a/sources/include/block.class.php +++ b/sources/include/block.class.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // +-----------------------------------------------------------------------+ // | This program is free software; you can redistribute it and/or modify | // | it under the terms of the GNU General Public License as published by | diff --git a/sources/include/cache.class.php b/sources/include/cache.class.php index 5b97cb1..4a1a4aa 100644 --- a/sources/include/cache.class.php +++ b/sources/include/cache.class.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/include/calendar_base.class.php b/sources/include/calendar_base.class.php index f48fae1..020265d 100644 --- a/sources/include/calendar_base.class.php +++ b/sources/include/calendar_base.class.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -360,7 +360,7 @@ GROUP BY period'; if ( !empty($tpl_var) ) { $existing = $template->smarty->getVariable('chronology_navigation_bars'); - if (! ($existing instanceof Undefined_Smarty_Variable)) + if (! ($existing instanceof Smarty_Undefined_Variable)) { $existing->value[ sizeof($existing->value)-1 ] = array_merge( $existing->value[ sizeof($existing->value)-1 ], $tpl_var); diff --git a/sources/include/calendar_monthly.class.php b/sources/include/calendar_monthly.class.php index 9ab38ae..f82849c 100644 --- a/sources/include/calendar_monthly.class.php +++ b/sources/include/calendar_monthly.class.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/include/calendar_weekly.class.php b/sources/include/calendar_weekly.class.php index 346f658..91ae9b7 100644 --- a/sources/include/calendar_weekly.class.php +++ b/sources/include/calendar_weekly.class.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/include/category_cats.inc.php b/sources/include/category_cats.inc.php index 4cab63d..9305945 100644 --- a/sources/include/category_cats.inc.php +++ b/sources/include/category_cats.inc.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/include/category_default.inc.php b/sources/include/category_default.inc.php index 6106ccb..6962fd0 100644 --- a/sources/include/category_default.inc.php +++ b/sources/include/category_default.inc.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/include/common.inc.php b/sources/include/common.inc.php index e3f4a16..a01fced 100644 --- a/sources/include/common.inc.php +++ b/sources/include/common.inc.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -26,7 +26,7 @@ defined('PHPWG_ROOT_PATH') or trigger_error('Hacking attempt!', E_USER_ERROR); // determine the initial instant to indicate the generation time of this page $t2 = microtime(true); -@set_magic_quotes_runtime(0); // Disable magic_quotes_runtime +// @set_magic_quotes_runtime(0); // Disable magic_quotes_runtime // // addslashes to vars if magic_quotes_gpc is off this is a security @@ -104,6 +104,9 @@ if(isset($conf['show_php_errors']) && !empty($conf['show_php_errors'])) include(PHPWG_ROOT_PATH . 'include/constants.php'); include(PHPWG_ROOT_PATH . 'include/functions.inc.php'); +include(PHPWG_ROOT_PATH . 'include/template.class.php'); +include(PHPWG_ROOT_PATH . 'include/cache.class.php'); +include(PHPWG_ROOT_PATH . 'include/Logger.class.php'); $persistent_cache = new PersistentFileCache(); @@ -122,6 +125,17 @@ pwg_db_check_charset(); load_conf_from_db(); +$logger = new Logger(array( + 'directory' => PHPWG_ROOT_PATH . $conf['data_location'] . $conf['log_dir'], + 'severity' => $conf['log_level'], + // we use an hashed filename to prevent direct file access, and we salt with + // the db_password instead of secret_key because the log must be usable in i.php + // (secret_key is in the database) + 'filename' => 'log_' . date('Y-m-d') . '_' . sha1(date('Y-m-d') . $conf['db_password']) . '.txt', + 'globPattern' => 'log_*.txt', + 'archiveDays' => $conf['log_archive_days'], + )); + if (!$conf['check_upgrade_feed']) { if (!isset($conf['piwigo_db_version']) or $conf['piwigo_db_version'] != get_branch_from_version(PHPWG_VERSION)) @@ -187,6 +201,16 @@ if (is_a_guest()) $user['username'] = l10n('guest'); } +// in case an auth key was provided and is no longer valid, we must wait to +// be here, with language loaded, to prepare the message +if (isset($page['auth_key_invalid']) and $page['auth_key_invalid']) +{ + $page['errors'][] = + l10n('Your authentication key is no longer valid.') + .sprintf(' %s', get_root_url().'identification.php', l10n('Login')) + ; +} + // template instance if (defined('IN_ADMIN') and IN_ADMIN ) {// Admin template diff --git a/sources/include/config_default.inc.php b/sources/include/config_default.inc.php index 6d2dd31..87baa29 100644 --- a/sources/include/config_default.inc.php +++ b/sources/include/config_default.inc.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -63,6 +63,13 @@ $conf['file_ext'] = array_merge( array('tiff', 'tif', 'mpg','zip','avi','mp3','ogg','pdf') ); +// enable_formats: should Piwigo search for multiple formats? +$conf['enable_formats'] = false; + +// format_ext : file extensions for formats, ie additional versions of a +// photo (or nay other file). Formats are in sub-directory pwg_format. +$conf['format_ext'] = array('cr2', 'tif', 'tiff', 'nef', 'dng', 'ai', 'psd'); + // top_number : number of element to display for "best rated" and "most // visited" categories $conf['top_number'] = 15; @@ -371,6 +378,10 @@ $conf['use_exif_mapping'] = array( // javascript) $conf['allow_html_in_metadata'] = false; +// decide which characters can be used as keyword separators (works in EXIF +// and IPTC). Coma "," cannot be removed from this list. +$conf['metadata_keyword_separator_regex'] = '/[.,;]/'; + // +-----------------------------------------------------------------------+ // | sessions | // +-----------------------------------------------------------------------+ @@ -458,8 +469,6 @@ $conf['template_combine_files'] = true; // gives an empty value '' to deactivate $conf['show_php_errors'] = E_ALL; -// enable log for i derivative script -$conf['enable_i_log'] = false; // +-----------------------------------------------------------------------+ // | authentication | @@ -637,6 +646,10 @@ $conf['recent_post_dates'] = array( // the author shown in the RSS feed element $conf['rss_feed_author'] = 'Piwigo notifier'; +// how long does the authentication key stays valid, in seconds. 3 days by +// default. 0 to disable. +$conf['auth_key_duration'] = 3*24*60*60; + // +-----------------------------------------------------------------------+ // | Set admin layout | // +-----------------------------------------------------------------------+ @@ -649,12 +662,6 @@ $conf['enable_plugins']=true; // Web services are allowed (true) or completely forbidden (false) $conf['allow_web_services'] = true; -// enable log for web services -$conf['ws_enable_log'] = false; - -// web services log file path -$conf['ws_log_filepath'] = '/tmp/piwigo_ws.log'; - // Maximum number of images to be returned foreach call to the web service $conf['ws_max_images_per_page'] = 500; @@ -804,8 +811,39 @@ $conf['tiff_representative_ext'] = 'png'; // (TIFF, videos, PDF) $conf['upload_form_all_types'] = false; +// Size of chunks, in kilobytes. Fast connections will have better +// performances with high values, such as 5000. +$conf['upload_form_chunk_size'] = 500; + // If we try to generate a pwg_representative for a video we use ffmpeg. If // "ffmpeg" is not visible by the web user, you can define the full path of // the directory where "ffmpeg" executable is. $conf['ffmpeg_dir'] = ''; + +// +-----------------------------------------------------------------------+ +// | log | +// +-----------------------------------------------------------------------+ +// Logs directory, relative to $conf['data_location'] +$conf['log_dir'] = '/logs'; + +// Log level (OFF, CRITICAL, ERROR, WARNING, NOTICE, INFO, DEBUG) +// development = DEBUG, production = ERROR +$conf['log_level'] = 'ERROR'; + +// Keep logs file during X days +$conf['log_archive_days'] = 30; + +// +-----------------------------------------------------------------------+ +// | Proxy Settings | +// +-----------------------------------------------------------------------+ + +// If piwigo needs a http-proxy to connect to the internet, set this to true +$conf['use_proxy'] = false; + +// Connection string of the proxy +$conf['proxy_server'] = 'proxy.domain.org:port'; + +// If the http-proxy requires authentication, set username and password here +// e.g. username:password +$conf['proxy_auth'] = ''; ?> diff --git a/sources/include/constants.php b/sources/include/constants.php index 70d13d1..22bb967 100644 --- a/sources/include/constants.php +++ b/sources/include/constants.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -22,7 +22,7 @@ // +-----------------------------------------------------------------------+ // Default settings -define('PHPWG_VERSION', '2.7.4'); +define('PHPWG_VERSION', '2.8.2'); define('PHPWG_DEFAULT_LANGUAGE', 'en_UK'); define('PHPWG_DEFAULT_TEMPLATE', 'elegant'); @@ -81,6 +81,8 @@ if (!defined('USER_FEED_TABLE')) define('USER_FEED_TABLE', $prefixeTable.'user_feed'); if (!defined('RATE_TABLE')) define('RATE_TABLE', $prefixeTable.'rate'); +if (!defined('USER_AUTH_KEYS_TABLE')) + define('USER_AUTH_KEYS_TABLE', $prefixeTable.'user_auth_keys'); if (!defined('USER_CACHE_TABLE')) define('USER_CACHE_TABLE', $prefixeTable.'user_cache'); if (!defined('USER_CACHE_CATEGORIES_TABLE')) @@ -105,5 +107,7 @@ if (!defined('THEMES_TABLE')) define('THEMES_TABLE', $prefixeTable.'themes'); if (!defined('LANGUAGES_TABLE')) define('LANGUAGES_TABLE', $prefixeTable.'languages'); +if (!defined('IMAGE_FORMAT_TABLE')) + define('IMAGE_FORMAT_TABLE', $prefixeTable.'image_format'); ?> diff --git a/sources/include/dblayer/functions_mysql.inc.php b/sources/include/dblayer/functions_mysql.inc.php index a1853b2..6a17368 100644 --- a/sources/include/dblayer/functions_mysql.inc.php +++ b/sources/include/dblayer/functions_mysql.inc.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -53,7 +53,7 @@ function pwg_db_check_charset() { $db_charset = DB_CHARSET; } - pwg_query('SET NAMES "'.$db_charset.'"'); + mysql_set_charset($db_charset); } function pwg_db_check_version() diff --git a/sources/include/dblayer/functions_mysqli.inc.php b/sources/include/dblayer/functions_mysqli.inc.php index 390cf2e..5b40cfe 100644 --- a/sources/include/dblayer/functions_mysqli.inc.php +++ b/sources/include/dblayer/functions_mysqli.inc.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -80,12 +80,14 @@ function pwg_db_connect($host, $user, $password, $database) */ function pwg_db_check_charset() { + global $mysqli; + $db_charset = 'utf8'; if (defined('DB_CHARSET') and DB_CHARSET != '') { $db_charset = DB_CHARSET; } - pwg_query('SET NAMES "'.$db_charset.'"'); + $mysqli->set_charset($db_charset); } /** @@ -901,4 +903,4 @@ function query2array($query, $key_name=null, $value_name=null) return $data; } -?> \ No newline at end of file +?> diff --git a/sources/include/derivative.inc.php b/sources/include/derivative.inc.php index a6e0642..8b65e8a 100644 --- a/sources/include/derivative.inc.php +++ b/sources/include/derivative.inc.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // +-----------------------------------------------------------------------+ // | This program is free software; you can redistribute it and/or modify | // | it under the terms of the GNU General Public License as published by | diff --git a/sources/include/derivative_params.inc.php b/sources/include/derivative_params.inc.php index cb1f22e..2fcd404 100644 --- a/sources/include/derivative_params.inc.php +++ b/sources/include/derivative_params.inc.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // +-----------------------------------------------------------------------+ // | This program is free software; you can redistribute it and/or modify | // | it under the terms of the GNU General Public License as published by | diff --git a/sources/include/derivative_std_params.inc.php b/sources/include/derivative_std_params.inc.php index 375eb18..9fed9c1 100644 --- a/sources/include/derivative_std_params.inc.php +++ b/sources/include/derivative_std_params.inc.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // +-----------------------------------------------------------------------+ // | This program is free software; you can redistribute it and/or modify | // | it under the terms of the GNU General Public License as published by | @@ -52,6 +52,8 @@ final class WatermarkParams /** @var int */ public $xrepeat = 0; /** @var int */ + public $yrepeat = 0; + /** @var int */ public $opacity = 100; } @@ -201,8 +203,6 @@ final class ImageStdParams */ static function save() { - global $conf; - $ser = serialize( array( 'd' => self::$type_map, 'q' => self::$quality, diff --git a/sources/include/filter.inc.php b/sources/include/filter.inc.php index 05665a0..2d05238 100644 --- a/sources/include/filter.inc.php +++ b/sources/include/filter.inc.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/include/functions.inc.php b/sources/include/functions.inc.php index 4ba5eb5..0187478 100644 --- a/sources/include/functions.inc.php +++ b/sources/include/functions.inc.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -36,8 +36,6 @@ include_once( PHPWG_ROOT_PATH .'include/functions_url.inc.php' ); include_once( PHPWG_ROOT_PATH .'include/derivative_params.inc.php'); include_once( PHPWG_ROOT_PATH .'include/derivative_std_params.inc.php'); include_once( PHPWG_ROOT_PATH .'include/derivative.inc.php'); -include_once( PHPWG_ROOT_PATH .'include/template.class.php'); -include_once( PHPWG_ROOT_PATH .'include/cache.class.php'); /** @@ -409,7 +407,7 @@ SELECT id, name * @param string $image_type * @return bool */ -function pwg_log($image_id = null, $image_type = null) +function pwg_log($image_id = null, $image_type = null, $format_id = null) { global $conf, $user, $page; @@ -436,6 +434,17 @@ function pwg_log($image_id = null, $image_type = null) $tags_string = implode(',', $page['tag_ids']); } + $ip = $_SERVER['REMOTE_ADDR']; + // In case of "too long" ipv6 address, we take only the 15 first chars. + // + // It would be "cleaner" to increase length of history.IP to 50 chars, but + // the alter table is very long on such a big table. We should plan this + // for a future version, once history table is kept "smaller". + if (strpos($ip,':') !== false and strlen($ip) > 15) + { + $ip = substr($ip, 0, 15); + } + $query = ' INSERT INTO '.HISTORY_TABLE.' ( @@ -447,6 +456,8 @@ INSERT INTO '.HISTORY_TABLE.' category_id, image_id, image_type, + format_id, + auth_key_id, tag_ids ) VALUES @@ -454,11 +465,13 @@ INSERT INTO '.HISTORY_TABLE.' CURRENT_DATE, CURRENT_TIME, '.$user['id'].', - \''.$_SERVER['REMOTE_ADDR'].'\', + \''.$ip.'\', '.(isset($page['section']) ? "'".$page['section']."'" : 'NULL').', '.(isset($page['category']['id']) ? $page['category']['id'] : 'NULL').', '.(isset($image_id) ? $image_id : 'NULL').', '.(isset($image_type) ? "'".$image_type."'" : 'NULL').', + '.(isset($format_id) ? $format_id : 'NULL').', + '.(isset($page['auth_key_id']) ? $page['auth_key_id'] : 'NULL').', '.(isset($tags_string) ? "'".$tags_string."'" : 'NULL').' ) ;'; @@ -954,6 +967,21 @@ function original_to_representative($path, $representative_ext) return substr_replace($path, $representative_ext, $pos+1); } +/** + * Transforms an original path to its format + * + * @param string $path + * @param string $format_ext + * @return string + */ +function original_to_format($path, $format_ext) +{ + $pos = strrpos($path, '/'); + $path = substr_replace($path, 'pwg_format/', $pos+1, 0); + $pos = strrpos($path, '.'); + return substr_replace($path, $format_ext, $pos+1); +} + /** * get the full path of an image * @@ -1142,9 +1170,7 @@ function l10n_args($key_args, $sep = "\n") */ function get_themeconf($key) { - global $template; - - return $template->get_themeconf($key); + return $GLOBALS['template']->get_themeconf($key); } /** @@ -1279,6 +1305,27 @@ DELETE FROM '.CONFIG_TABLE.' } } +/** + * Return a default value for a configuration parameter. + * @since 2.8 + * + * @param string $param the configuration value to be extracted (if it exists) + * @param mixed $default_value the default value for the configuration value if it does not exist. + * + * @return mixed The configuration value if the variable exists, otherwise the default. + */ +function conf_get_param($param, $default_value=null) +{ + global $conf; + + if (isset($conf[$param])) + { + return $conf[$param]; + } + return $default_value; +} + + /** * Apply *unserialize* on a value only if it is a string * @since 2.7 @@ -1633,7 +1680,7 @@ function convert_charset($str, $source_charset, $dest_charset) } if (function_exists('iconv')) { - return iconv($source_charset, $dest_charset, $str); + return iconv($source_charset, $dest_charset.'//TRANSLIT', $str); } if (function_exists('mb_convert_encoding')) { @@ -2094,4 +2141,4 @@ function safe_version_compare($a, $b, $op=null) } } -?> \ No newline at end of file +?> diff --git a/sources/include/functions_calendar.inc.php b/sources/include/functions_calendar.inc.php index 850ccdc..829d6d1 100644 --- a/sources/include/functions_calendar.inc.php +++ b/sources/include/functions_calendar.inc.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/include/functions_category.inc.php b/sources/include/functions_category.inc.php index 826ff92..76c9fba 100644 --- a/sources/include/functions_category.inc.php +++ b/sources/include/functions_category.inc.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -335,7 +335,7 @@ SELECT DISTINCT(id) } $query.= ' ;'; - return array_from_query($query, 'id'); + return query2array($query, null, 'id'); } /** @@ -491,6 +491,7 @@ SELECT image_id function get_computed_categories(&$userdata, $filter_days=null) { $query = 'SELECT c.id AS cat_id, id_uppercat'; + $query.= ', global_rank'; // Count by date_available to avoid count null $query .= ', MAX(date_available) AS date_last, COUNT(date_available) AS nb_images @@ -533,6 +534,11 @@ FROM '.CATEGORIES_TABLE.' as c $cats[$row['cat_id']] = $row; } + // it is important to logically sort the albums because some operations + // (like removal) rely on this logical order. Child album doesn't always + // have a bigger id than its parent (if it was moved afterwards). + uasort($cats, 'global_rank_compare'); + foreach ($cats as $cat) { if ( !isset( $cat['id_uppercat'] ) ) @@ -541,7 +547,7 @@ FROM '.CATEGORIES_TABLE.' as c // Piwigo before 2.5.3 may have generated inconsistent permissions, ie // private album A1/A2 permitted to user U1 but private album A1 not // permitted to U1. - // + // // TODO 2.7: add an upgrade script to repair permissions and remove this // test if ( !isset($cats[ $cat['id_uppercat'] ])) diff --git a/sources/include/functions_comment.inc.php b/sources/include/functions_comment.inc.php index 2dcc4fc..0e6a571 100644 --- a/sources/include/functions_comment.inc.php +++ b/sources/include/functions_comment.inc.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/include/functions_cookie.inc.php b/sources/include/functions_cookie.inc.php index 4e547e1..2c61eec 100644 --- a/sources/include/functions_cookie.inc.php +++ b/sources/include/functions_cookie.inc.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/include/functions_filter.inc.php b/sources/include/functions_filter.inc.php index 47d0ffd..ded932e 100644 --- a/sources/include/functions_filter.inc.php +++ b/sources/include/functions_filter.inc.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/include/functions_html.inc.php b/sources/include/functions_html.inc.php index 8668e68..5af5c18 100644 --- a/sources/include/functions_html.inc.php +++ b/sources/include/functions_html.inc.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -103,10 +103,17 @@ function get_cat_display_name($cat_informations, $url='') function get_cat_display_name_cache($uppercats, $url = '', $single_link = false, - $link_class = null) + $link_class = null, + $auth_key=null) { global $cache, $conf; + $add_url_params = array(); + if (isset($auth_key)) + { + $add_url_params['auth'] = $auth_key; + } + if (!isset($cache['cat_names'])) { $query = ' @@ -119,7 +126,7 @@ SELECT id, name, permalink $output = ''; if ($single_link) { - $single_url = get_root_url().$url.array_pop(explode(',', $uppercats)); + $single_url = add_url_params(get_root_url().$url.array_pop(explode(',', $uppercats)), $add_url_params); $output.= ' $cat, ) + ), + $add_url_params ) .'">'.$cat['name'].''; } @@ -263,15 +273,16 @@ function tag_alpha_compare($a, $b) */ function access_denied() { - global $user; + global $user, $conf; $login_url = get_root_url().'identification.php?redirect=' .urlencode(urlencode($_SERVER['REQUEST_URI'])); - set_status_header(401); if ( isset($user) and !is_a_guest() ) { + set_status_header(401); + echo ''; echo '
'.l10n('You are not authorized to access the requested page').'
'; echo ''.l10n('Identification').' '; @@ -279,6 +290,10 @@ function access_denied() echo str_repeat( ' ', 512); //IE6 doesn't error output if below a size exit(); } + elseif (!$conf['guest_access'] and is_a_guest()) + { + redirect_http($login_url); + } else { redirect_html($login_url); @@ -638,4 +653,4 @@ function flush_page_messages() } } -?> \ No newline at end of file +?> diff --git a/sources/include/functions_mail.inc.php b/sources/include/functions_mail.inc.php index ed10817..9032d83 100644 --- a/sources/include/functions_mail.inc.php +++ b/sources/include/functions_mail.inc.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -514,6 +514,8 @@ SELECT DISTINCT language // get subset of users in this group for a specific language $query = ' SELECT + ui.user_id, + ui.status, u.'.$conf['user_fields']['username'].' AS name, u.'.$conf['user_fields']['email'].' AS email FROM '.USER_GROUP_TABLE.' AS ug @@ -534,13 +536,33 @@ SELECT switch_lang_to($language); - $return&= pwg_mail(null, - array_merge( - $args, - array('Bcc' => $users) - ), - $tpl - ); + foreach ($users as $u) + { + $authkey = create_user_auth_key($u['user_id'], $u['status']); + + $user_tpl = $tpl; + + if ($authkey !== false) + { + $user_tpl['assign']['LINK'] = add_url_params($tpl['assign']['LINK'], array('auth' => $authkey['auth_key'])); + + if (isset($user_tpl['assign']['IMG']['link'])) + { + $user_tpl['assign']['IMG']['link'] = add_url_params( + $user_tpl['assign']['IMG']['link'], + array('auth' => $authkey['auth_key']) + ); + } + } + + $user_args = $args; + if ($authkey !== false) + { + $user_args['auth_key'] = $authkey['auth_key']; + } + + $return &= pwg_mail($u['email'], $user_args, $user_tpl); + } switch_lang_back(); } @@ -563,6 +585,7 @@ SELECT * o theme: theme to use [default value $conf_mail['mail_theme']] * o mail_title: main title of the mail [default value $conf['gallery_title']] * o mail_subtitle: subtitle of the mail [default value subject] + * o auth_key: authentication key to add on footer link [default value null] * @param array $tpl - use these options to define a custom content template file * o filename * o dirname (optional) @@ -695,6 +718,10 @@ function pwg_mail($to, $args=array(), $tpl=array()) { // key compose of indexes witch allow to cache mail data $cache_key = $content_type.'-'.$lang_info['code']; + if (!empty($args['auth_key'])) + { + $cache_key.= '-'.$args['auth_key']; + } if (!isset($conf_mail[$cache_key])) { @@ -709,9 +736,15 @@ function pwg_mail($to, $args=array(), $tpl=array()) $template->set_filename('mail_header', 'header.tpl'); $template->set_filename('mail_footer', 'footer.tpl'); + $add_url_params = array(); + if (!empty($args['auth_key'])) + { + $add_url_params['auth'] = $args['auth_key']; + } + $template->assign( array( - 'GALLERY_URL' => get_gallery_home_url(), + 'GALLERY_URL' => add_url_params(get_gallery_home_url(), $add_url_params), 'GALLERY_TITLE' => isset($page['gallery_title']) ? $page['gallery_title'] : $conf['gallery_title'], 'VERSION' => $conf['show_version'] ? PHPWG_VERSION : '', 'PHPWG_URL' => defined('PHPWG_URL') ? PHPWG_URL : '', diff --git a/sources/include/functions_metadata.inc.php b/sources/include/functions_metadata.inc.php index ab3d6a7..3d35900 100644 --- a/sources/include/functions_metadata.inc.php +++ b/sources/include/functions_metadata.inc.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/include/functions_notification.inc.php b/sources/include/functions_notification.inc.php index bc4d1a3..6e063d1 100644 --- a/sources/include/functions_notification.inc.php +++ b/sources/include/functions_notification.inc.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -395,27 +395,45 @@ function add_news_line(&$news, $count, $singular_key, $plural_key, $url='', $add * @param bool $add_url add html link around news * @return array */ -function news($start=null, $end=null, $exclude_img_cats=false, $add_url=false) +function news($start=null, $end=null, $exclude_img_cats=false, $add_url=false, $auth_key=null) { $news = array(); - if (!$exclude_img_cats) + $add_url_params = array(); + if (isset($auth_key)) { - add_news_line( $news, - nb_new_elements($start, $end), '%d new photo', '%d new photos', - make_index_url(array('section'=>'recent_pics')), $add_url ); + $add_url_params['auth'] = $auth_key; } if (!$exclude_img_cats) { - add_news_line( $news, - nb_updated_categories($start, $end), '%d album updated', '%d albums updated', - make_index_url(array('section'=>'recent_cats')), $add_url ); + add_news_line( + $news, + nb_new_elements($start, $end), + '%d new photo', + '%d new photos', + add_url_params(make_index_url(array('section'=>'recent_pics')), $add_url_params), + $add_url + ); + + add_news_line( + $news, + nb_updated_categories($start, $end), + '%d album updated', + '%d albums updated', + add_url_params(make_index_url(array('section'=>'recent_cats')), $add_url_params), + $add_url + ); } - add_news_line( $news, - nb_new_comments($start, $end), '%d new comment', '%d new comments', - get_root_url().'comments.php', $add_url ); + add_news_line( + $news, + nb_new_comments($start, $end), + '%d new comment', + '%d new comments', + add_url_params(get_root_url().'comments.php', $add_url_params), + $add_url + ); if (is_admin()) { @@ -527,17 +545,23 @@ function get_recent_post_dates_array($args) * @param array $date_detail returned value of get_recent_post_dates() * @return string */ -function get_html_description_recent_post_date($date_detail) +function get_html_description_recent_post_date($date_detail, $auth_key=null) { global $conf; + $add_url_params = array(); + if (isset($auth_key)) + { + $add_url_params['auth'] = $auth_key; + } + $description = '
    '; $description .= '
  • ' .l10n_dec('%d new photo', '%d new photos', $date_detail['nb_elements']) .' (' - .'' + .'' .l10n('Recent photos').'' .')' .'

    • '; @@ -546,11 +570,16 @@ function get_html_description_recent_post_date($date_detail) { $tn_src = DerivativeImage::thumb_url($element); $description .= ''; + add_url_params( + make_picture_url( + array( + 'image_id' => $element['id'], + 'image_file' => $element['file'], + ) + ), + $add_url_params + ) + .'">'; } $description .= '...
    '; @@ -564,7 +593,7 @@ function get_html_description_recent_post_date($date_detail) { $description .= '
  • ' - .get_cat_display_name_cache($cat['uppercats']) + .get_cat_display_name_cache($cat['uppercats'],'', false, null, $auth_key) .' ('. l10n_dec('%d new photo', '%d new photos', $cat['img_count']).')' .'
    • '; diff --git a/sources/include/functions_picture.inc.php b/sources/include/functions_picture.inc.php index ae3f944..9e923b0 100644 --- a/sources/include/functions_picture.inc.php +++ b/sources/include/functions_picture.inc.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/include/functions_plugins.inc.php b/sources/include/functions_plugins.inc.php index 8700a59..429167b 100644 --- a/sources/include/functions_plugins.inc.php +++ b/sources/include/functions_plugins.inc.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/include/functions_rate.inc.php b/sources/include/functions_rate.inc.php index 45d3e9e..3b27f5c 100644 --- a/sources/include/functions_rate.inc.php +++ b/sources/include/functions_rate.inc.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/include/functions_search.inc.php b/sources/include/functions_search.inc.php index 688a043..d8df4ee 100644 --- a/sources/include/functions_search.inc.php +++ b/sources/include/functions_search.inc.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -90,7 +90,7 @@ function get_sql_search_clause($search) } } - if (isset($search['fields']['allwords'])) + if (isset($search['fields']['allwords']) and count($search['fields']['allwords']['fields']) > 0) { $fields = array('file', 'name', 'comment'); @@ -98,7 +98,7 @@ function get_sql_search_clause($search) { $fields = array_intersect($fields, $search['fields']['allwords']['fields']); } - + // in the OR mode, request bust be : // ((field1 LIKE '%word1%' OR field2 LIKE '%word1%') // OR (field1 LIKE '%word2%' OR field2 LIKE '%word2%')) @@ -199,7 +199,10 @@ function get_sql_search_clause($search) */ function get_regular_search_results($search, $images_where='') { - global $conf; + global $conf, $logger; + + $logger->debug(__FUNCTION__, 'search', $search); + $forbidden = get_sql_condition_FandF( array ( @@ -213,12 +216,35 @@ function get_regular_search_results($search, $images_where='') $items = array(); $tag_items = array(); + if (isset($search['fields']['search_in_tags'])) + { + $word_clauses = array(); + foreach ($search['fields']['allwords']['words'] as $word) + { + $word_clauses[] = "name LIKE '%".$word."%'"; + } + + $query = ' +SELECT + id + FROM '.TAGS_TABLE.' + WHERE '.implode(' OR ', $word_clauses).' +;'; + $tag_ids = query2array($query, null, 'id'); + + $search_in_tags_items = get_image_ids_for_tags($tag_ids, 'OR'); + + $logger->debug(__FUNCTION__.' '.count($search_in_tags_items).' items in $search_in_tags_items'); + } + if (isset($search['fields']['tags'])) { $tag_items = get_image_ids_for_tags( $search['fields']['tags']['words'], $search['fields']['tags']['mode'] ); + + $logger->debug(__FUNCTION__.' '.count($tag_items).' items in $tag_items'); } $search_clause = get_sql_search_clause($search); @@ -237,6 +263,18 @@ SELECT DISTINCT(id) $query .= $forbidden.' '.$conf['order_by']; $items = array_from_query($query, 'id'); + + $logger->debug(__FUNCTION__.' '.count($items).' items in $items'); + } + + if (isset($search_in_tags_items)) + { + $items = array_unique( + array_merge( + $items, + $search_in_tags_items + ) + ); } if ( !empty($tag_items) ) @@ -244,7 +282,7 @@ SELECT DISTINCT(id) switch ($search['mode']) { case 'AND': - if (empty($search_clause)) + if (empty($search_clause) and !isset($search_in_tags_items)) { $items = $tag_items; } @@ -254,7 +292,6 @@ SELECT DISTINCT(id) } break; case 'OR': - $before_count = count($items); $items = array_unique( array_merge( $items, @@ -938,6 +975,14 @@ function qsearch_get_images(QExpression $expr, QResults $qsr) case 'file': $clauses[] = $file_like; break; + case 'author': + if ( strlen($token->term) ) + $clauses = array_merge($clauses, qsearch_get_text_token_search_sql($token, array('author'))); + elseif ($token->modifier & QST_WILDCARD) + $clauses[] = 'author IS NOT NULL'; + else + $clauses[] = 'author IS NULL'; + break; case 'width': case 'height': $clauses[] = $token->scope->get_sql($scope_id, $token); @@ -1178,6 +1223,7 @@ function get_quick_search_results_no_cache($q, $options) $scopes[] = new QSearchScope('tag', array('tags')); $scopes[] = new QSearchScope('photo', array('photos')); $scopes[] = new QSearchScope('file', array('filename')); + $scopes[] = new QSearchScope('author', array(), true); $scopes[] = new QNumericRangeScope('width', array()); $scopes[] = new QNumericRangeScope('height', array()); $scopes[] = new QNumericRangeScope('ratio', array(), false, 0.001); diff --git a/sources/include/functions_session.inc.php b/sources/include/functions_session.inc.php index aaa07fd..e75f22e 100644 --- a/sources/include/functions_session.inc.php +++ b/sources/include/functions_session.inc.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -62,32 +62,27 @@ if (isset($conf['session_save_handler']) */ function generate_key($size) { - if ( - is_callable('openssl_random_pseudo_bytes') - and !(version_compare(PHP_VERSION, '5.3.4') < 0 and defined('PHP_WINDOWS_VERSION_MAJOR')) - ) + include_once(PHPWG_ROOT_PATH.'include/random_compat/random.php'); + + try { - return substr( - str_replace( - array('+', '/'), - '', - base64_encode(openssl_random_pseudo_bytes($size)) - ), - 0, - $size - ); + $bytes = random_bytes($size+10); } - else + catch (Exception $ex) { - $alphabet = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'; - $l = strlen($alphabet)-1; - $key = ''; - for ($i=0; $i<$size; $i++) - { - $key.= $alphabet[mt_rand(0, $l)]; - } - return $key; + include_once(PHPWG_ROOT_PATH.'include/srand.php'); + $bytes = secure_random_bytes($size+10); } + + return substr( + str_replace( + array('+', '/'), + '', + base64_encode($bytes) + ), + 0, + $size + ); } /** @@ -260,4 +255,20 @@ function pwg_unset_session_var($var) return true; } -?> \ No newline at end of file +/** + * delete all sessions for a given user (certainly deleted) + * + * @since 2.8 + * @param int $user_id + * @return null + */ +function delete_user_sessions($user_id) +{ + $query = ' +DELETE + FROM '.SESSIONS_TABLE.' + WHERE data LIKE \'%pwg_uid|i:'.(int)$user_id.';%\' +;'; + pwg_query($query); +} +?> diff --git a/sources/include/functions_tag.inc.php b/sources/include/functions_tag.inc.php index 9047449..752a2be 100644 --- a/sources/include/functions_tag.inc.php +++ b/sources/include/functions_tag.inc.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/include/functions_url.inc.php b/sources/include/functions_url.inc.php index 5a471bc..ea329b4 100644 --- a/sources/include/functions_url.inc.php +++ b/sources/include/functions_url.inc.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -62,14 +62,21 @@ function get_absolute_root_url($with_scheme=true) { $url .= 'http://'; } - $url .= $_SERVER['HTTP_HOST']; - if ( (!$is_https && $_SERVER['SERVER_PORT'] != 80) - ||($is_https && $_SERVER['SERVER_PORT'] != 443)) + if (isset($_SERVER['HTTP_X_FORWARDED_HOST'])) { - $url_port = ':'.$_SERVER['SERVER_PORT']; - if (strrchr($url, ':') != $url_port) + $url .= $_SERVER['HTTP_X_FORWARDED_HOST']; + } + else + { + $url .= $_SERVER['HTTP_HOST']; + if ( (!$is_https && $_SERVER['SERVER_PORT'] != 80) + ||($is_https && $_SERVER['SERVER_PORT'] != 443)) { - $url .= $url_port; + $url_port = ':'.$_SERVER['SERVER_PORT']; + if (strrchr($url, ':') != $url_port) + { + $url .= $url_port; + } } } } @@ -372,7 +379,7 @@ function make_section_in_url($params) $section_string.= '/'.$tag['id']; break; case 'tag': - if (isset($tag['url_name']) and !is_numeric($tag['url_name']) ) + if (isset($tag['url_name'])) { $section_string.= '/'.$tag['url_name']; break; @@ -817,4 +824,4 @@ function url_is_remote($url) return false; } -?> \ No newline at end of file +?> diff --git a/sources/include/functions_user.inc.php b/sources/include/functions_user.inc.php index 91bac83..de8f87c 100644 --- a/sources/include/functions_user.inc.php +++ b/sources/include/functions_user.inc.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -219,14 +219,12 @@ SELECT id mass_inserts(USER_GROUP_TABLE, array('user_id', 'group_id'), $inserts); } - $override = null; - if ($notify_admin and $conf['browser_language']) + $override = array(); + if ($language = get_browser_language()) { - if (!get_browser_language($override['language'])) - { - $override=null; - } + $override['language'] = $language; } + create_user_infos($user_id, $override); if ($notify_admin and $conf['email_admin_on_new_user']) @@ -809,18 +807,16 @@ function get_default_language() * Tries to find the browser language among available languages. * @todo : try to match 'fr_CA' before 'fr' * - * @param string &$lang - * @return bool + * @return string */ -function get_browser_language(&$lang) +function get_browser_language() { $browser_language = substr(@$_SERVER["HTTP_ACCEPT_LANGUAGE"], 0, 2); foreach (get_languages() as $language_code => $language_name) { if (substr($language_code, 0, 2) == $browser_language) { - $lang = $language_code; - return true; + return $language_code; } } return false; @@ -952,7 +948,10 @@ function log_user($user_id, $remember_me) if ( session_id()!="" ) { // we regenerate the session for security reasons // see http://www.acros.si/papers/session_fixation.pdf - session_regenerate_id(true); + if (version_compare(PHP_VERSION, '7') <= 0) + { + session_regenerate_id(true); + } } else { @@ -1120,7 +1119,7 @@ SELECT '.$conf['user_fields']['id'].' AS id, WHERE '.$conf['user_fields']['username'].' = \''.pwg_db_real_escape_string($username).'\' ;'; $row = pwg_db_fetch_assoc(pwg_query($query)); - if ($conf['password_verify']($password, $row['password'], $row['id'])) + if (isset($row['id']) and $conf['password_verify']($password, $row['password'], $row['id'])) { log_user($row['id'], $remember_me); trigger_notify('login_success', stripslashes($username)); @@ -1466,4 +1465,153 @@ function get_recent_photos_sql($db_field) .pwg_db_get_recent_period_expression($user['recent_period']) .','.pwg_db_get_recent_period_expression(1,$user['last_photo_date']).')'; } -?> \ No newline at end of file + +/** + * Performs auto-connection if authentication key is valid. + * + * @since 2.8 + * + * @return bool + */ +function auth_key_login($auth_key) +{ + global $conf, $user, $page; + + if (!preg_match('/^[a-z0-9]{30}$/i', $auth_key)) + { + return false; + } + + $query = ' +SELECT + *, + '.$conf['user_fields']['username'].' AS username, + NOW() AS dbnow + FROM '.USER_AUTH_KEYS_TABLE.' AS uak + JOIN '.USER_INFOS_TABLE.' AS ui ON uak.user_id = ui.user_id + JOIN '.USERS_TABLE.' AS u ON u.'.$conf['user_fields']['id'].' = ui.user_id + WHERE auth_key = \''.$auth_key.'\' +;'; + $keys = query2array($query); + + if (count($keys) == 0) + { + return false; + } + + $key = $keys[0]; + + // is the key still valid? + if (strtotime($key['expired_on']) < strtotime($key['dbnow'])) + { + $page['auth_key_invalid'] = true; + return false; + } + + // admin/webmaster/guest can't get connected with authentication keys + if (!in_array($key['status'], array('normal','generic'))) + { + return false; + } + + $user['id'] = $key['user_id']; + log_user($user['id'], false); + trigger_notify('login_success', $key['username']); + + // to be registered in history table by pwg_log function + $page['auth_key_id'] = $key['auth_key_id']; + + return true; +} + +/** + * Creates an authentication key. + * + * @since 2.8 + * @param int $user_id + * @return array + */ +function create_user_auth_key($user_id, $user_status=null) +{ + global $conf; + + if (0 == $conf['auth_key_duration']) + { + return false; + } + + if (!isset($user_status)) + { + // we have to find the user status + $query = ' +SELECT + status + FROM '.USER_INFOS_TABLE.' + WHERE user_id = '.$user_id.' +;'; + $user_infos = query2array($query); + + if (count($user_infos) == 0) + { + return false; + } + + $user_status = $user_infos[0]['status']; + } + + if (!in_array($user_status, array('normal','generic'))) + { + return false; + } + + $candidate = generate_key(30); + + $query = ' +SELECT + COUNT(*), + NOW(), + ADDDATE(NOW(), INTERVAL '.$conf['auth_key_duration'].' SECOND) + FROM '.USER_AUTH_KEYS_TABLE.' + WHERE auth_key = \''.$candidate.'\' +;'; + list($counter, $now, $expiration) = pwg_db_fetch_row(pwg_query($query)); + if (0 == $counter) + { + $key = array( + 'auth_key' => $candidate, + 'user_id' => $user_id, + 'created_on' => $now, + 'duration' => $conf['auth_key_duration'], + 'expired_on' => $expiration, + ); + + single_insert(USER_AUTH_KEYS_TABLE, $key); + + $key['auth_key_id'] = pwg_db_insert_id(); + + return $key; + } + else + { + return create_user_auth_key($user_id, $user_status); + } +} + +/** + * Deactivates authentication keys + * + * @since 2.8 + * @param int $user_id + * @return null + */ +function deactivate_user_auth_keys($user_id) +{ + $query = ' +UPDATE '.USER_AUTH_KEYS_TABLE.' + SET expired_on = NOW() + WHERE user_id = '.$user_id.' + AND expired_on > NOW() +;'; + pwg_query($query); +} +?> diff --git a/sources/include/index.php b/sources/include/index.php index c8de97f..0b96c3e 100644 --- a/sources/include/index.php +++ b/sources/include/index.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/include/inflectors/en.php b/sources/include/inflectors/en.php index 6357144..ae8e937 100644 --- a/sources/include/inflectors/en.php +++ b/sources/include/inflectors/en.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/include/inflectors/fr.php b/sources/include/inflectors/fr.php index f634d2a..28edbce 100644 --- a/sources/include/inflectors/fr.php +++ b/sources/include/inflectors/fr.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/include/menubar.inc.php b/sources/include/menubar.inc.php index 3d39cd8..9fe2cea 100644 --- a/sources/include/menubar.inc.php +++ b/sources/include/menubar.inc.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/include/no_photo_yet.inc.php b/sources/include/no_photo_yet.inc.php index 61daf35..15d12dc 100644 --- a/sources/include/no_photo_yet.inc.php +++ b/sources/include/no_photo_yet.inc.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/include/page_header.php b/sources/include/page_header.php index 6710f20..8a62fc4 100644 --- a/sources/include/page_header.php +++ b/sources/include/page_header.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/include/page_tail.php b/sources/include/page_tail.php index f47dc2d..82420ff 100644 --- a/sources/include/page_tail.php +++ b/sources/include/page_tail.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/include/passwordhash.class.php b/sources/include/passwordhash.class.php index 84447b2..8b8b113 100644 --- a/sources/include/passwordhash.class.php +++ b/sources/include/passwordhash.class.php @@ -1,18 +1,18 @@ in 2004-2006 and placed in # the public domain. Revised in subsequent years, still public domain. # # There's absolutely no warranty. # -# The homepage URL for this framework is: -# -# http://www.openwall.com/phpass/ -# # Please be sure to update the Version line if you edit this file in any way. # It is suggested that you leave the main version number intact, but indicate # your project name (after the slash) and add your own revision information. @@ -24,13 +24,25 @@ # Obviously, since this code is in the public domain, the above are not # requirements (there can be none), but merely suggestions. # + +/** + * Portable PHP password hashing framework. + * + * @package phpass + * @version 0.3 / WordPress + * @link http://www.openwall.com/phpass/ + * @since 2.5.0 + */ class PasswordHash { var $itoa64; var $iteration_count_log2; var $portable_hashes; var $random_state; - function PasswordHash($iteration_count_log2, $portable_hashes) + /** + * PHP5 constructor. + */ + function __construct( $iteration_count_log2, $portable_hashes ) { $this->itoa64 = './0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'; @@ -40,15 +52,20 @@ class PasswordHash { $this->portable_hashes = $portable_hashes; - $this->random_state = microtime(); - if (function_exists('getmypid')) - $this->random_state .= getmypid(); + $this->random_state = microtime() . uniqid(rand(), TRUE); // removed getmypid() for compatibility reasons + } + + /** + * PHP4 constructor. + */ + public function PasswordHash( $iteration_count_log2, $portable_hashes ) { + self::__construct( $iteration_count_log2, $portable_hashes ); } function get_random_bytes($count) { $output = ''; - if (@is_readable('/dev/urandom') && + if ( @is_readable('/dev/urandom') && ($fh = @fopen('/dev/urandom', 'rb'))) { $output = fread($fh, $count); fclose($fh); @@ -207,6 +224,10 @@ class PasswordHash { function HashPassword($password) { + if ( strlen( $password ) > 4096 ) { + return '*'; + } + $random = ''; if (CRYPT_BLOWFISH == 1 && !$this->portable_hashes) { @@ -242,12 +263,14 @@ class PasswordHash { function CheckPassword($password, $stored_hash) { + if ( strlen( $password ) > 4096 ) { + return false; + } + $hash = $this->crypt_private($password, $stored_hash); if ($hash[0] == '*') $hash = crypt($password, $stored_hash); - return $hash == $stored_hash; + return $hash === $stored_hash; } -} - -?> +} \ No newline at end of file diff --git a/sources/include/php_compat/index.php b/sources/include/php_compat/index.php index c8de97f..0b96c3e 100644 --- a/sources/include/php_compat/index.php +++ b/sources/include/php_compat/index.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/include/picture_comment.inc.php b/sources/include/picture_comment.inc.php index fd9a7b7..20a72e5 100644 --- a/sources/include/picture_comment.inc.php +++ b/sources/include/picture_comment.inc.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/include/picture_metadata.inc.php b/sources/include/picture_metadata.inc.php index 0df50df..f43fa5a 100644 --- a/sources/include/picture_metadata.inc.php +++ b/sources/include/picture_metadata.inc.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/include/picture_rate.inc.php b/sources/include/picture_rate.inc.php index c3119bd..9c024ec 100644 --- a/sources/include/picture_rate.inc.php +++ b/sources/include/picture_rate.inc.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/include/random_compat/byte_safe_strings.php b/sources/include/random_compat/byte_safe_strings.php new file mode 100644 index 0000000..dec5d30 --- /dev/null +++ b/sources/include/random_compat/byte_safe_strings.php @@ -0,0 +1,181 @@ + RandomCompat_strlen($binary_string)) { + return false; + } + + return mb_substr($binary_string, $start, $length, '8bit'); + } + + } else { + + /** + * substr() implementation that isn't brittle to mbstring.func_overload + * + * This version just uses the default substr() + * + * @param string $binary_string + * @param int $start + * @param int $length (optional) + * + * @throws TypeError + * + * @return string + */ + function RandomCompat_substr($binary_string, $start, $length = null) + { + if (!is_string($binary_string)) { + throw new TypeError( + 'RandomCompat_substr(): First argument should be a string' + ); + } + + if (!is_int($start)) { + throw new TypeError( + 'RandomCompat_substr(): Second argument should be an integer' + ); + } + + if ($length !== null) { + if (!is_int($length)) { + throw new TypeError( + 'RandomCompat_substr(): Third argument should be an integer, or omitted' + ); + } + + return substr($binary_string, $start, $length); + } + + return substr($binary_string, $start); + } + } +} diff --git a/sources/include/random_compat/cast_to_int.php b/sources/include/random_compat/cast_to_int.php new file mode 100644 index 0000000..f441c5d --- /dev/null +++ b/sources/include/random_compat/cast_to_int.php @@ -0,0 +1,71 @@ + operators might accidentally let a float + * through. + * + * @param int|float $number The number we want to convert to an int + * @param boolean $fail_open Set to true to not throw an exception + * + * @return int (or float if $fail_open) + * + * @throws TypeError + */ + function RandomCompat_intval($number, $fail_open = false) + { + if (is_numeric($number)) { + $number += 0; + } + + if ( + is_float($number) + && + $number > ~PHP_INT_MAX + && + $number < PHP_INT_MAX + ) { + $number = (int) $number; + } + + if (is_int($number) || $fail_open) { + return $number; + } + + throw new TypeError( + 'Expected an integer.' + ); + } +} diff --git a/sources/include/random_compat/error_polyfill.php b/sources/include/random_compat/error_polyfill.php new file mode 100644 index 0000000..57cfefd --- /dev/null +++ b/sources/include/random_compat/error_polyfill.php @@ -0,0 +1,42 @@ +GetRandom() + * 5. openssl_random_pseudo_bytes() (absolute last resort) + * + * See ERRATA.md for our reasoning behind this particular order + */ + if (extension_loaded('libsodium')) { + // See random_bytes_libsodium.php + if (PHP_VERSION_ID >= 50300 && function_exists('\\Sodium\\randombytes_buf')) { + require_once $RandomCompatDIR.'/random_bytes_libsodium.php'; + } elseif (method_exists('Sodium', 'randombytes_buf')) { + require_once $RandomCompatDIR.'/random_bytes_libsodium_legacy.php'; + } + } + + /** + * Reading directly from /dev/urandom: + */ + if (DIRECTORY_SEPARATOR === '/') { + // DIRECTORY_SEPARATOR === '/' on Unix-like OSes -- this is a fast + // way to exclude Windows. + $RandomCompatUrandom = true; + $RandomCompat_basedir = ini_get('open_basedir'); + + if (!empty($RandomCompat_basedir)) { + $RandomCompat_open_basedir = explode( + PATH_SEPARATOR, + strtolower($RandomCompat_basedir) + ); + $RandomCompatUrandom = (array() !== array_intersect( + array('/dev', '/dev/', '/dev/urandom'), + $RandomCompat_open_basedir + )); + $RandomCompat_open_basedir = null; + } + + if ( + !function_exists('random_bytes') + && + $RandomCompatUrandom + && + @is_readable('/dev/urandom') + ) { + // Error suppression on is_readable() in case of an open_basedir + // or safe_mode failure. All we care about is whether or not we + // can read it at this point. If the PHP environment is going to + // panic over trying to see if the file can be read in the first + // place, that is not helpful to us here. + + // See random_bytes_dev_urandom.php + require_once $RandomCompatDIR.'/random_bytes_dev_urandom.php'; + } + // Unset variables after use + $RandomCompat_basedir = null; + } else { + $RandomCompatUrandom = false; + } + + /** + * mcrypt_create_iv() + */ + if ( + !function_exists('random_bytes') + && + PHP_VERSION_ID >= 50307 + && + extension_loaded('mcrypt') + && + (DIRECTORY_SEPARATOR !== '/' || $RandomCompatUrandom) + ) { + // Prevent this code from hanging indefinitely on non-Windows; + // see https://bugs.php.net/bug.php?id=69833 + if ( + DIRECTORY_SEPARATOR !== '/' || + (PHP_VERSION_ID <= 50609 || PHP_VERSION_ID >= 50613) + ) { + // See random_bytes_mcrypt.php + require_once $RandomCompatDIR.'/random_bytes_mcrypt.php'; + } + } + $RandomCompatUrandom = null; + + if ( + !function_exists('random_bytes') + && + extension_loaded('com_dotnet') + && + class_exists('COM') + ) { + $RandomCompat_disabled_classes = preg_split( + '#\s*,\s*#', + strtolower(ini_get('disable_classes')) + ); + + if (!in_array('com', $RandomCompat_disabled_classes)) { + try { + $RandomCompatCOMtest = new COM('CAPICOM.Utilities.1'); + if (method_exists($RandomCompatCOMtest, 'GetRandom')) { + // See random_bytes_com_dotnet.php + require_once $RandomCompatDIR.'/random_bytes_com_dotnet.php'; + } + } catch (com_exception $e) { + // Don't try to use it. + } + } + $RandomCompat_disabled_classes = null; + $RandomCompatCOMtest = null; + } + + /** + * throw new Exception + */ + if (!function_exists('random_bytes')) { + /** + * We don't have any more options, so let's throw an exception right now + * and hope the developer won't let it fail silently. + */ + function random_bytes($length) + { + throw new Exception( + 'There is no suitable CSPRNG installed on your system' + ); + } + } + } + + if (!function_exists('random_int')) { + require_once $RandomCompatDIR.'/random_int.php'; + } + + $RandomCompatDIR = null; +} diff --git a/sources/include/random_compat/random_bytes_com_dotnet.php b/sources/include/random_compat/random_bytes_com_dotnet.php new file mode 100644 index 0000000..3422825 --- /dev/null +++ b/sources/include/random_compat/random_bytes_com_dotnet.php @@ -0,0 +1,81 @@ +GetRandom($bytes, 0)); + if (RandomCompat_strlen($buf) >= $bytes) { + /** + * Return our random entropy buffer here: + */ + return RandomCompat_substr($buf, 0, $bytes); + } + ++$execCount; + } while ($execCount < $bytes); + + /** + * If we reach here, PHP has failed us. + */ + throw new Exception( + 'Could not gather sufficient random data' + ); +} diff --git a/sources/include/random_compat/random_bytes_dev_urandom.php b/sources/include/random_compat/random_bytes_dev_urandom.php new file mode 100644 index 0000000..db93b07 --- /dev/null +++ b/sources/include/random_compat/random_bytes_dev_urandom.php @@ -0,0 +1,148 @@ + 0); + + /** + * Is our result valid? + */ + if ($buf !== false) { + if (RandomCompat_strlen($buf) === $bytes) { + /** + * Return our random entropy buffer here: + */ + return $buf; + } + } + } + + /** + * If we reach here, PHP has failed us. + */ + throw new Exception( + 'Error reading from source device' + ); +} diff --git a/sources/include/random_compat/random_bytes_libsodium.php b/sources/include/random_compat/random_bytes_libsodium.php new file mode 100644 index 0000000..f802d4e --- /dev/null +++ b/sources/include/random_compat/random_bytes_libsodium.php @@ -0,0 +1,86 @@ + 2147483647) { + $buf = ''; + for ($i = 0; $i < $bytes; $i += 1073741824) { + $n = ($bytes - $i) > 1073741824 + ? 1073741824 + : $bytes - $i; + $buf .= \Sodium\randombytes_buf($n); + } + } else { + $buf = \Sodium\randombytes_buf($bytes); + } + + if ($buf !== false) { + if (RandomCompat_strlen($buf) === $bytes) { + return $buf; + } + } + + /** + * If we reach here, PHP has failed us. + */ + throw new Exception( + 'Could not gather sufficient random data' + ); +} diff --git a/sources/include/random_compat/random_bytes_libsodium_legacy.php b/sources/include/random_compat/random_bytes_libsodium_legacy.php new file mode 100644 index 0000000..44fddbf --- /dev/null +++ b/sources/include/random_compat/random_bytes_libsodium_legacy.php @@ -0,0 +1,86 @@ + 2147483647) { + $buf = ''; + for ($i = 0; $i < $bytes; $i += 1073741824) { + $n = ($bytes - $i) > 1073741824 + ? 1073741824 + : $bytes - $i; + $buf .= Sodium::randombytes_buf($n); + } + } else { + $buf = Sodium::randombytes_buf($bytes); + } + + if ($buf !== false) { + if (RandomCompat_strlen($buf) === $bytes) { + return $buf; + } + } + + /** + * If we reach here, PHP has failed us. + */ + throw new Exception( + 'Could not gather sufficient random data' + ); +} diff --git a/sources/include/random_compat/random_bytes_mcrypt.php b/sources/include/random_compat/random_bytes_mcrypt.php new file mode 100644 index 0000000..7ac9d91 --- /dev/null +++ b/sources/include/random_compat/random_bytes_mcrypt.php @@ -0,0 +1,76 @@ + operators might accidentally let a float + * through. + */ + + try { + $min = RandomCompat_intval($min); + } catch (TypeError $ex) { + throw new TypeError( + 'random_int(): $min must be an integer' + ); + } + + try { + $max = RandomCompat_intval($max); + } catch (TypeError $ex) { + throw new TypeError( + 'random_int(): $max must be an integer' + ); + } + + /** + * Now that we've verified our weak typing system has given us an integer, + * let's validate the logic then we can move forward with generating random + * integers along a given range. + */ + if ($min > $max) { + throw new Error( + 'Minimum value must be less than or equal to the maximum value' + ); + } + + if ($max === $min) { + return $min; + } + + /** + * Initialize variables to 0 + * + * We want to store: + * $bytes => the number of random bytes we need + * $mask => an integer bitmask (for use with the &) operator + * so we can minimize the number of discards + */ + $attempts = $bits = $bytes = $mask = $valueShift = 0; + + /** + * At this point, $range is a positive number greater than 0. It might + * overflow, however, if $max - $min > PHP_INT_MAX. PHP will cast it to + * a float and we will lose some precision. + */ + $range = $max - $min; + + /** + * Test for integer overflow: + */ + if (!is_int($range)) { + + /** + * Still safely calculate wider ranges. + * Provided by @CodesInChaos, @oittaa + * + * @ref https://gist.github.com/CodesInChaos/03f9ea0b58e8b2b8d435 + * + * We use ~0 as a mask in this case because it generates all 1s + * + * @ref https://eval.in/400356 (32-bit) + * @ref http://3v4l.org/XX9r5 (64-bit) + */ + $bytes = PHP_INT_SIZE; + $mask = ~0; + + } else { + + /** + * $bits is effectively ceil(log($range, 2)) without dealing with + * type juggling + */ + while ($range > 0) { + if ($bits % 8 === 0) { + ++$bytes; + } + ++$bits; + $range >>= 1; + $mask = $mask << 1 | 1; + } + $valueShift = $min; + } + + /** + * Now that we have our parameters set up, let's begin generating + * random integers until one falls between $min and $max + */ + do { + /** + * The rejection probability is at most 0.5, so this corresponds + * to a failure probability of 2^-128 for a working RNG + */ + if ($attempts > 128) { + throw new Exception( + 'random_int: RNG is broken - too many rejections' + ); + } + + /** + * Let's grab the necessary number of random bytes + */ + $randomByteString = random_bytes($bytes); + if ($randomByteString === false) { + throw new Exception( + 'Random number generator failure' + ); + } + + /** + * Let's turn $randomByteString into an integer + * + * This uses bitwise operators (<< and |) to build an integer + * out of the values extracted from ord() + * + * Example: [9F] | [6D] | [32] | [0C] => + * 159 + 27904 + 3276800 + 201326592 => + * 204631455 + */ + $val = 0; + for ($i = 0; $i < $bytes; ++$i) { + $val |= ord($randomByteString[$i]) << ($i * 8); + } + + /** + * Apply mask + */ + $val &= $mask; + $val += $valueShift; + + ++$attempts; + /** + * If $val overflows to a floating point number, + * ... or is larger than $max, + * ... or smaller than $min, + * then try again. + */ + } while (!is_int($val) || $val > $max || $val < $min); + + return (int) $val; +} diff --git a/sources/include/section_init.inc.php b/sources/include/section_init.inc.php index c2c3ee6..e2e0c07 100644 --- a/sources/include/section_init.inc.php +++ b/sources/include/section_init.inc.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/include/smarty/.gitattributes b/sources/include/smarty/.gitattributes new file mode 100644 index 0000000..412eeda --- /dev/null +++ b/sources/include/smarty/.gitattributes @@ -0,0 +1,22 @@ +# Auto detect text files and perform LF normalization +* text=auto + +# Custom for Visual Studio +*.cs diff=csharp +*.sln merge=union +*.csproj merge=union +*.vbproj merge=union +*.fsproj merge=union +*.dbproj merge=union + +# Standard to msysgit +*.doc diff=astextplain +*.DOC diff=astextplain +*.docx diff=astextplain +*.DOCX diff=astextplain +*.dot diff=astextplain +*.DOT diff=astextplain +*.pdf diff=astextplain +*.PDF diff=astextplain +*.rtf diff=astextplain +*.RTF diff=astextplain diff --git a/sources/include/smarty/.gitignore b/sources/include/smarty/.gitignore new file mode 100644 index 0000000..0ff15aa --- /dev/null +++ b/sources/include/smarty/.gitignore @@ -0,0 +1,221 @@ +################# +## Eclipse +################# + +*.pydevproject +.project +.metadata +bin/ +tmp/ +*.tmp +*.bak +*.swp +*~.nib +local.properties +.classpath +.settings/ +.loadpath + +# External tool builders +.externalToolBuilders/ + +# Locally stored "Eclipse launch configurations" +*.launch + +# CDT-specific +.cproject + +# PDT-specific +.buildpath + + +################# +## Visual Studio +################# + +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. + +# User-specific files +*.suo +*.user +*.sln.docstates + +# Build results + +[Dd]ebug/ +[Rr]elease/ +x64/ +build/ +[Bb]in/ +[Oo]bj/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +*_i.c +*_p.c +*.ilk +*.meta +*.obj +*.pch +*.pdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.log +*.scc + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opensdf +*.sdf +*.cachefile + +# Visual Studio profiler +*.psess +*.vsp +*.vspx + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# NCrunch +*.ncrunch* +.*crunch*.local.xml + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.Publish.xml +*.pubxml + +# NuGet Packages Directory +## TODO: If you have NuGet Package Restore enabled, uncomment the next line +#packages/ + +# Windows Azure Build Output +csx +*.build.csdef + +# Windows Store app package directory +AppPackages/ + +# Others +sql/ +*.Cache +ClientBin/ +[Ss]tyle[Cc]op.* +~$* +*~ +*.dbmdl +*.[Pp]ublish.xml +*.pfx +*.publishsettings + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file to a newer +# Visual Studio version. Backup files are not needed, because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm + +# SQL Server files +App_Data/*.mdf +App_Data/*.ldf + +############# +## Windows detritus +############# + +# Windows image file caches +Thumbs.db +ehthumbs.db + +# Folder config file +Desktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Mac crap +.DS_Store + + +############# +## Python +############# + +*.py[co] + +# Packages +*.egg +*.egg-info +dist/ +build/ +eggs/ +parts/ +var/ +sdist/ +develop-eggs/ +.installed.cfg + +# Installer logs +pip-log.txt + +# Unit test / coverage reports +.coverage +.tox + +#Translations +*.mo + +#Mr Developer +.mr.developer.cfg + +.idea/ + +# Smarty +lexer/*.php +lexer/*.out diff --git a/sources/include/smarty/.travis.yml b/sources/include/smarty/.travis.yml new file mode 100644 index 0000000..fbf081b --- /dev/null +++ b/sources/include/smarty/.travis.yml @@ -0,0 +1,25 @@ +language: php + +php: + - 5.3 + - 5.4 + - 5.5 + - 5.6 + - 7.0 + - hhvm + +matrix: + allow_failures: + - php: hhvm + +before_script: + - travis_retry composer self-update + - travis_retry composer --prefer-source --dev install + +install: + - git clone --depth=50 --branch=master git://github.com/smarty-php/smarty-phpunit.git + +script: + - cd smarty-phpunit + - phpunit ./ + diff --git a/sources/include/smarty/COMPOSER_RELEASE_NOTES.txt b/sources/include/smarty/COMPOSER_RELEASE_NOTES.txt new file mode 100644 index 0000000..c943d9f --- /dev/null +++ b/sources/include/smarty/COMPOSER_RELEASE_NOTES.txt @@ -0,0 +1,29 @@ + + +Starting with Smarty 3.1.21 Composer has been configured to load the packages from github. + +******************************************************************************* +* * +* NOTE: Because of this change you must clear your local composer cache with * +* the "composer clearcache" command * +* * +******************************************************************************* + +To get the latest stable version use + "require": { + "smarty/smarty": "~3.1" + } +in your composer.json file. + +To get the trunk version use + "require": { + "smarty/smarty": "~3.1@dev" + } + +The "smarty/smarty" package will start at libs/.... subfolder. + +To retrieve the development and documentation folders add + "require-dev": { + "smarty/smarty-dev": "~3.1@dev" + } + diff --git a/sources/include/smarty/INHERITANCE_RELEASE_NOTES.txt b/sources/include/smarty/INHERITANCE_RELEASE_NOTES.txt new file mode 100644 index 0000000..8b2c64a --- /dev/null +++ b/sources/include/smarty/INHERITANCE_RELEASE_NOTES.txt @@ -0,0 +1,67 @@ +Starting with version 3.1.28 template inheritance is no longer a compile time process. +All {block} tag parent/child relations are resolved at run time. +This does resolve all known existing restrictions (see below). + +The $smarty::$inheritance_merge_compiled_includes property has been removed. +Any access to it is ignored. + +This does enable some new features: + +Any code outside root {block} tags in child templates is now executed but any output will be ignored. + + {extends 'foo.tpl'} + {$bar = 'on'} // assigns variable $bar seen in parent templates + {block 'buh'}{/block} + + {extends 'foo.tpl'} + {$bar} // the output of variable bar is ignored + {block 'buh'}{/block} + +{block} tags can be dynamically en/disabled by conditions. + + {block 'root'} + {if $foo} + {block 'v1'} + .... + {/block} + {else} + {block 'v1'} + .... + {/block} + {/if} + {/block} + + + +THE FOLLOWING RESTRICTIONS ARE NO LONGER EXISTING: +In Smarty 3.1 template inheritance is a compile time process. All the extending of {block} tags +is done at compile time and the parent and child templates are compiled in a single compiled template. +{include} subtemplate could also {block} tags. Such subtemplate could not compiled by it's own because +it could be used in other context where the {block} extended with a different result. For that reasion +the compiled code of {include} subtemplates gets also merged in compiled inheritance template. + +Merging the code into a single compile template has some drawbacks. +1. You could not use variable file names in {include} Smarty would use the {include} of compilation time. +2. You could not use individual compile_id in {include} +3. Seperate caching of subtemplate was not possible +4. Any change of the template directory structure between calls was not necessarily seen. + +Starting with 3.1.15 some of the above conditions got checked and resulted in an exception. It turned out +that a couple of users did use some of above and now got exceptions. + +To resolve this starting with 3.1.16 there is a new configuration parameter $inheritance_merge_compiled_includes. +For most backward compatibility its default setting is true. +With this setting all {include} subtemplate will be merge into the compiled inheritance template, but the above cases +could be rejected by exception. + + +If $smarty->inheritance_merge_compiled_includes = false; {include} subtemplate will not be merged. +You must now manually merge all {include} subtemplate which do contain {block} tags. This is done by setting the "inline" option. +{include file='foo.bar' inline} + +1. In case of a variable file name like {include file=$foo inline} you must use the variable in a compile_id $smarty->compile_id = $foo; +2. If you use individual compile_id in {include file='foo.tpl' compile_id=$bar inline} it must be used in the + global compile_id as well $smarty->compile_id = $bar; +3. If call templates with different template_dir configurations and a parent could same named child template from different folders + you must make the folder name part of the compile_id. + diff --git a/sources/include/smarty/NEW_FEATURES.txt b/sources/include/smarty/NEW_FEATURES.txt new file mode 100644 index 0000000..1a51c71 --- /dev/null +++ b/sources/include/smarty/NEW_FEATURES.txt @@ -0,0 +1,133 @@ + + +This file contains a brief description of new features which have been added to Smarty 3.1 + +Smarty 3.1.28 + + OPCACHE + ======= + Smarty does now invalidate automatically updated and cleared compiled or cached template files in OPCACHE. + Correct operation is no longer dependent on OPCACHE configuration settings. + + Template inheritance + ==================== + Template inheritance is now processed in run time. + See the INHERITANCE_RELEASE_NOTES + + Modifier regex_replace + ====================== + An optional limit parameter was added + + fetch() and display() + ===================== + The fetch() and display() methods of the template object accept now optionally the same parameter + as the corresponding Smarty methods to get the content of another template. + Example: + $template->display(); Does display template of template object + $template->display('foo.tpl'); Does display template 'foo.bar' + + File: resource + ============== + Multiple template_dir entries can now be selected by a comma separated list of indices. + The template_dir array is searched in the order of the indices. (Could be used to change the default search order) + Example: + $smarty->display('[1],[0]foo.bar'); + + Filter support + ============== + Optional filter names + An optional filter name was added to $smarty->registerFilter(). It can be used to unregister a filter by name. + - $smarty->registerFilter('output', $callback, 'name'); + $smarty->unregister('output', 'name'); + + Closures + $smarty->registerFilter() does now accept closures. + - $smarty->registerFilter('pre', function($source) {return $source;}); + If no optional filter name was specified it gets the default name 'closure'. + If you register multiple closures register each with a unique filter name. + - $smarty->registerFilter('pre', function($source) {return $source;}, 'closure_1'); + - $smarty->registerFilter('pre', function($source) {return $source;}, 'closure_2'); + + +Smarty 3.1.22 + + Namespace support within templates + ================================== + Within templates you can now use namespace specifications on: + - Constants like foo\bar\FOO + - Class names like foo\bar\Baz::FOO, foo\bar\Baz::$foo, foo\bar\Baz::foo() + - PHP function names like foo\bar\baz() + + Security + ======== + - disable special $smarty variable - + The Smarty_Security class has the new property $disabled_special_smarty_vars. + It's an array which can be loaded with the $smarty special variable names like + 'template_object', 'template', 'current_dir' and others which will be disabled. + Note: That this security check is performed at compile time. + + - limit template nesting - + Property $max_template_nesting of Smarty_Security does set the maximum template nesting level. + The main template is level 1. The nesting level is checked at run time. When the maximum will be exceeded + an Exception will be thrown. The default setting is 0 which does disable this check. + + - trusted static methods - + The Smarty_Security class has the new property $trusted_static_methods to restrict access to static methods. + It's an nested array of trusted class and method names. + Format: + array ( + 'class_1' => array('method_1', 'method_2'), // allowed methods + 'class_2' => array(), // all methods of class allowed + ) + To disable access for all methods of all classes set $trusted_static_methods = null; + The default value is an empty array() which does enables all methods of all classes, but for backward compatibility + the setting of $static_classes will be checked. + Note: That this security check is performed at compile time. + + - trusted static properties - + The Smarty_Security class has the new property $trusted_static_properties to restrict access to static properties. + It's an nested array of trusted class and property names. + Format: + array ( + 'class_1' => array('prop_1', 'prop_2'), // allowed properties listed + 'class_2' => array(), // all properties of class allowed + } + To disable access for all properties of all classes set $trusted_static_properties = null; + The default value is an empty array() which does enables all properties of all classes, but for backward compatibility + the setting of $static_classes will be checked. + Note: That this security check is performed at compile time. + + - trusted constants . + The Smarty_Security class has the new property $trusted_constants to restrict access to constants. + It's an array of trusted constant names. + Format: + array ( + 'SMARTY_DIR' , // allowed constant + } + If the array is empty (default) the usage of constants can be controlled with the + Smarty_Security::$allow_constants property (default true) + + + + Compiled Templates + ================== + Smarty does now automatically detects a change of the $merge_compiled_includes and $escape_html + property and creates different compiled templates files depending on the setting. + + Same applies to config files and the $config_overwrite, $config_booleanize and + $config_read_hidden properties. + + Debugging + ========= + The layout of the debug window has been changed for better readability + + New class constants + Smarty::DEBUG_OFF + Smarty::DEBUG_ON + Smarty::DEBUG_INDIVIDUAL + have been introduced for setting the $debugging property. + + Smarty::DEBUG_INDIVIDUAL will create for each display() and fetch() call an individual debug window. + + . + diff --git a/sources/include/smarty/README b/sources/include/smarty/README index bf03403..08b397c 100644 --- a/sources/include/smarty/README +++ b/sources/include/smarty/README @@ -1,4 +1,4 @@ -Smarty 3.1.13 +Smarty 3.x Author: Monte Ohrt Author: Uwe Tews @@ -120,7 +120,7 @@ $smarty->unregisterObject($object_name) $smarty->unregisterFilter($type, $function_name) $smarty->unregisterResource($resource_type) -$smarty->compileAllTemplates($extention = '.tpl', $force_compile = false, $time_limit = 0, $max_errors = null) +$smarty->compileAllTemplates($extension = '.tpl', $force_compile = false, $time_limit = 0, $max_errors = null) $smarty->clearCompiledTemplate($resource_name = null, $compile_id = null, $exp_time = null) $smarty->testInstall() @@ -460,12 +460,13 @@ included template. PLUGINS ======= -Smarty3 are following the same coding rules as in Smarty2. -The only difference is that the template object is passed as additional third parameter. +Smarty 3 plugins follow the same coding rules as in Smarty 2. +The main difference is that the template object is now passed in place of the smarty object. +The smarty object can be still be accessed through $template->smarty. -smarty_plugintype_name (array $params, object $smarty, object $template) +smarty_plugintype_name (array $params, Smarty_Internal_Template $template) -The Smarty 2 plugins are still compatible as long as they do not make use of specific Smarty2 internals. +The Smarty 2 plugins are still compatible as long as they do not make use of specific Smarty 2 internals. TEMPLATE INHERITANCE: diff --git a/sources/include/smarty/README.md b/sources/include/smarty/README.md new file mode 100644 index 0000000..5783eb3 --- /dev/null +++ b/sources/include/smarty/README.md @@ -0,0 +1,65 @@ +#Smarty 3 template engine +##Distribution repository + +> Smarty 3.1.28 introduces run time template inheritance + +> Read the NEW_FEATURES and INHERITANCE_RELEASE_NOTES file for recent extensions to Smarty 3.1 functionality + +Smarty versions 3.1.11 or later are now on github and can be installed with Composer. + + +The "smarty/smarty" package will start at libs/.... subfolder. + +To get the latest stable version of Smarty 3.1 use + +```json +"require": { + "smarty/smarty": "~3.1" +} +``` + +in your composer.json file. + +To get the trunk version use + +```json +"require": { + "smarty/smarty": "~3.1@dev" +} +``` + +For a specific version use something like + +```json +"require": { + "smarty/smarty": "3.1.19" +} +``` + +PHPUnit test can be installed by corresponding composer entries like + +```json +"require": { + "smarty/smarty-phpunit": "3.1.19" +} +``` + +Similar applies for the lexer/parser generator + +```json +"require": { + "smarty/smarty-lexer": "3.1.19" +} +``` + +Or you could use + +```json +"require": { + "smarty/smarty-dev": "3.1.19" +} +``` + +Which is a wrapper to install all 3 packages + +Composer can also be used for Smarty2 versions 2.6.24 to 2.6.28 diff --git a/sources/include/smarty/SMARTY_3.1_NOTES.txt b/sources/include/smarty/SMARTY_3.1_NOTES.txt index e56e56f..57709f0 100644 --- a/sources/include/smarty/SMARTY_3.1_NOTES.txt +++ b/sources/include/smarty/SMARTY_3.1_NOTES.txt @@ -199,7 +199,7 @@ Relative paths are available with {include file="..."} and $smarty->fetch('./foo.tpl') cannot be relative to a template, an exception is thrown. - Adressing a specific $template_dir + Addressing a specific $template_dir Smarty 3.1 introduces the $template_dir index notation. $smarty->fetch('[foo]bar.tpl') and {include file="[foo]bar.tpl"} diff --git a/sources/include/smarty/change_log.txt b/sources/include/smarty/change_log.txt index 69642e2..dadc5d1 100644 --- a/sources/include/smarty/change_log.txt +++ b/sources/include/smarty/change_log.txt @@ -1,9 +1,720 @@ -===== Smarty-3.1.13 ===== + ===== 3.1.29 ===== (21.12.2015) + 21.12.2015 + - optimization improve speed of filetime checks on extends and extendsall resource + + 20.12.2015 + - bugfix failure when the default resource type was set to 'extendsall' https://github.com/smarty-php/smarty/issues/123 + - update compilation of Smarty special variables + - bugfix add addition check for OS type on normalizaition of file path https://github.com/smarty-php/smarty/issues/134 + - bugfix the source uid of the extendsall resource must contain $template_dir settings https://github.com/smarty-php/smarty/issues/123 + + 19.12.2015 + - bugfix using $smarty.capture.foo in expressions could fail https://github.com/smarty-php/smarty/pull/138 + - bugfix broken PHP 5.2 compatibility https://github.com/smarty-php/smarty/issues/139 + - remove no longer used code + - improvement make sure that compiled and cache templates never can contain a trailing '?>? + + 18.12.2015 + - bugfix regression when modifier parameter was follow by math https://github.com/smarty-php/smarty/issues/132 + + 17.12.2015 + - bugfix {$smarty.capture.nameFail} did lowercase capture name https://github.com/smarty-php/smarty/issues/135 + - bugfix using {block append/prepend} on same block in multiple levels of inheritance templates could fail (forum topic 25827) + - bugfix text content consisting of just a single '0' like in {if true}0{/if} was suppressed (forum topic 25834) + + 16.12.2015 + - bugfix {foreach} did fail if from atrribute is a Generator class https://github.com/smarty-php/smarty/issues/128 + - bugfix direct access $smarty->template_dir = 'foo'; should call Smarty::setTemplateDir() https://github.com/smarty-php/smarty/issues/121 + + 15.12.2015 + - bugfix {$smarty.cookies.foo} did return the $_COOKIE array not the 'foo' value https://github.com/smarty-php/smarty/issues/122 + - bugfix a call to clearAllCache() and other should clear all internal template object caches (forum topic 25828) + + 14.12.2015 + - bugfix {$smarty.config.foo} broken in 3.1.28 https://github.com/smarty-php/smarty/issues/120 + - bugfix multiple calls of {section} with same name droped E_NOTICE error https://github.com/smarty-php/smarty/issues/118 + + ===== 3.1.28 ===== (13.12.2015) + 13.12.2015 + - bugfix {foreach} and {section} with uppercase characters in name attribute did not work (forum topic 25819) + - bugfix $smarty->debugging_ctrl = 'URL' did not work (forum topic 25811) + - bugfix Debug Console could display incorrect data when using subtemplates + + 09.12.2015 + - bugfix Smarty did fail under PHP 7.0.0 with use_include_path = true; + + 09.12.2015 + - bugfix {strip} should exclude some html tags from stripping, related to fix for https://github.com/smarty-php/smarty/issues/111 + + 08.12.2015 + - bugfix internal template function data got stored in wrong compiled file https://github.com/smarty-php/smarty/issues/114 + + 05.12.2015 + -bugfix {strip} should insert a single space https://github.com/smarty-php/smarty/issues/111 + + 25.11.2015 + -bugfix a left delimter like '[%' did fail on [%$var_[%$variable%]%] (forum topic 25798) + + 02.11.2015 + - bugfix {include} with variable file name like {include file="foo_`$bar`.tpl"} did fail in 3.1.28-dev https://github.com/smarty-php/smarty/issues/102 + + 01.11.2015 + - update config file processing + + 31.10.2015 + - bugfix add missing $trusted_dir property to SmartyBC class (forum topic 25751) + + 29.10.2015 + - improve template scope handling + + 24.10.2015 + - more optimizations of template processing + - bugfix Error when using {include} within {capture} https://github.com/smarty-php/smarty/issues/100 + + 21.10.2015 + - move some code into runtime extensions + + 18.10.2015 + - optimize filepath normalization + - rework of template inheritance + - speed and size optimizations + - bugfix under HHVM temporary cache file must only be created when caches template was updated + - fix compiled code for new {block} assign attribute + - update code generated by template function call handler + + 18.09.2015 + - bugfix {if $foo instanceof $bar} failed to compile if 2nd value is a variable https://github.com/smarty-php/smarty/issues/92 + + 17.09.2015 + - bugfix {foreach} first attribute was not correctly reset since commit 05a8fa2 of 02.08.2015 https://github.com/smarty-php/smarty/issues/90 + + 16.09.2015 + - update compiler by moving no longer needed properties, code optimizations and other + + 14.09.2015 + - optimize autoloader + - optimize subtemplate handling + - update template inheritance processing + - move code of {call} processing back into Smarty_Internal_Template class + - improvement invalidate OPCACHE for cleared compiled and cached template files (forum topic 25557) + - bugfix unintended multiple debug windows (forum topic 25699) + + 30.08.2015 + - size optimization move some runtime functions into extension + - optimize inline template processing + - optimization merge inheritance child and parent templates into one compiled template file + + 29.08.2015 + - improvement convert template inheritance into runtime processing + - bugfix {$smarty.block.parent} did always reference the root parent block https://github.com/smarty-php/smarty/issues/68 + + 23.08.2015 + - introduce Smarty::$resource_cache_mode and cache template object of {include} inside loop + - load seldom used Smarty API methods dynamically to reduce memory footprint + - cache template object of {include} if same template is included several times + - convert debug console processing to object + - use output buffers for better performance and less memory usage + - optimize nocache hash processing + - remove not really needed properties + - optimize rendering + - move caching to Smarty::_cache + - remove properties with redundant content + - optimize Smarty::templateExists() + - optimize use_include_path processing + - relocate properties for size optimization + - remove redundant code + - bugfix compiling super globals like {$smarty.get.foo} did fail in the master branch https://github.com/smarty-php/smarty/issues/77 + + 06.08.2015 + - avoid possible circular object references caused by parser/lexer objects + - rewrite compileAll... utility methods + - commit several internal improvements + - bugfix Smarty failed when compile_id did contain "|" + + 03.08.2015 + - rework clear cache methods + - bugfix compileAllConfig() was broken since 3.1.22 because of the changes in config file processing + - improve getIncludePath() to return directory if no file was given + + 02.08.2015 + - optimization and code cleanup of {foreach} and {section} compiler + - rework {capture} compiler + + 01.08.2015 + - update DateTime object can be instance of DateTimeImmutable since PHP5.5 https://github.com/smarty-php/smarty/pull/75 + - improvement show resource type and start of template source instead of uid on eval: and string: resource (forum topic 25630) + + 31.07.2015 + - optimize {foreach} and {section} compiler + + 29.07.2015 + - optimize {section} compiler for speed and size of compiled code + + 28.07.2015 + - update for PHP 7 compatibility + + 26.07.2015 + - improvement impement workaround for HHVM PHP incompatibillity https://github.com/facebook/hhvm/issues/4797 + + 25.07.2015 + - bugfix parser did hang on text starting fetch('foo.tpl') https://github.com/smarty-php/smarty/issues/70 + - improvement Added $limit parameter to regex_replace modifier #71 + - new feature multiple indices on file: resource + + 06.07.2015 + - optimize {block} compilation + - optimization get rid of __get and __set in source object + + 01.07.2015 + - optimize compile check handling + - update {foreach} compiler + - bugfix debugging console did not display string values containing \n, \r or \t correctly https://github.com/smarty-php/smarty/issues/66 + - optimize source resources + + 28.06.2015 + - move $smarty->enableSecurity() into Smarty_Security class + - optimize security isTrustedResourceDir() + - move auto load filter methods into extension + - move $smarty->getTemplateVars() into extension + - move getStreamVariable() into extension + - move $smarty->append() and $smarty->appendByRef() into extension + - optimize autoloader + - optimize file path normalization + - bugfix PATH_SEPARATOR was replaced by mistake in autoloader + - remove redundant code + + 27.06.2015 + - bugfix resolve naming conflict between custom Smarty delimiter '<%' and PHP ASP tags https://github.com/smarty-php/smarty/issues/64 + - update $smarty->_realpath for relative path not starting with './' + - update Smarty security with new realpath handling + - update {include_php} with new realpath handling + - move $smarty->loadPlugin() into extension + - minor compiler optimizations + - bugfix allow function plugins with name ending with 'close' https://github.com/smarty-php/smarty/issues/52 + - rework of $smarty->clearCompiledTemplate() and move it to its own extension + + 19.06.2015 + - improvement allow closures as callback at $smarty->registerFilter() https://github.com/smarty-php/smarty/issues/59 + + ===== 3.1.27===== (18.06.2015) + 18.06.2015 + - bugfix another update on file path normalization failed on path containing something like "/.foo/" https://github.com/smarty-php/smarty/issues/56 + + ===== 3.1.26===== (18.06.2015) + 18.06.2015 + - bugfix file path normalization failed on path containing something like "/.foo/" https://github.com/smarty-php/smarty/issues/56 + + 17.06.2015 + - bugfix calling a plugin with nocache option but no other attributes like {foo nocache} caused call to undefined function https://github.com/smarty-php/smarty/issues/55 + + ===== 3.1.25===== (15.06.2015) + 15.06.2015 + - optimization of smarty_cachereource_keyvaluestore.php code + + 14.06.2015 + - bugfix a relative sub template path could fail if template_dir path did contain /../ https://github.com/smarty-php/smarty/issues/50 + - optimization rework of path normalization + - bugfix an output tag with variable, modifier followed by an operator like {$foo|modifier+1} did fail https://github.com/smarty-php/smarty/issues/53 + + 13.06.2015 + - bugfix a custom cache resource using smarty_cachereource_keyvaluestore.php did fail if php.ini mbstring.func_overload = 2 (forum topic 25568) + + 11.06.2015 + - bugfix the lexer could hang on very large quoted strings (forum topic 25570) + + 08.06.2015 + - bugfix using {$foo} as array index like $bar.{$foo} or in double quoted string like "some {$foo} thing" failed https://github.com/smarty-php/smarty/issues/49 + + 04.06.2015 + - bugfix possible error message on unset() while compiling {block} tags https://github.com/smarty-php/smarty/issues/46 + + 01.06.2015 + - bugfix including template variables broken since 3.1.22 https://github.com/smarty-php/smarty/issues/47 + + 27.05.2015 + - bugfix {include} with variable file name must not create by default individual cache file (since 3.1.22) https://github.com/smarty-php/smarty/issues/43 + + 24.05.2015 + - bugfix if condition string 'neq' broken due to a typo https://github.com/smarty-php/smarty/issues/42 + + ===== 3.1.24===== (23.05.2015) + 23.05.2015 + - improvement on php_handling to allow very large PHP sections, better error handling + - improvement allow extreme large comment sections (forum 25538) + + 21.05.2015 + - bugfix broken PHP 5.2 compatibility when compiling 1 did compile into wrong code https://github.com/smarty-php/smarty/issues/41 + + 19.05.2015 + - bugfix compiler did overwrite existing variable value when setting the nocache attribute https://github.com/smarty-php/smarty/issues/39 + - bugfix output filter trimwhitespace could run into the pcre.backtrack_limit on large output (code.google issue 220) + - bugfix compiler could run into the pcre.backtrack_limit on larger comment or {php} tag sections (forum 25538) + + 18.05.2015 + - improvement introduce shortcuts in lexer/parser rules for most frequent terms for higher + compilation speed + + 16.05.2015 + - bugfix {php}{/php} did work just for single lines https://github.com/smarty-php/smarty/issues/33 + - improvement remove not needed ?> handling from parser to new compiler module + + 05.05.2015 + - bugfix code could be messed up when {tags} are used in multiple attributes https://github.com/smarty-php/smarty/issues/23 + + 04.05.2015 + - bugfix Smarty_Resource::parseResourceName incompatible with Google AppEngine (https://github.com/smarty-php/smarty/issues/22) + - improvement use is_file() checks to avoid errors suppressed by @ which could still cause problems (https://github.com/smarty-php/smarty/issues/24) + + 28.04.2015 + - bugfix plugins of merged subtemplates not loaded in 3.1.22-dev (forum topic 25508) 2nd fix + + 28.04.2015 + - bugfix plugins of merged subtemplates not loaded in 3.1.22-dev (forum topic 25508) + + 23.04.2015 + - bugfix a nocache template variable used as parameter at {insert} was by mistake cached + + 20.04.2015 + - bugfix at a template function containing nocache code a parmeter could overwrite a template variable of same name + + 27.03.2015 + - bugfix Smarty_Security->allow_constants=false; did also disable true, false and null (change of 16.03.2015) + - improvement added a whitelist for trusted constants to security Smarty_Security::$trusted_constants (forum topic 25471) + + 20.03.2015 + - bugfix make sure that function properties get saved only in compiled files containing the fuction definition {forum topic 25452} + - bugfix correct update of global variable values on exit of template functions. (reported under Smarty Developers) + + 16.03.2015 + - bugfix problems with {function}{/function} and {call} tags in different subtemplate cache files {forum topic 25452} + - bugfix Smarty_Security->allow_constants=false; did not disallow direct usage of defined constants like {SMARTY_DIR} {forum topic 25457} + - bugfix {block}{/block} tags did not work inside double quoted strings https://github.com/smarty-php/smarty/issues/18 + + + 15.03.2015 + - bugfix $smarty->compile_check must be restored before rendering of a just updated cache file {forum 25452} + + 14.03.2015 + - bugfix {nocache} {/nocache} tags corrupted code when used within a nocache section caused by a nocache template variable. + + - bugfix template functions defined with {function} in an included subtemplate could not be called in nocache + mode with {call... nocache} if the subtemplate had it's own cache file {forum 25452} + + 10.03.2015 + - bugfix {include ... nocache} whith variable file or compile_id attribute was not executed in nocache mode. + + 12.02.2015 + - bugfix multiple Smarty::fetch() of same template when $smarty->merge_compiled_includes = true; could cause function already defined error + + 11.02.2015 + - bugfix recursive {includes} did create E_NOTICE message when $smarty->merge_compiled_includes = true; (github issue #16) + + 22.01.2015 + - new feature security can now control access to static methods and properties + see also NEW_FEATURES.txt + + 21.01.2015 + - bugfix clearCompiledTemplates(), clearAll() and clear() could try to delete whole drive at wrong path permissions because realpath() fail (forum 25397) + - bugfix 'self::' and 'parent::' was interpreted in template syntax as static class + + 04.01.2015 + - push last weeks changes to github + + - different optimizations + - improvement automatically create different versions of compiled templates and config files depending + on property settings. + - optimization restructure template processing by moving code into classes it better belongs to + - optimization restructure config file processing + + 31.12.2014 + - bugfix use function_exists('mb_get_info') for setting Smarty::$_MBSTRING. + Function mb_split could be overloaded depending on php.ini mbstring.func_overload + + + 29.12.2014 + - new feature security can now limit the template nesting level by property $max_template_nesting + see also NEW_FEATURES.txt (forum 25370) + + 29.12.2014 + - new feature security can now disable special $smarty variables listed in property $disabled_special_smarty_vars + see also NEW_FEATURES.txt (forum 25370) + + 27.12.2014 + - bugfix clear internal _is_file_cache when plugins_dir was modified + + 13.12.2014 + - improvement optimization of lexer and parser resulting in a up to 30% higher compiling speed + + 11.12.2014 + - bugfix resolve parser ambiguity between constant print tag {CONST} and other smarty tags after change of 09.12.2014 + + 09.12.2014 + - bugfix variables $null, $true and $false did not work after the change of 12.11.2014 (forum 25342) + - bugfix call of template function by a variable name did not work after latest changes (forum 25342) + + 23.11.2014 + - bugfix a plugin with attached modifier could fail if the tag was immediately followed by another Smarty tag (since 3.1.21) (forum 25326) + + 13.11.2014 + - improvement move autoload code into Autoloader.php. Use Composer autoloader when possible + + 12.11.2014 + - new feature added support of namespaces to template code + + 08.11.2014 - 10.11.2014 + - bugfix subtemplate called in nocache mode could be called with wrong compile_id when it did change on one of the calling templates + - improvement add code of template functions called in nocache mode dynamically to cache file (related to bugfix of 01.11.2014) + - bugfix Debug Console did not include all data from merged compiled subtemplates + + 04.11.2014 + - new feature $smarty->debugging = true; => overwrite existing Debug Console window (old behaviour) + $smarty->debugging = 2; => individual Debug Console window by template name + + 03.11.2014 + - bugfix Debug Console did not show included subtemplates since 3.1.17 (forum 25301) + - bugfix Modifier debug_print_var did not limit recursion or prevent recursive object display at Debug Console + (ATTENTION: parameter order has changed to be able to specify maximum recursion) + - bugfix Debug consol did not include subtemplate information with $smarty->merge_compiled_includes = true + - improvement The template variables are no longer displayed as objects on the Debug Console + - improvement $smarty->createData($parent = null, $name = null) new optional name parameter for display at Debug Console + - addition of some hooks for future extension of Debug Console + + 01.11.2014 + - bugfix and enhancement on subtemplate {include} and template {function} tags. + * Calling a template which has a nocache section could fail if it was called from a cached and a not cached subtemplate. + * Calling the same subtemplate cached and not cached with the $smarty->merge_compiled_includes enabled could cause problems + * Many smaller related changes + + 30.10.2014 + - bugfix access to class constant by object like {$object::CONST} or variable class name {$class::CONST} did not work (forum 25301) + + 26.10.2014 + - bugfix E_NOTICE message was created during compilation when ASP tags '<%' or '%>' are in template source text + - bugfix merge_compiled_includes option failed when caching enables and same subtemplate was included cached and not cached + + ===== 3.1.21 ===== (18.10.2014) + 18.10.2014 + - composer moved to github + + 17.10.2014 + - bugfix on $php_handling security and optimization of smarty_internal_parsetree (Thue Kristensen) + + 16.10.2014 + - bugfix composer.json update + + 15.10.2014 + - bugfix calling a new created cache file with fetch() and Smarty::CACHING_LIFETIME_SAVED multiple times did fail (forum 22350) + + 14.10.2014 + - bugfix any tag placed within " diff --git a/sources/include/smarty/libs/plugins/block.textformat.php b/sources/include/smarty/libs/plugins/block.textformat.php index b22b104..abf5449 100644 --- a/sources/include/smarty/libs/plugins/block.textformat.php +++ b/sources/include/smarty/libs/plugins/block.textformat.php @@ -2,13 +2,12 @@ /** * Smarty plugin to format text blocks * - * @package Smarty + * @package Smarty * @subpackage PluginsBlock */ /** * Smarty {textformat}{/textformat} block plugin - * * Type: block function
    * Name: textformat
    * Purpose: format text a certain way with preset styles @@ -23,12 +22,14 @@ * - wrap_boundary - boolean (true) * * - * @link http://www.smarty.net/manual/en/language.function.textformat.php {textformat} - * (Smarty online manual) + * @link http://www.smarty.net/manual/en/language.function.textformat.php {textformat} + * (Smarty online manual) + * * @param array $params parameters * @param string $content contents of the block * @param Smarty_Internal_Template $template template object * @param boolean &$repeat repeat flag + * * @return string content re-formatted * @author Monte Ohrt */ @@ -53,17 +54,17 @@ function smarty_block_textformat($params, $content, $template, &$repeat) case 'indent_char': case 'wrap_char': case 'assign': - $$_key = (string)$_val; + $$_key = (string) $_val; break; case 'indent': case 'indent_first': case 'wrap': - $$_key = (int)$_val; + $$_key = (int) $_val; break; case 'wrap_cut': - $$_key = (bool)$_val; + $$_key = (bool) $_val; break; default: @@ -76,8 +77,6 @@ function smarty_block_textformat($params, $content, $template, &$repeat) } // split into paragraphs $_paragraphs = preg_split('![\r\n]{2}!', $content); - $_output = ''; - foreach ($_paragraphs as &$_paragraph) { if (!$_paragraph) { @@ -102,12 +101,10 @@ function smarty_block_textformat($params, $content, $template, &$repeat) } } $_output = implode($wrap_char . $wrap_char, $_paragraphs); - + if ($assign) { $template->assign($assign, $_output); } else { return $_output; } } - -?> \ No newline at end of file diff --git a/sources/include/smarty/libs/plugins/function.counter.php b/sources/include/smarty/libs/plugins/function.counter.php index 3906bad..4da85a1 100644 --- a/sources/include/smarty/libs/plugins/function.counter.php +++ b/sources/include/smarty/libs/plugins/function.counter.php @@ -1,22 +1,24 @@ * Name: counter
    * Purpose: print out a counter value * * @author Monte Ohrt - * @link http://www.smarty.net/manual/en/language.function.counter.php {counter} - * (Smarty online manual) + * @link http://www.smarty.net/manual/en/language.function.counter.php {counter} + * (Smarty online manual) + * * @param array $params parameters * @param Smarty_Internal_Template $template template object + * * @return string|null */ function smarty_function_counter($params, $template) @@ -26,16 +28,16 @@ function smarty_function_counter($params, $template) $name = (isset($params['name'])) ? $params['name'] : 'default'; if (!isset($counters[$name])) { $counters[$name] = array( - 'start'=>1, - 'skip'=>1, - 'direction'=>'up', - 'count'=>1 - ); + 'start' => 1, + 'skip' => 1, + 'direction' => 'up', + 'count' => 1 + ); } $counter =& $counters[$name]; if (isset($params['start'])) { - $counter['start'] = $counter['count'] = (int)$params['start']; + $counter['start'] = $counter['count'] = (int) $params['start']; } if (!empty($params['assign'])) { @@ -45,9 +47,9 @@ function smarty_function_counter($params, $template) if (isset($counter['assign'])) { $template->assign($counter['assign'], $counter['count']); } - + if (isset($params['print'])) { - $print = (bool)$params['print']; + $print = (bool) $params['print']; } else { $print = empty($counter['assign']); } @@ -61,18 +63,16 @@ function smarty_function_counter($params, $template) if (isset($params['skip'])) { $counter['skip'] = $params['skip']; } - + if (isset($params['direction'])) { $counter['direction'] = $params['direction']; } - if ($counter['direction'] == "down") + if ($counter['direction'] == "down") { $counter['count'] -= $counter['skip']; - else + } else { $counter['count'] += $counter['skip']; - - return $retval; - -} + } -?> \ No newline at end of file + return $retval; +} diff --git a/sources/include/smarty/libs/plugins/function.cycle.php b/sources/include/smarty/libs/plugins/function.cycle.php index 1778ffb..8dc5cd9 100644 --- a/sources/include/smarty/libs/plugins/function.cycle.php +++ b/sources/include/smarty/libs/plugins/function.cycle.php @@ -2,13 +2,12 @@ /** * Smarty plugin * - * @package Smarty + * @package Smarty * @subpackage PluginsFunction */ /** * Smarty {cycle} function plugin - * * Type: function
    * Name: cycle
    * Date: May 3, 2002
    @@ -31,15 +30,17 @@ * {cycle name=row} * * - * @link http://www.smarty.net/manual/en/language.function.cycle.php {cycle} - * (Smarty online manual) - * @author Monte Ohrt - * @author credit to Mark Priatel - * @author credit to Gerard - * @author credit to Jason Sweat + * @link http://www.smarty.net/manual/en/language.function.cycle.php {cycle} + * (Smarty online manual) + * @author Monte Ohrt + * @author credit to Mark Priatel + * @author credit to Gerard + * @author credit to Jason Sweat * @version 1.3 + * * @param array $params parameters * @param Smarty_Internal_Template $template template object + * * @return string|null */ @@ -48,18 +49,20 @@ function smarty_function_cycle($params, $template) static $cycle_vars; $name = (empty($params['name'])) ? 'default' : $params['name']; - $print = (isset($params['print'])) ? (bool)$params['print'] : true; - $advance = (isset($params['advance'])) ? (bool)$params['advance'] : true; - $reset = (isset($params['reset'])) ? (bool)$params['reset'] : false; + $print = (isset($params['print'])) ? (bool) $params['print'] : true; + $advance = (isset($params['advance'])) ? (bool) $params['advance'] : true; + $reset = (isset($params['reset'])) ? (bool) $params['reset'] : false; if (!isset($params['values'])) { - if(!isset($cycle_vars[$name]['values'])) { + if (!isset($cycle_vars[$name]['values'])) { trigger_error("cycle: missing 'values' parameter"); + return; } } else { - if(isset($cycle_vars[$name]['values']) - && $cycle_vars[$name]['values'] != $params['values'] ) { + if (isset($cycle_vars[$name]['values']) + && $cycle_vars[$name]['values'] != $params['values'] + ) { $cycle_vars[$name]['index'] = 0; } $cycle_vars[$name]['values'] = $params['values']; @@ -71,13 +74,13 @@ function smarty_function_cycle($params, $template) $cycle_vars[$name]['delimiter'] = ','; } - if(is_array($cycle_vars[$name]['values'])) { + if (is_array($cycle_vars[$name]['values'])) { $cycle_array = $cycle_vars[$name]['values']; } else { - $cycle_array = explode($cycle_vars[$name]['delimiter'],$cycle_vars[$name]['values']); + $cycle_array = explode($cycle_vars[$name]['delimiter'], $cycle_vars[$name]['values']); } - if(!isset($cycle_vars[$name]['index']) || $reset ) { + if (!isset($cycle_vars[$name]['index']) || $reset) { $cycle_vars[$name]['index'] = 0; } @@ -86,21 +89,19 @@ function smarty_function_cycle($params, $template) $template->assign($params['assign'], $cycle_array[$cycle_vars[$name]['index']]); } - if($print) { + if ($print) { $retval = $cycle_array[$cycle_vars[$name]['index']]; } else { $retval = null; } - if($advance) { - if ( $cycle_vars[$name]['index'] >= count($cycle_array) -1 ) { + if ($advance) { + if ($cycle_vars[$name]['index'] >= count($cycle_array) - 1) { $cycle_vars[$name]['index'] = 0; } else { - $cycle_vars[$name]['index']++; + $cycle_vars[$name]['index'] ++; } } return $retval; } - -?> \ No newline at end of file diff --git a/sources/include/smarty/libs/plugins/function.fetch.php b/sources/include/smarty/libs/plugins/function.fetch.php index eca1182..3506d4a 100644 --- a/sources/include/smarty/libs/plugins/function.fetch.php +++ b/sources/include/smarty/libs/plugins/function.fetch.php @@ -2,50 +2,53 @@ /** * Smarty plugin * - * @package Smarty + * @package Smarty * @subpackage PluginsFunction */ /** * Smarty {fetch} plugin - * * Type: function
    * Name: fetch
    * Purpose: fetch file, web or ftp data and display results * - * @link http://www.smarty.net/manual/en/language.function.fetch.php {fetch} - * (Smarty online manual) + * @link http://www.smarty.net/manual/en/language.function.fetch.php {fetch} + * (Smarty online manual) * @author Monte Ohrt + * * @param array $params parameters * @param Smarty_Internal_Template $template template object + * + * @throws SmartyException * @return string|null if the assign parameter is passed, Smarty assigns the result to a template variable */ function smarty_function_fetch($params, $template) { if (empty($params['file'])) { - trigger_error("[plugin] fetch parameter 'file' cannot be empty",E_USER_NOTICE); + trigger_error("[plugin] fetch parameter 'file' cannot be empty", E_USER_NOTICE); + return; } - + // strip file protocol if (stripos($params['file'], 'file://') === 0) { $params['file'] = substr($params['file'], 7); } - + $protocol = strpos($params['file'], '://'); if ($protocol !== false) { $protocol = strtolower(substr($params['file'], 0, $protocol)); } - + if (isset($template->smarty->security_policy)) { if ($protocol) { // remote resource (or php stream, …) - if(!$template->smarty->security_policy->isTrustedUri($params['file'])) { + if (!$template->smarty->security_policy->isTrustedUri($params['file'])) { return; } } else { // local file - if(!$template->smarty->security_policy->isTrustedResourceDir($params['file'])) { + if (!$template->smarty->security_policy->isTrustedResourceDir($params['file'])) { return; } } @@ -54,53 +57,54 @@ function smarty_function_fetch($params, $template) $content = ''; if ($protocol == 'http') { // http fetch - if($uri_parts = parse_url($params['file'])) { + if ($uri_parts = parse_url($params['file'])) { // set defaults $host = $server_name = $uri_parts['host']; $timeout = 30; $accept = "image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*"; - $agent = "Smarty Template Engine ". Smarty::SMARTY_VERSION; + $agent = "Smarty Template Engine " . Smarty::SMARTY_VERSION; $referer = ""; $uri = !empty($uri_parts['path']) ? $uri_parts['path'] : '/'; $uri .= !empty($uri_parts['query']) ? '?' . $uri_parts['query'] : ''; $_is_proxy = false; - if(empty($uri_parts['port'])) { + if (empty($uri_parts['port'])) { $port = 80; } else { $port = $uri_parts['port']; } - if(!empty($uri_parts['user'])) { + if (!empty($uri_parts['user'])) { $user = $uri_parts['user']; } - if(!empty($uri_parts['pass'])) { + if (!empty($uri_parts['pass'])) { $pass = $uri_parts['pass']; } // loop through parameters, setup headers - foreach($params as $param_key => $param_value) { - switch($param_key) { + foreach ($params as $param_key => $param_value) { + switch ($param_key) { case "file": case "assign": case "assign_headers": break; case "user": - if(!empty($param_value)) { + if (!empty($param_value)) { $user = $param_value; } break; case "pass": - if(!empty($param_value)) { + if (!empty($param_value)) { $pass = $param_value; } break; case "accept": - if(!empty($param_value)) { + if (!empty($param_value)) { $accept = $param_value; } break; case "header": - if(!empty($param_value)) { - if(!preg_match('![\w\d-]+: .+!',$param_value)) { - trigger_error("[plugin] invalid header format '".$param_value."'",E_USER_NOTICE); + if (!empty($param_value)) { + if (!preg_match('![\w\d-]+: .+!', $param_value)) { + trigger_error("[plugin] invalid header format '" . $param_value . "'", E_USER_NOTICE); + return; } else { $extra_headers[] = $param_value; @@ -108,99 +112,104 @@ function smarty_function_fetch($params, $template) } break; case "proxy_host": - if(!empty($param_value)) { + if (!empty($param_value)) { $proxy_host = $param_value; } break; case "proxy_port": - if(!preg_match('!\D!', $param_value)) { + if (!preg_match('!\D!', $param_value)) { $proxy_port = (int) $param_value; } else { - trigger_error("[plugin] invalid value for attribute '".$param_key."'",E_USER_NOTICE); + trigger_error("[plugin] invalid value for attribute '" . $param_key . "'", E_USER_NOTICE); + return; } break; case "agent": - if(!empty($param_value)) { + if (!empty($param_value)) { $agent = $param_value; } break; case "referer": - if(!empty($param_value)) { + if (!empty($param_value)) { $referer = $param_value; } break; case "timeout": - if(!preg_match('!\D!', $param_value)) { + if (!preg_match('!\D!', $param_value)) { $timeout = (int) $param_value; } else { - trigger_error("[plugin] invalid value for attribute '".$param_key."'",E_USER_NOTICE); + trigger_error("[plugin] invalid value for attribute '" . $param_key . "'", E_USER_NOTICE); + return; } break; default: - trigger_error("[plugin] unrecognized attribute '".$param_key."'",E_USER_NOTICE); + trigger_error("[plugin] unrecognized attribute '" . $param_key . "'", E_USER_NOTICE); + return; } } - if(!empty($proxy_host) && !empty($proxy_port)) { + if (!empty($proxy_host) && !empty($proxy_port)) { $_is_proxy = true; - $fp = fsockopen($proxy_host,$proxy_port,$errno,$errstr,$timeout); + $fp = fsockopen($proxy_host, $proxy_port, $errno, $errstr, $timeout); } else { - $fp = fsockopen($server_name,$port,$errno,$errstr,$timeout); + $fp = fsockopen($server_name, $port, $errno, $errstr, $timeout); } - if(!$fp) { - trigger_error("[plugin] unable to fetch: $errstr ($errno)",E_USER_NOTICE); + if (!$fp) { + trigger_error("[plugin] unable to fetch: $errstr ($errno)", E_USER_NOTICE); + return; } else { - if($_is_proxy) { + if ($_is_proxy) { fputs($fp, 'GET ' . $params['file'] . " HTTP/1.0\r\n"); } else { fputs($fp, "GET $uri HTTP/1.0\r\n"); } - if(!empty($host)) { + if (!empty($host)) { fputs($fp, "Host: $host\r\n"); } - if(!empty($accept)) { + if (!empty($accept)) { fputs($fp, "Accept: $accept\r\n"); } - if(!empty($agent)) { + if (!empty($agent)) { fputs($fp, "User-Agent: $agent\r\n"); } - if(!empty($referer)) { + if (!empty($referer)) { fputs($fp, "Referer: $referer\r\n"); } - if(isset($extra_headers) && is_array($extra_headers)) { - foreach($extra_headers as $curr_header) { - fputs($fp, $curr_header."\r\n"); + if (isset($extra_headers) && is_array($extra_headers)) { + foreach ($extra_headers as $curr_header) { + fputs($fp, $curr_header . "\r\n"); } } - if(!empty($user) && !empty($pass)) { - fputs($fp, "Authorization: BASIC ".base64_encode("$user:$pass")."\r\n"); + if (!empty($user) && !empty($pass)) { + fputs($fp, "Authorization: BASIC " . base64_encode("$user:$pass") . "\r\n"); } fputs($fp, "\r\n"); - while(!feof($fp)) { - $content .= fgets($fp,4096); + while (!feof($fp)) { + $content .= fgets($fp, 4096); } fclose($fp); - $csplit = preg_split("!\r\n\r\n!",$content,2); + $csplit = preg_split("!\r\n\r\n!", $content, 2); $content = $csplit[1]; - if(!empty($params['assign_headers'])) { - $template->assign($params['assign_headers'],preg_split("!\r\n!",$csplit[0])); + if (!empty($params['assign_headers'])) { + $template->assign($params['assign_headers'], preg_split("!\r\n!", $csplit[0])); } } } else { - trigger_error("[plugin fetch] unable to parse URL, check syntax",E_USER_NOTICE); + trigger_error("[plugin fetch] unable to parse URL, check syntax", E_USER_NOTICE); + return; } } else { $content = @file_get_contents($params['file']); if ($content === false) { - throw new SmartyException("{fetch} cannot read resource '" . $params['file'] ."'"); + throw new SmartyException("{fetch} cannot read resource '" . $params['file'] . "'"); } } @@ -210,5 +219,3 @@ function smarty_function_fetch($params, $template) return $content; } } - -?> \ No newline at end of file diff --git a/sources/include/smarty/libs/plugins/function.html_checkboxes.php b/sources/include/smarty/libs/plugins/function.html_checkboxes.php index 1866bc2..d786803 100644 --- a/sources/include/smarty/libs/plugins/function.html_checkboxes.php +++ b/sources/include/smarty/libs/plugins/function.html_checkboxes.php @@ -2,13 +2,12 @@ /** * Smarty plugin * - * @package Smarty + * @package Smarty * @subpackage PluginsFunction */ /** * Smarty {html_checkboxes} function plugin - * * File: function.html_checkboxes.php
    * Type: function
    * Name: html_checkboxes
    @@ -32,15 +31,17 @@ * - escape (optional) - escape the content (not value), defaults to true * * - * @link http://www.smarty.net/manual/en/language.function.html.checkboxes.php {html_checkboxes} - * (Smarty online manual) + * @link http://www.smarty.net/manual/en/language.function.html.checkboxes.php {html_checkboxes} + * (Smarty online manual) * @author Christopher Kvarme - * @author credits to Monte Ohrt + * @author credits to Monte Ohrt * @version 1.0 - * @param array $params parameters + * + * @param array $params parameters * @param object $template template object + * * @return string - * @uses smarty_function_escape_special_chars() + * @uses smarty_function_escape_special_chars() */ function smarty_function_html_checkboxes($params, $template) { @@ -58,8 +59,8 @@ function smarty_function_html_checkboxes($params, $template) $extra = ''; - foreach($params as $_key => $_val) { - switch($_key) { + foreach ($params as $_key => $_val) { + switch ($_key) { case 'name': case 'separator': $$_key = (string) $_val; @@ -89,7 +90,7 @@ function smarty_function_html_checkboxes($params, $template) if (method_exists($_sel, "__toString")) { $_sel = smarty_function_escape_special_chars((string) $_sel->__toString()); } else { - trigger_error("html_checkboxes: selected attribute contains an object of class '". get_class($_sel) ."' without __toString() method", E_USER_NOTICE); + trigger_error("html_checkboxes: selected attribute contains an object of class '" . get_class($_sel) . "' without __toString() method", E_USER_NOTICE); continue; } } else { @@ -101,7 +102,7 @@ function smarty_function_html_checkboxes($params, $template) if (method_exists($_val, "__toString")) { $selected = smarty_function_escape_special_chars((string) $_val->__toString()); } else { - trigger_error("html_checkboxes: selected attribute is an object of class '". get_class($_val) ."' without __toString() method", E_USER_NOTICE); + trigger_error("html_checkboxes: selected attribute is an object of class '" . get_class($_val) . "' without __toString() method", E_USER_NOTICE); } } else { $selected = smarty_function_escape_special_chars((string) $_val); @@ -116,7 +117,8 @@ function smarty_function_html_checkboxes($params, $template) case 'assign': break; - case 'strict': break; + case 'strict': + break; case 'disabled': case 'readonly': @@ -131,11 +133,11 @@ function smarty_function_html_checkboxes($params, $template) break; } - // omit break; to fall through! + // omit break; to fall through! default: - if(!is_array($_val)) { - $extra .= ' '.$_key.'="'.smarty_function_escape_special_chars($_val).'"'; + if (!is_array($_val)) { + $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"'; } else { trigger_error("html_checkboxes: extra attribute '$_key' cannot be an array", E_USER_NOTICE); } @@ -143,76 +145,79 @@ function smarty_function_html_checkboxes($params, $template) } } - if (!isset($options) && !isset($values)) - return ''; /* raise error here? */ + if (!isset($options) && !isset($values)) { + return ''; + } /* raise error here? */ $_html_result = array(); if (isset($options)) { - foreach ($options as $_key=>$_val) { + foreach ($options as $_key => $_val) { $_html_result[] = smarty_function_html_checkboxes_output($name, $_key, $_val, $selected, $extra, $separator, $labels, $label_ids, $escape); } } else { - foreach ($values as $_i=>$_key) { + foreach ($values as $_i => $_key) { $_val = isset($output[$_i]) ? $output[$_i] : ''; $_html_result[] = smarty_function_html_checkboxes_output($name, $_key, $_val, $selected, $extra, $separator, $labels, $label_ids, $escape); } } - if(!empty($params['assign'])) { + if (!empty($params['assign'])) { $template->assign($params['assign'], $_html_result); } else { return implode("\n", $_html_result); } - } -function smarty_function_html_checkboxes_output($name, $value, $output, $selected, $extra, $separator, $labels, $label_ids, $escape=true) { +function smarty_function_html_checkboxes_output($name, $value, $output, $selected, $extra, $separator, $labels, $label_ids, $escape = true) +{ $_output = ''; - + if (is_object($value)) { if (method_exists($value, "__toString")) { $value = (string) $value->__toString(); } else { - trigger_error("html_options: value is an object of class '". get_class($value) ."' without __toString() method", E_USER_NOTICE); + trigger_error("html_options: value is an object of class '" . get_class($value) . "' without __toString() method", E_USER_NOTICE); + return ''; } } else { $value = (string) $value; } - + if (is_object($output)) { if (method_exists($output, "__toString")) { $output = (string) $output->__toString(); } else { - trigger_error("html_options: output is an object of class '". get_class($output) ."' without __toString() method", E_USER_NOTICE); + trigger_error("html_options: output is an object of class '" . get_class($output) . "' without __toString() method", E_USER_NOTICE); + return ''; } } else { $output = (string) $output; } - + if ($labels) { if ($label_ids) { $_id = smarty_function_escape_special_chars(preg_replace('![^\w\-\.]!' . Smarty::$_UTF8_MODIFIER, '_', $name . '_' . $value)); $_output .= '
- \ No newline at end of file + diff --git a/sources/language/ar_SA/index.php b/sources/language/ar_SA/index.php index c8de97f..0b96c3e 100644 --- a/sources/language/ar_SA/index.php +++ b/sources/language/ar_SA/index.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/language/ar_SA/install.lang.php b/sources/language/ar_SA/install.lang.php index 6c429ee..37f8a68 100644 --- a/sources/language/ar_SA/install.lang.php +++ b/sources/language/ar_SA/install.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -46,14 +46,14 @@ $lang['Password [confirm]'] = 'كلمة المرور [confirm]'; $lang['verification'] = 'التحقق'; $lang['Need help ? Ask your question on Piwigo message board.'] = 'هل تحتاج لمساعده؟ يمكنك السؤال Piwigo لجنة الأسئلة في .'; $lang['Visitors will be able to contact site administrator with this mail'] = ' سيتمكن الزوار لاستخدام هذا البريد إلى الاتصال بالمسؤول عن الموقع'; -$lang['PHP 5 is required'] = 'مطلوب PHP 5 '; +$lang['PHP 5 is required'] = 'مطلوب PHP 5.2 '; $lang['It appears your webhost is currently running PHP %s.'] = 'PHP %s يبدوا أن المضيف يستخدم حاليا '; -$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'قد يحاول تبديل التكوين الخاص بك إلىPHP 5 عن طريق إنشاء أو تعديل ملف htaccess . Piwigo '; +$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'قد يحاول تبديل التكوين الخاص بك إلىPHP 5.2 عن طريق إنشاء أو تعديل ملف htaccess . Piwigo '; $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'ملاحظة يمكنك تغيير التكوين الخاص بك من نفسك وإعادة Piwigo بعد ذلك.'; -$lang['Try to configure PHP 5'] = 'PHP 5 محاولة تكوين '; +$lang['Try to configure PHP 5'] = 'PHP 5.2 محاولة تكوين '; $lang['Sorry!'] = 'مـعـذرة !1'; -$lang['Piwigo was not able to configure PHP 5.'] = ' Piwigo غير قادر على تكوين PHP 5'; -$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'تحقق من مزود الاستضافة حول دعمه لـ PHP 5'; +$lang['Piwigo was not able to configure PHP 5.'] = ' Piwigo غير قادر على تكوين PHP 5.2'; +$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'تحقق من مزود الاستضافة حول دعمه لـ PHP 5.2'; $lang['Hope to see you back soon.'] = 'نأمل أن نرى عودتك إلى هنا قريبا'; $lang['Congratulations, Piwigo installation is completed'] = 'تم بحمد الله تثبيت معرضPiwigo بنجاح ، مبروك '; $lang['An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning : database.inc.php must only contain what is in the textarea, no line return or space character)'] = 'حل آخر هو نسخ النص في المربع أعلاه ولصقه في ملف"local/config/database.inc.php" (تحذير : database.inc.php يجب أن تحتوي فقط ما هو موجود في النص، الخط أو حرف مسافة)'; @@ -64,5 +64,4 @@ $lang['Don\'t hesitate to consult our forums for any help : %s'] = 'لاتترد $lang['Just another Piwigo gallery'] = 'معرض آخر من Piwigo'; $lang['Welcome to my photo gallery'] = 'مرحباً بك في معرض الصور'; $lang['Welcome to your new installation of Piwigo!'] = 'مرحبا بكم في التثبيت الجديد من Piwigo!'; -$lang['localhost or other, supplied by your host provider'] = 'المضيف المحلي او المقدم من قبل موفر الخدمة الخاص بك'; -?> \ No newline at end of file +$lang['localhost or other, supplied by your host provider'] = 'المضيف المحلي او المقدم من قبل موفر الخدمة الخاص بك'; \ No newline at end of file diff --git a/sources/language/ar_SA/upgrade.lang.php b/sources/language/ar_SA/upgrade.lang.php index 56117b7..68cf34e 100644 --- a/sources/language/ar_SA/upgrade.lang.php +++ b/sources/language/ar_SA/upgrade.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/language/az_AZ/common.lang.php b/sources/language/az_AZ/common.lang.php index 8096e5f..ee335ec 100644 --- a/sources/language/az_AZ/common.lang.php +++ b/sources/language/az_AZ/common.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -22,7 +22,7 @@ // +-----------------------------------------------------------------------+ /* Language Name: Azərbaycanca [AZ] -Version: 2.5.0 +Version: 2.8.2 Language URI: http://piwigo.org/ext/extension_view.php?eid=618 Author: Piwigo team Author URI: http://piwigo.org diff --git a/sources/language/bg_BG/admin.lang.php b/sources/language/bg_BG/admin.lang.php index b8625e9..5066ad5 100644 --- a/sources/language/bg_BG/admin.lang.php +++ b/sources/language/bg_BG/admin.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -981,4 +981,14 @@ $lang['No and unlock sub-albums'] = 'Не и отключване на под-а $lang['Mail address is mandatory for registration'] = 'Имейл адресът е задължителна за регистрация'; $lang['Impossible to deactivate the default theme.'] = 'Невъзможно е деактивиране на темата по подразбиране.'; $lang['Empty caddie'] = 'Изпразване на колекцията'; -$lang['Upload in progress'] = 'Качването е в ход'; \ No newline at end of file +$lang['Upload in progress'] = 'Качването е в ход'; +$lang['Recipients'] = 'Получатели'; +$lang['Orphans'] = 'Самотни'; +$lang['No user is permitted to see this private album'] = 'Никой потребител не е избран да вижда този личен албум'; +$lang['For security reason, authentication keys do not work for administrators.'] = 'От съображения за сигурност, уникалните ключове няма да работят за администратори.'; +$lang['Each email sent will contain its own automatic authentication key on links, valid for %s.'] = 'Всеки изпратен имейл ще съдържа свой уникален ключ към линковете, валиден за %s. +'; +$lang['Delete %d orphan photos'] = 'Изтриване %d самотни снимки'; +$lang['No recipient selected'] = 'Не е избран получател'; +$lang['Edit user'] = 'Редакция на потребител'; +$lang['Y Repeat'] = 'Y Повторение'; \ No newline at end of file diff --git a/sources/language/bg_BG/common.lang.php b/sources/language/bg_BG/common.lang.php index d1d94fe..5f32b4c 100644 --- a/sources/language/bg_BG/common.lang.php +++ b/sources/language/bg_BG/common.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -22,7 +22,7 @@ // +-----------------------------------------------------------------------+ /* Language Name: Български [BG] -Version: 2.7.1 +Version: 2.8.2 Language URI: http://piwigo.org/ext/extension_view.php?eid=510 Author: Piwigo team Author URI: http://piwigo.org @@ -444,4 +444,5 @@ $lang['month']['5'] = 'май'; $lang['month']['6'] = 'юни'; $lang['month']['7'] = 'юли'; $lang['month']['8'] = 'август'; -$lang['month']['9'] = 'септември'; \ No newline at end of file +$lang['month']['9'] = 'септември'; +$lang['Your authentication key is no longer valid.'] = 'Вашият ключ да верификация вече не е активен.'; \ No newline at end of file diff --git a/sources/language/bg_BG/help/group_list.html b/sources/language/bg_BG/help/group_list.html new file mode 100644 index 0000000..5811bb0 --- /dev/null +++ b/sources/language/bg_BG/help/group_list.html @@ -0,0 +1,22 @@ +

Списък с групи

+ +

Тук се управляват групите.

+ +

Добави група

+ +

Администраторите могат да добавят групи.

+ +

Групи

+ +

За всяка група могат да се прилагат следните действия:

+ + +
    +
  • управление на потребителите (Администратори » Потребители » Управление)
    • +
  • управление на правата за достъп за даване или отнемане на достъпа до лични албуми.
    • +
  • изтриване на група (изисква потвърждение)
    • +
  • превключване на статус "по подразбиране" (изисква потвърждение)
    • +
+ +

Групи по подразбиране

+

Това са групи, към които се асоциират автоматично новите потребители когато се регистрират, или когато се създават от администратор.

diff --git a/sources/language/bg_BG/help/help_groups.html b/sources/language/bg_BG/help/help_groups.html new file mode 100644 index 0000000..ebcaa3b --- /dev/null +++ b/sources/language/bg_BG/help/help_groups.html @@ -0,0 +1,11 @@ +

Групите са най-удобния начин за задаване на права за списък от потребители.

+ +

Саздай групи в Администрация » Потребители +» Групи и добавете потребители към тях +в Администрация » Потребители » +Управление.

+ +

Потребителя може да се добави към няколко групи. Разрешителното има предимство пред +забраната: Ако потребителя "Иван" е член на групи "семейство" и "приятели", а само +групата "семейство" може да вижда албум "Нова година 2008", то тогава "Иван" ще може +да виждат този албум.

\ No newline at end of file diff --git a/sources/language/bg_BG/help/help_misc.html b/sources/language/bg_BG/help/help_misc.html new file mode 100644 index 0000000..ebea64d --- /dev/null +++ b/sources/language/bg_BG/help/help_misc.html @@ -0,0 +1,7 @@ +

Веднъж съдали галерия вие може да конфигурирата посетителите

    +
  • Настройки се намират в Администрация » Конфигуриране » Опции tab Гости Настройки
    • +
  • Облик на темата е в Администрация » Конфигуриране » Теми
    • +
  • Настройки на език са в Администрация » Конфигуриране » Езици
+ По подразбиране всеки нов потребител ще вижда зададени тези настройки. +

+

Ако имате въпроси, Piwigo общността е на ваше разположение на своя форум.

\ No newline at end of file diff --git a/sources/language/bg_BG/install.lang.php b/sources/language/bg_BG/install.lang.php index f8a4f11..e8c393d 100644 --- a/sources/language/bg_BG/install.lang.php +++ b/sources/language/bg_BG/install.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/language/bg_BG/upgrade.lang.php b/sources/language/bg_BG/upgrade.lang.php index 4bbf012..1396814 100644 --- a/sources/language/bg_BG/upgrade.lang.php +++ b/sources/language/bg_BG/upgrade.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/language/bn_IN/common.lang.php b/sources/language/bn_IN/common.lang.php index cb66ca7..e19b7c7 100644 --- a/sources/language/bn_IN/common.lang.php +++ b/sources/language/bn_IN/common.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -22,7 +22,7 @@ // +-----------------------------------------------------------------------+ /* Language Name: বাংলা[IN] -Version: 2.5.0 +Version: 2.8.2 Language URI: http://piwigo.org/ext/extension_view.php?eid=657 Author: Piwigo team Author URI: http://piwigo.org @@ -61,5 +61,24 @@ $lang['... or please deactivate this message, I will find my way by myself'] = ' $lang['A comment on your site'] = 'আপনার সাইটে একটি মন্তব্য'; $lang['About Piwigo'] = 'পিউইগো বিষয়ক'; $lang['About'] = 'বিষয়ক'; - +$lang['Date'] = 'তারিখ'; +$lang['day'][0] = 'রবিবার'; +$lang['day'][1] = 'সোমবার'; +$lang['day'][2] = 'মঙ্গলবার'; +$lang['day'][3] = 'বুধবার'; +$lang['day'][4] = 'বৃহস্পতিবার'; +$lang['day'][5] = 'শুক্রবার'; +$lang['day'][6] = 'শনিবার'; +$lang['month'][10] = 'অক্টোবর'; +$lang['month'][11] = 'নভেম্বর'; +$lang['month'][12] = 'ডিসেম্বর'; +$lang['month'][1] = 'জানুয়ারী'; +$lang['month'][2] = 'ফেব্রুয়ারি'; +$lang['month'][3] = 'মার্চ'; +$lang['month'][4] = 'এপ্রিল'; +$lang['month'][5] = 'মে'; +$lang['month'][6] = 'জুন'; +$lang['month'][7] = 'জুলাই'; +$lang['month'][8] = 'অগাস্ট'; +$lang['month'][9] = 'সেপ্টেম্বর'; ?> \ No newline at end of file diff --git a/sources/language/br_FR/admin.lang.php b/sources/language/br_FR/admin.lang.php index 28eae88..52fbbf4 100755 --- a/sources/language/br_FR/admin.lang.php +++ b/sources/language/br_FR/admin.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -42,8 +42,8 @@ $lang['%d anomaly has been corrected.'] = '%d direizhder a zo bet reizhet.'; $lang['%d anomaly has been detected.'] = '%d direizhder a zo bet detektet.'; $lang['%d anomaly has been ignored.'] = '%d direizhder n\'eo ket bet reizhet.'; $lang['%d anomaly has not been corrected.'] = '%d direizhder n\'eo ket bet posubl reizhañ.'; -$lang['%d guest'] = '%d gweladenner'; -$lang['%d guests'] = '%d gweladenner'; +$lang['%d guest'] = '%d ostiziad'; +$lang['%d guests'] = '%d ostiziad'; $lang['%d hour'] = '%d eurvezh'; $lang['%d hours'] = '%d eurvezh'; $lang['%d member'] = '%d ezel'; @@ -96,7 +96,7 @@ $lang['group "%s" updated'] = 'strollad "%s" hizivaet'; $lang['This is a major update, with new exciting features.'] = 'Un hizivadur meur eo, gant arc\'hweladurioù nevez a-feson.'; $lang['This is a minor update, with only bug corrections.'] = 'Un hizivadur bihan eo, gant reizhadurioù drein hepken.'; $lang['Update photos information'] = 'Hizivaat titouroù al luc\'hskeudenn'; -$lang['Two updates are available'] = 'Daou hizivadur hergerzh'; +$lang['Two updates are available'] = 'Daou hizivadur hegerzh'; $lang['Update All'] = 'Hizivaat pep tra'; $lang['Update Complete'] = 'Echu eo an hizivadur'; $lang['Update albums informations'] = 'Hizivaat titouroù ar rummadoù'; @@ -170,7 +170,7 @@ $lang['(this tag will be deleted)'] = '(ar merker-mañ a vo dilemet)'; $lang['Delete this language'] = 'Dilemel ar yezh-mañ'; $lang['Delete this theme'] = 'Dilemel an tem-mañ'; $lang['Deleted on'] = 'Dilemet d\'an'; -$lang['%u users have automatic permission because they belong to a granted group.'] = 'implijerien %u o deus an aotre emgefreek peogwir int e-barzh ur strollad aotreet.'; +$lang['%u users have automatic permission because they belong to a granted group.'] = '%u implijer o deus an aotre emgefreek peogwir int e-barzh ur strollad aotreet.'; $lang['(filtered from %s total users)'] = '(silet etre %s implijer en holl)'; $lang['A locked gallery is only visible to administrators'] = 'Ur palier prennet a vez gwelet gant ar verourien hepken'; $lang['A new version of Piwigo is available.'] = 'Ur stumm nevez Piwigo a zo hegerz'; @@ -330,7 +330,7 @@ $lang['Complementary mail content'] = 'Endalc\'h ar bostel evit klokaat'; $lang['Confirm merge'] = 'Kadarnaat ar c\'hendeuzadur'; $lang['Check for upgrade'] = 'Sell ma vez un hizivadur'; $lang['Check for upgrade failed for unknown reasons.'] = 'Ne oa ket posubl da sellet ma vez un hizivadur, ha n\'eo ket anavezet an abeg.'; -$lang['Check all'] = 'Gwiriañ pep tra'; +$lang['Check all'] = 'Diuzañ pep tra'; $lang['Check automatic corrections'] = 'Gwiriañ ar reizhadurioù emgefreek'; $lang['Check integrity'] = 'Gwiriadur an anterinded'; $lang['Choose an option'] = 'Dibabit un dibarzh'; @@ -355,12 +355,12 @@ $lang['Default photos order'] = 'Urzh al luc\'hskeudennoù dre ziouer'; $lang['Default user cannot be deleted'] = 'N\'haller ket dilemel an arveriad dre ziouer '; $lang['Default user does not exist'] = 'An arveriad dre ziouer n\'eus ket anezhañ'; $lang['Delete Representant'] = 'Dilemel skeudennig ar rummad'; -$lang['display maximum informations (added albums and photos, deleted albums and photos)'] = 'Skrammañ titouroù uc\'hek (rummadoù ha luc\'hskeudennoù ouzhpennet, uc\'hek (rummadoù ha luc\'hskeudennoù dilemet)'; -$lang['Include display of recent photos grouped by dates'] = 'Skrammañ al luc\'hskeudennoù nevez e strolladoù dre zeiziad'; +$lang['display maximum informations (added albums and photos, deleted albums and photos)'] = 'Diskouez titouroù uc\'hek (rummadoù ha luc\'hskeudennoù ouzhpennet, uc\'hek (rummadoù ha luc\'hskeudennoù dilemet)'; +$lang['Include display of recent photos grouped by dates'] = 'Diskouez al luc\'hskeudennoù nevez e strolladoù dre zeiziad'; $lang['Default display'] = 'Skrammañ dre ziouer'; -$lang['Display options'] = 'Dibarzhioù skrammañ'; +$lang['Display options'] = 'Diskouez an dibarzhioù'; $lang['No display'] = 'Skrammadur ebet'; -$lang['display'] = 'Skrammañ'; +$lang['display'] = 'Diskouez'; $lang['Link all album photos to some existing albums'] = 'Liammañ pep luc\'hskeudenn er rummad da rummadoù a zo anezho'; $lang['Tag "%s" already exists'] = 'Bez ez eus ar merker "%s" anezhañ dija.'; $lang['This site already exists'] = 'Bez ez eus al lec\'hienn anezhañ dija.'; @@ -462,4 +462,478 @@ $lang['Find a new representant by random'] = 'Kavout ur skeudennig dre zegouezh $lang['Optimizations have been completed with some errors.'] = 'Ar gwellekadurioù a zo bet graet gant fazioù.'; $lang['an error happened'] = 'Ur fazi a zo c\'hoarvezet'; $lang['errors during synchronization'] = 'Fazi e-pad ar sinkroneladur'; -$lang['File/directory read error'] = 'Fazi e-pad lenn ar restr/kavlec\'h'; \ No newline at end of file +$lang['File/directory read error'] = 'Fazi e-pad lenn ar restr/kavlec\'h'; +$lang['Grant selected groups'] = 'Dereiñ ar strolladoù diuzet'; +$lang['Grant selected users'] = 'Dereiñ an implijerien diuzet'; +$lang['Permission granted'] = 'Aotre dereet'; +$lang['Permission granted for groups'] = 'Aotre dereet evit strolladoù'; +$lang['Permission granted for users'] = 'Aotre dereet evit implijerien'; +$lang['Permission granted thanks to a group'] = 'Aotre dereet dre ur strollad'; +$lang['Go to %s or %s for more informations'] = 'Mont da %s pe %s evit muioc\'h titouroù'; +$lang['Instructions to use Piwigo'] = 'Kemennoù evit implij Piwigo'; +$lang['Piwigo Uploader'] = 'Ezkarger Piwigo'; +$lang['Piwigo export plugin for Aperture'] = 'Lugant ezporzhiañ Piwigo evit Aperture'; +$lang['Piwigo export plugin for iPhoto'] = 'Lugant ezporzhiañ Piwigo evit iPhoto'; +$lang['Piwigo for Android'] = 'Piwigo evit Android'; +$lang['Piwigo for iOS (iPhone, iPad, iPod Touch)'] = 'Piwigo evit iOS (iPhone, iPad, iPod Touch)'; +$lang['Piwigo publish plugin for Shotwell'] = 'Lugant embann Piwigo evit Shotwell'; +$lang['Piwigo publish plugin for digiKam'] = 'Lugant embann Piwigo evit digiKam'; +$lang['The name of a group must not contain " or \' or be empty.'] = 'Arabat da anv ur strollad enderc\'hel " pe \', pe bezañ goullo.'; +$lang['The name of an album must not be empty'] = 'Arabat da anv ur rummad bezañ goullo'; +$lang['The name of directories and files must be composed of letters, numbers, "-", "_" or "."'] = 'Ret eo da anv ar restroù enderc\'hel lizherennoù, niverennoù, "-", "_" pe "." hepken'; +$lang['The number of comments a page must be between 5 and 50 included.'] = 'An niver a evezhiadennoù a rank bezañ etre 5 ha 50 (e-barzh).'; +$lang['The original image quality must be a number between %d and %d'] = 'Perzhded orin al luc\'hskeudenn a rank bezañ un niver etre %d ha %d'; +$lang['You need to confirm deletion'] = 'Ret eo deoc\'h kadarnaat an dilamadur'; +$lang['height must be a number superior to'] = 'An uhelder a rank bezañ un niver brasoc\'h eget'; +$lang['width must be a number superior to'] = 'Al ledander a rank bezañ un niver brasoc\'h eget'; +$lang['The original maximum height must be a number between %d and %d'] = 'Uhelder uc\'hek orin a rank bezañ un niver etre %d ha %d'; +$lang['The original maximum width must be a number between %d and %d'] = 'Ledander uc\'hek orin a rank bezañ un niver etre %d ha %d'; +$lang['guest'] = 'ostiziad'; +$lang['Group name'] = 'Anv ar strollad'; +$lang['Groups'] = 'Strolladoù'; +$lang['Permission denied'] = 'Difennet'; +$lang['Manage Permissions'] = 'Merañ an aotreoù'; +$lang['Manage permissions for group "%s"'] = 'Merañ aotreoù ar strollad "%s"'; +$lang['Manage permissions for user "%s"'] = 'Merañ aotreoù an implijer "%s"'; +$lang['Permission management'] = 'Merañ an aotreoù'; +$lang['Permissions'] = 'Aotreoù'; +$lang['Group management'] = 'Merañ ar strolladoù'; +$lang['Hit'] = 'skor'; +$lang['Last hit'] = 'skor diwezhañ'; +$lang['Purge search history'] = 'Dilemel istor an enklaskoù'; +$lang['Searching...'] = 'Enklask…'; +$lang['Type in a search term'] = 'Lakait ger-alc\'hwez hor enklask'; +$lang['History'] = 'Roll-istor '; +$lang['Purge history detail'] = 'Dilemel munudoù ar roll-istor'; +$lang['Help Me'] = 'Sikour'; +$lang['Hide'] = 'Kuzhat'; +$lang['hide details'] = 'kuzhat ar munudoù'; +$lang['High definition'] = 'HD (despizadur uhel)'; +$lang['High definition enabled'] = 'HD (despizadur uhel) gweredekaet'; +$lang['Maximum width'] = 'Ledander uc\'hek'; +$lang['Minimum width'] = 'Ledander izek'; +$lang['Width'] = 'Ledander'; +$lang['width & height'] = 'Ledander hag uhelder'; +$lang['Height'] = 'Uhelder'; +$lang['Maximum height'] = 'Uhelder uc\'hek'; +$lang['Minimum height'] = 'Uhelder izek'; +$lang['Guest cannot be deleted'] = 'Ne c\'hell ket an ostiziad bezañ dilemet'; +$lang['The following tag was deleted'] = 'Dilemet eo bet ar merker a-heul'; +$lang['delete'] = 'dilemel'; +$lang['delete photo'] = 'dilemel al luc\'hskeudenn'; +$lang['deleted'] = 'dilemet'; +$lang['Operating system'] = 'Reizhiad korvoiñ'; +$lang['Rating'] = 'Notennoù'; +$lang['Rating by guests'] = 'Notennoù roet gant ostiziaded'; +$lang['Guest Settings'] = 'Arventennoù an ostiziad'; +$lang['Parameter'] = 'Arventennoù'; +$lang['Save Settings'] = 'Enrollañ an arventennoù'; +$lang['Settings'] = 'Arventennoù'; +$lang['The settings for the guest are from the %s user'] = 'An arventennoù evit an ostiziad a teu eus implijer %s'; +$lang['Guests'] = 'Ostiziaded'; +$lang['Hello'] = 'Demat'; +$lang['Hello,'] = 'Demat,'; +$lang['Install'] = 'Staliañ'; +$lang['Install on your computer,'] = 'Staliañ war hoc\'h urzhiataer,'; +$lang['Installed Languages'] = 'Yezhoù staliet'; +$lang['Installed Themes'] = 'Temoù staliet'; +$lang['Uninstall'] = 'Distaliañ'; +$lang['Impossible to delete this theme. Other themes depends on it: %s'] = 'N\'haller ket gweredekaat an tem-se peogwir temoù-all a zo e dalc\'h anezhañ: %s'; +$lang['Impossible to activate this theme, the parent theme is missing: %s'] = 'N\'haller ket gweredekaat an tem-se peogwir e vank an tem-tad: %s'; +$lang['Impossible to deactivate the default theme.'] = 'N\'haller ket diweredekaat an tem dre ziouer.'; +$lang['Impossible to deactivate this language, you need at least one language.'] = 'N\'haller ket diweredekaat ar yezh-se, ur yezh ho po ezhom d\'an neubeutañ.'; +$lang['Impossible to deactivate this theme, you need at least one theme.'] = 'N\'haller ket diweredekaat an tem-se, un tem ho po ezhom d\'an neubeutañ.'; +$lang['Hoverbox display'] = 'Diskwel boest-gournij'; +$lang['You have specified $conf[\'order_by\'] in your local configuration file, this parameter in deprecated, please remove it or rename it into $conf[\'order_by_custom\'] !'] = 'Lakaet ho peus $conf[\'order_by\'] en ho restr kefluniadur lec\'hel, an arventenn-mañ a zo diamzeret, dilemit anezhañ pe cheñchit da $conf[\'order_by_custom\'] !'; +$lang['You can\'t define a default photo order because you have a custom setting in your local configuration.'] = 'Ne c\'hellit ket termenañ urzh al luc\'hskeudennoù dre ziouer peogwir ez eus arventennoù personelaet en ho kefluniadur lec\'hel.'; +$lang['Use the default photo sort order'] = 'Implij urzh rummañ al luc\'skeudennoù dre ziouer'; +$lang['default'] = 'dre ziouer'; +$lang['cancel manual order'] = 'Nullañ an urzh dornel'; +$lang['apply automatic sort order'] = 'Rummañ gant urzh emgefreek'; +$lang['automatic order'] = 'urzh emgefreek'; +$lang['Images manual order was saved'] = 'Urzh dornel al luc\'hskeudennoù a zo bet enrollet'; +$lang['Manage photo ranks'] = 'Urzh rummañ al luc\'hskeudennoù'; +$lang['Manual order'] = 'Urzh dornel'; +$lang['Save manual order'] = 'Enrollañ an urzh dornel'; +$lang['Save order'] = 'Enrollañ an urzh'; +$lang['manual order'] = 'urzh dornel'; +$lang['Image id'] = 'Anaouder al luc\'hskedenn'; +$lang['If you encounter problems or have any question, please send a message to'] = 'M\'ho peus kudennoù pe goulennoù, kasit ur c\'hemennad da'; +$lang['[NBM] Problems or questions'] = '[NBM] Kudennoù pe goulennoù'; +$lang['If no HD is available and if the current websize is bigger than resize dimensions, Piwigo will move it as HD and create a downsized websize photo from it.'] = 'Ma n\'eus stumm HD (despizadur uhel) hegerzh ebet, ha ment a-vremañ a zo brasoc\'h eget hini admentet, Piwigo a zilec\'ho anezhañ evel HD hag a grouo ul luc\'hskeudenn bihan gantañ.'; +$lang['Image Quality'] = 'Perzhded al luc\'hskeudenn'; +$lang['Ignore All'] = 'Leuskel pep tra'; +$lang['Ignore selected anomalies'] = 'Leuskel direizhderioù diuzet'; +$lang['IP'] = 'IP'; +$lang['Order of menubar items has been updated successfully.'] = 'Urzh lañserioù er barrenn a zo bet hizivaet'; +$lang['Show menubar'] = 'Diskouez barrenn al lañserioù'; +$lang['I decide to update anyway'] = 'Divizet am eus da hizivaat evelkent'; +$lang['Hour'] = 'Eur'; +$lang['Learn more'] = 'Gouzout muioc\'h'; +$lang['Level 0'] = '---'; +$lang['Visit Piwigo project website'] = 'Gweladenniñ lec\'hienn raktres Piwigo'; +$lang['Visit language site'] = 'Gweladenniñ lec\'hienn ar yezh'; +$lang['Visit plugin site'] = 'Gweladenniñ lec\'hienn al lugant'; +$lang['Visit theme site'] = 'Gweladenniñ lec\'hienn an tem'; +$lang['Visited %d times'] = 'Gweladennet %d gwech'; +$lang['Last visit on %s, %s.'] = 'Gweladenn diwezhañ d\'ar %s, %s.'; +$lang['[%s] Visit album %s'] = '[%s] Gweladenn rummad %s'; +$lang['Prepared time for list of users to send mail is limited. Others users are not listed.'] = 'Ur bevenn-amzer ez eus evit prientiñ roll ar posteloù da gas d\'an implijerien. An implijerien-all n\'int ket er roll.'; +$lang['Last send'] = 'An hini diwezhañ kaset'; +$lang['Mail sent to %s [%s].'] = 'Postel kaset da %s [%s].'; +$lang['No mail to send.'] = 'N\'eus postel ebet da gas.'; +$lang['Last revisions'] = 'Saveteadennoù diwezhañ'; +$lang['Last import'] = 'Enporzh diwezhañ'; +$lang['Languages'] = 'Yezhoù'; +$lang['Language has been successfully installed'] = 'Staliet mat eo bet ar yezh'; +$lang['Theme has been successfully installed'] = 'Staliet mat eo bet an tem'; +$lang['Uninstalled Plugins'] = 'Lugantoù distaliet'; +$lang['Landscape'] = 'Gweledva'; +$lang['Keep in touch with Piwigo project, subscribe to Piwigo Announcement Newsletter. You will receive emails when a new release is available (sometimes including a security bug fix, it\'s important to know and upgrade) and when major events happen to the project. Only a few emails a year.'] = 'Chom e darempred gant raktres Piwigo, koumanantit al lizher-kelaouiñ Piwigo. Posteloù ho po pa vo ur stumm Piwigo nevez (a-wechoù gant reizhadur un draen surentez, e vez pouezhus gouzout diwar-benn un hizivadur) ha pa c\'hoarvez darvoudoù meur gant ar raktres. Un nebeud posteloù er boavezh hepken.'; +$lang['Invert'] = 'Eilpennañ'; +$lang['Metadata synchronized from file'] = 'Metaroadennoù sinkronelaet eus ar restr'; +$lang['Synchronize'] = 'Sinkronelaat'; +$lang['Synchronize metadata'] = 'Sinkronelaat ar metaroadennoù'; +$lang['photos informations synchronized with files metadata'] = 'titouroù al luc\'hskeudenn sinkronelaet gant metaroadenn ar restroù'; +$lang['Informations'] = 'Titour'; +$lang['Modify information'] = 'Cheñch titour'; +$lang['Information data registered in database'] = 'Bank titouroù enrollet en diaz roadennoù'; +$lang['albums added in the database'] = 'rummadoù lakaet en diaz roadennoù'; +$lang['photos added in the database'] = 'luc\'hskeudennoù lakaet en diaz roadennoù'; +$lang['photos deleted from the database'] = 'luc\'hskeudennoù dilemet en diaz roadennoù'; +$lang['Include history data (Warning: server memory limit may be exceeded)'] = 'Endelc\'her ar roll-istor (diwallit: memor ar servijer a c\'hellfe bezañ dic\'hlannet)'; +$lang['Save visits in history for'] = 'Enrollañ gweladennoù en istor evit'; +$lang['Purge history summary'] = 'Dilemel diverradenn ar roll-istor'; +$lang['Inactive Themes'] = 'Temoù anoberiek'; +$lang['Inactive Plugins'] = 'Lugantoù anoberiek'; +$lang['Inactive Languages'] = 'Yezhoù anoberiek'; +$lang['Make this language available to users'] = 'Lakaat ar yezh-se e kerz an implijerien'; +$lang['Make this theme available to users'] = 'Lakaat an tem-se e kerz an implijerien'; +$lang['Maintenance'] = 'Kas en-dro'; +$lang['Mail content'] = 'Endalc\'had ar bostel'; +$lang['Mail theme'] = 'Tem ar bostel'; +$lang['Main Page'] = 'Penn-bajenn'; +$lang['Mail address is mandatory for registration'] = 'Ret eo lakaat ur bostel evit en em enrollañ'; +$lang['Registered on %s, %s.'] = 'Enrollet d\'ar %s, %s.'; +$lang['registered users'] = 'Implijerien enrollet'; +$lang['registration date'] = 'deiziat enrollañ'; +$lang['Lock'] = 'Prennañ'; +$lang['Lock albums'] = 'Prennañ ar rummadoù'; +$lang['Locked'] = 'Prennet'; +$lang['Linked albums'] = 'Rummadoù liammet'; +$lang['List'] = 'Listenn'; +$lang['Loading...'] = 'O kargañ'; +$lang['Local'] = 'Lec\'hel'; +$lang['Represents'] = 'a zo skeudennig evit'; +$lang['Thumbnail'] = 'Skeudennig'; +$lang['Representant'] = 'Skeudennig ar rummad'; +$lang['Representation of albums'] = 'Skeudennig ar rummad'; +$lang['Representative'] = 'Skeudennig ar rummad'; +$lang['randomly represented'] = 'Skeudennig ar rummad dargouezhek'; +$lang['singly represented'] = 'Skeudennig ar rummad ratreet'; +$lang['This album contains %d photos, added on %s.'] = '%d luc\'hskeudenn ez eus er rummad-mañ, lakaet d\'ar %s.'; +$lang['This album contains no photo.'] = 'N\'eus luc\'hskeudenn ebet er rummad-se'; +$lang['You cannot move an album in its own sub album'] = 'N\'eo ket posubl lakaat ur rummad en e iz-rummad'; +$lang['Link all album photos to a new album'] = 'Liammañ pep luc\'hskeudenn er rummad d\'ur rummad nevez'; +$lang['Level 2'] = 'Mignoned'; +$lang['Level 4'] = 'Familh'; +$lang['Level 8'] = 'Merourien'; +$lang['Level 1'] = 'Darempredoù'; +$lang['Edit user'] = 'Aozañ implijer'; +$lang['Each email sent will contain its own automatic authentication key on links, valid for %s.'] = 'E pep postel kaset e vo un alc\'hwezh dilesa emgefreek en ul liamm, talvoudek evit %s.'; +$lang['For security reason, authentication keys do not work for administrators.'] = 'Evit abegoù surentez, ne za ket en-dro an alc\'hwezhioù dilesa evit ar merourien.'; +$lang['Delete %d orphan photos'] = 'Dilemel %d luc\'hskeudenn emzivat'; +$lang['Orphan tags deleted'] = 'Merkerioù emzivat dilemet'; +$lang['Orphans'] = 'Emzivaded'; +$lang['You have %d orphan tags: %s.'] = '%d merkerioù emzivat ho peus : %s.'; +$lang['Menu Management'] = 'Lañserioù'; +$lang['Original Size'] = 'Ment orin'; +$lang['Original file : %s'] = 'Restr orin : %s'; +$lang['Maximum file size: %sB.'] = 'ment uc\'hek ar rest: %sB.'; +$lang['Manage authorizations for selected albums'] = 'Merañ aotreoù ar rummadoù diuzet'; +$lang['Manage photos'] = 'Merañ al luc\'hskeudennoù'; +$lang['Manage tags'] = 'Merañ ar merkerioù'; +$lang['Manage this set of %d photos'] = 'Merañ an %d luc\'hskeudenn-se'; +$lang['manage album photos'] = 'Merañ luc\'hskeudennoù ar rummad'; +$lang['manage sub-albums'] = 'Merañ an iz-rummadoù'; +$lang['Manage the members'] = 'Merañ an izili'; +$lang['Members'] = 'Izili'; +$lang['No members to manage'] = 'Ezel ebet da verañ'; +$lang['Manage'] = 'Merañ'; +$lang['Photo %s of %s'] = 'Luc\'hskeudenn %s etre %s'; +$lang['wrong filename'] = 'anv-restr diwiriek'; +$lang['Month'] = 'Miz'; +$lang['Name'] = 'Anv'; +$lang['New name'] = 'Anv nevez'; +$lang['New tag'] = 'Merker nevez'; +$lang['New parent album'] = 'Rummad-vamm nevez'; +$lang['Parent album'] = 'Rummad-vamm'; +$lang['User %s [%s] added.'] = 'Implijer %s [%s] ouzhpennet.'; +$lang['New photos added'] = 'Luc\'hskeudennoù nevez ouzhpennet'; +$lang['New photos were added'] = 'Luc\'hskeudennoù nevez a zo bet ouzhpennet'; +$lang['Tag "%s" was added'] = 'Ar merker "%s" a zo bet ouzhpennet'; +$lang['User %s added'] = 'Implijer %s ouzhpennet'; +$lang['group "%s" added'] = 'strollad "%s" ouzhpennet'; +$lang['added'] = 'lakaet ouzhpenn'; +$lang['first photo added on %s'] = 'luc\'hskeudenn kentañ ouzhpennet d\'ar %s'; +$lang['user "%s" added'] = 'implijer "%s" ouzhpennet'; +$lang['Name of the duplicate'] = 'Anv an eilad'; +$lang['Tag "%s" is now a duplicate of "%s"'] = 'Merker "%s" a zo bremañ un eilad eus "%s"'; +$lang['Move'] = 'Dilec\'hiañ'; +$lang['Move albums'] = 'Dilec\'hiañ ar rummadoù'; +$lang['Move to album'] = 'Dilec\'hiañ d\'ar rummad'; +$lang['Remove all filters'] = 'Tennañ an holl siloù'; +$lang['remove author'] = 'tennañ an oberour'; +$lang['remove tags'] = 'tennañ ar merkerioù'; +$lang['remove this filter'] = 'tennañ ar sil-se'; +$lang['remove title'] = 'tennañ an titl'; +$lang['User "%s" created with "%s" like password'] = 'Implijer "%s" krouet gant ar ger-tremen "%s"'; +$lang['Password confirmation is missing. Please confirm the chosen password.'] = 'Kadarnaat ar ger-tremen a vank. Kadarnait ar ger-tremen dibabet.'; +$lang['Password is missing. Please enter the password.'] = 'Ar ger-tremen a vank. Lakait ar ger-tremen.'; +$lang['Missing Plugins'] = 'Lugantoù a vank'; +$lang['Miscellaneous'] = 'Liesseurt'; +$lang['Minimum privacy level'] = 'Live prevezded bihanañ'; +$lang['Privacy level'] = 'Live prevezded'; +$lang['Privacy level set to "%s"'] = 'Live prevezded lakaet da "%s"'; +$lang['include photos with lower privacy level'] = 'endelc\'her luc\'hskeudennoù gant ul live prevezded bihanoc\'h'; +$lang['Metadata synchronization results'] = 'Disoc\'hoù sinkroneladur ar metaroadennoù'; +$lang['Used metadata'] = 'Metaroadennoù implijet'; +$lang['photos candidates for metadata synchronization'] = 'Luc\'hskeudennoù war ar renk evit sinkronelaat ho metaroadennoù'; +$lang['synchronize files metadata with database photos informations'] = 'Sinkronelaat luc\'hskeudennoù an diaz roadennoù gant metaroadennoù ar restroù'; +$lang['Merge selected groups'] = 'Kendeuziñ ar strolladoù diuzet'; +$lang['Merge selected tags'] = 'Kendeuziñ ar merkerioù diuzet'; +$lang['Merge tags'] = 'Kendeuziñ ar merkerioù'; +$lang['Tags %s merged into tag %s'] = 'Merkerioù %s kendeuzet d\'ar merker %s'; +$lang['No user to send notifications by mail.'] = 'Implijer ebet da gemenn gant ur bostel'; +$lang['There is no available subscribers to mail.'] = 'Den ebet da gemenn gant ur bostel'; +$lang['Notification'] = 'Kemenn'; +$lang['No user selected of %d users'] = 'Impljer ebet diuzet, etre %d implijer'; +$lang['No results'] = 'Disoc\'h ebet'; +$lang['User'] = 'Implijer'; +$lang['Users'] = 'Implijerien'; +$lang['The whole page'] = 'Ar bajenn a-bezh'; +$lang['Themes'] = 'Temoù'; +$lang['Title'] = 'Titl'; +$lang['No recipient selected'] = 'Resever ebet diuzet'; +$lang['Recipients'] = 'Reseverien'; +$lang['Select recipients'] = 'Diuzañ ar reseverien'; +$lang['No photo in this album'] = 'Luc\'hskeudenn ebet er rummad-se'; +$lang['No photo in the current set.'] = 'Luc\'hskeudenn ebet er stroll a-vremañ'; +$lang['No photo selected, %d photos in current set'] = 'Luc\'hskeudenn ebet diuzet, %d luc\'hskeudenn er stroll a-vremañ'; +$lang['The whole set'] = 'Ar stroll a-bezh'; +$lang['No photo can be deleted'] = 'Ne c\'hell luc\'hskeudenn ebet bezañ dilemet'; +$lang['No order field selected'] = 'Maezienn urzh ebet diuzet'; +$lang['No matching user found'] = 'Ne glot implijer ebet'; +$lang['No group is permitted to see this private album'] = 'Ne c\'hell strollad ebet gwelet ar rummad prevez-se.'; +$lang['No user is permitted to see this private album'] = 'Ne c\'hell implijer ebet gwelet ar rummad prevez-se.'; +$lang['No file was uploaded'] = 'Restr ebet pellkarget'; +$lang['Upload in progress'] = 'Oc\'h ezkargañ'; +$lang['No group selected, no action possible.'] = 'Strollad ebet diuzet, obererezh ebet d\'ober.'; +$lang['No photo selected, no action possible.'] = 'Luc\'hskeudenn ebet diuzet, obererezh ebet d\'ober.'; +$lang['No user selected, no action possible.'] = 'Implijer ebet diuzet, obererezh ebet d\'ober.'; +$lang['No destination tag selected'] = 'Merker pal ebet diuzet'; +$lang['No and unlock sub-albums'] = 'Ket ha dibrennañ iz-rummadoù'; +$lang['Unlocked'] = 'Dibrennet'; +$lang['There is no other language available.'] = 'N\'eus yezh-all ebet hegerz'; +$lang['There is no other plugin available.'] = 'N\'eus lugant-all ebet hegerz'; +$lang['There is no other theme available.'] = 'N\'eus tem-all ebet hegerz'; +$lang['Other plugins'] = 'Lugantoù all hegerz'; +$lang['Some themes and plugins may be not available yet.'] = 'Temoù pe lugantoù a c\'hell bezañ dihegerz evit poent'; +$lang['Options'] = 'Dibarzhioù'; +$lang['Optional URL keyword'] = 'Ger-alc\'hwez an URL war zibab'; +$lang['Operation in progress'] = 'Treterezh war-ober'; +$lang['Open user details'] = 'Digeriñ titouroù an implijer'; +$lang['show details'] = 'diskouez ar munudoù'; +$lang['Opacity'] = 'Divoullder'; +$lang['Public'] = 'Foran'; +$lang['Public / Private'] = 'Foran / Prevez'; +$lang['public'] = 'foran'; +$lang['Only private albums are listed'] = 'Ar rummadoù prevez a zo el listenn hepken'; +$lang['Other private albums'] = 'Rummadoù prevez hepken'; +$lang['Private'] = 'Prevez'; +$lang['private'] = 'prevez'; +$lang['Piwigo Publish plugin for Lightroom'] = 'Lugant embann Piwigo evit Lightroom'; +$lang['The Piwigo publish Plug-in allows you to export and synchronize photos from Lightroom directly to your Piwigo photo gallery.'] = 'Gant lugant embann Piwigo, e c\'hellit ezporzhiañ ha sinkronaat luc\'hskeudennoù war-eeun eus Lightroom d\'ho palier Piwigo.'; +$lang['On your Linux, simply install Shotwell with your package manager and the activate Piwigo publishing option.'] = 'War ho Linux, staliañ Shotwell gant ar merour-pakadoù, ha gweredekaat dibarzh embann Piwigo.'; +$lang['Obsolete Plugins'] = 'Lugantoù diamzer'; +$lang['Numeric identifier : %d'] = 'Niverenn-anaout : %d'; +$lang['Select at least two tags for merging'] = 'Evit kendeuziñ, diuzit daou merker d\'an neubeutañ'; +$lang['Please select at least two groups'] = 'Diuzit daou strollad d\'an neubeutañ'; +$lang['Select at least one album'] = 'Diuzit ur rummad d\'an neubeutañ'; +$lang['Select at least one comment'] = 'Diuzit un evezhiadenn d\'an neubeutañ'; +$lang['Select at least one photo'] = 'Diuzit ul luc\'hskeudenn d\'an neubeutañ'; +$lang['Select at least one tag'] = 'Diuzit ur merker d\'an neubeutañ'; +$lang['Select at least one user'] = 'Diuzit un implijer d\'an neubeutañ'; +$lang['Number of comments per page'] = 'Niver a evezhiadenn war pep pajenn'; +$lang['Number of albums per page'] = 'Niver a rummad war pep pajenn'; +$lang['None'] = 'Hini ebet'; +$lang['Preferences'] = 'Dibaboù'; +$lang['Position'] = 'Lec\'hiadur'; +$lang['X Position'] = 'Lec\'hiadur X'; +$lang['Y Position'] = 'Lec\'hiadur Y'; +$lang['Portrait'] = 'Poltred'; +$lang['Plugins'] = 'Lugantoù'; +$lang['Photo unreachable or no support'] = 'N\'eus ket tu diraez al luc\'hskeudenn, pe n\'eo ket embreget he furmad'; +$lang['Piwigo Administration'] = 'Mererezh Piwigo'; +$lang['Switch to clear or dark colors for administration'] = 'Cheñch livioù ar mererezh evit sklaer pe teñval'; +$lang['administrators'] = 'merourien'; +$lang['user_status_admin'] = 'Merour'; +$lang['Photo name'] = 'Anv al luc\'hskeudenn'; +$lang['Photos'] = 'Luc\'hskeudennoù'; +$lang['Photo Properties'] = 'Perzhioù al luc\'hskeudenn'; +$lang['Properties'] = 'Perzhioù'; +$lang['Toggle \'default group\' property'] = 'Cheñch perzh \'strollad dre ziouer\''; +$lang['Photo Page'] = 'Pajenn al luc\'hskeudenn'; +$lang['Path'] = 'Hent moned'; +$lang['Parameters'] = 'Arventennoù'; +$lang['Panorama'] = 'Gwel meur'; +$lang['Pages seen'] = 'Pajennoù gwelet'; +$lang['Page end'] = 'Dibenn ar bajenn'; +$lang['Overall'] = 'Gwel a-vras'; +$lang['Page banner'] = 'Banniel ar bajenn'; +$lang['top left corner'] = 'Korn an uhelañ a gleiz'; +$lang['top right corner'] = 'Korn an uhelañ a-zehoù'; +$lang['user_status_generic'] = 'Generek'; +$lang['The webmaster has subscribed you to receiving notifications by mail.'] = 'Ar mestr-gwiad en deus koumanantet ac\'hanoc\'h da kemennoù dre bosteloù.'; +$lang['The webmaster has unsubscribed you from receiving notifications by mail.'] = 'Ar mestr-gwiad en deus digoumanantet ac\'hanoc\'h eus kemennoù dre bosteloù.'; +$lang['Warning: subscribing or unsubscribing will send mails to users'] = 'Diwallit: koumanantiñ pe digoumanantiñ a gaso postelloù d\'an implijerien'; +$lang['Subscribe to notification by mail'] = 'Koumanantiñ da kemennoù dre bosteloù.'; +$lang['Unsubscribe from notification by mail'] = 'Digoumanantiñ eus kemennoù dre bosteloù.'; +$lang['User %s [%s] was added to the subscription list.'] = 'Implijer %s [%s] lakaet e listenn ar c\'houmananterien.'; +$lang['User %s [%s] was not added to the subscription list.'] = 'Ne oa ket lakaet implijer %s [%s] e listenn ar c\'houmananterien.'; +$lang['User %s [%s] was not removed from the subscription list.'] = 'Ne oa ket tennet implijer %s [%s] eus listenn ar c\'houmananterien.'; +$lang['User %s [%s] was removed from the subscription list.'] = 'Implijer %s [%s] tennet eus listenn ar c\'houmananterien.'; +$lang['You have subscribed to receiving notifications by mail.'] = 'Koumanantet ho peus da kemennoù dre bosteloù.'; +$lang['You have unsubscribed from receiving notifications by mail.'] = 'Digoumanantet ho peus eus kemennoù dre bosteloù.'; +$lang['To unsubscribe'] = 'Digoumanantiñ'; +$lang['Subscribe'] = 'Koumanantiñ'; +$lang['Subscribe %s'] = 'Koumanantiñ %s'; +$lang['Subscribe/unsubscribe users'] = 'Koumanantiñ/digoumanantiñ implijerien'; +$lang['Subscribed'] = 'Koumanantet'; +$lang['Unsubscribed'] = 'Digoumanantet'; +$lang['Plugin list'] = 'Listenn al lugantoù'; +$lang['User list'] = 'Listenn an implijerien'; +$lang['Piwigo configuration'] = 'Kefluniadur Piwigo'; +$lang['Restore default configuration. You will lose your plugin settings!'] = 'Adsevel ar c\'hefluniadur dre ziouer. Kollet \'vo arventennoù ho lugantoù!'; +$lang['Your configuration settings are saved'] = 'Saveteet eo bet arventennoù ho c\'hefluniadur'; +$lang['Please wait...'] = 'Gortozit mar plij...'; +$lang['Piwigo Announcements Newsletter'] = 'Lizher-kelaouiñ Piwigo'; +$lang['Subscribe %s to Piwigo Announcements Newsletter'] = 'Koumanantiñ %s al lizher-kelaouiñ Piwigo'; +$lang['Send'] = 'Kas'; +$lang['Tools'] = 'Ostilhoù'; +$lang['and'] = 'ha'; +$lang['between'] = 'etre'; +$lang['Year'] = 'Bloaz'; +$lang['all'] = 'holl'; +$lang['close'] = 'serriñ'; +$lang['jump to photo'] = 'mont da luc\'hskeudenn'; +$lang['new'] = 'nevez'; +$lang['nothing'] = 'netra'; +$lang['other'] = 'all'; +$lang['photos per page'] = 'luc\'hskeudenn er bajenn'; +$lang['Rename'] = 'Cheñch anv'; +$lang['Purge never used notification feeds'] = 'Skarzhañ ar c\'hemennoù n\'int ket bet implijet'; +$lang['Purge sessions'] = 'Skarzhañ an dalc\'hoù'; +$lang['Purge user cache'] = 'Skarzhañ krubuilh an implijer'; +$lang['See you soon,'] = 'Ken ar c\'hentañ,'; +$lang['Random photo'] = 'Luc\'hskeudenn dre zegouezh'; +$lang['Refresh photo set'] = 'Freskaat ar stroll luc\'hskeudennoù'; +$lang['Refresh'] = 'Freskaat'; +$lang['Posted %s on %s'] = 'Postet %s war %s'; +$lang['Reinitialize check integrity'] = 'Adderaouekaat gwiriadur an anterinded'; +$lang['Please check "plugins" folder and sub-folders permissions (CHMOD).'] = 'Sellit ouzh aotreoù kavlec\'h al lugantoù, hag e iskavlec\'hioù (CHMOD).'; +$lang['Uncheck all'] = 'Gwiriañ pep tra'; +$lang['You are running on development sources, no check possible.'] = 'Diziuzañ pep tra'; +$lang['any visitor can see this album'] = 'Pep gweladenner a c\'hell gwelet ar rummad-mañ'; +$lang['simple visitors'] = 'Gweladennerien plaen'; +$lang['visitors need to login and have the appropriate permissions to see this album'] = 'Ar gweladennerien a rank kaout an aotreoù azas evit gwelet ar rummad-mañ'; +$lang['Plugin has been successfully copied'] = 'Eilet mat eo bet al lugant'; +$lang['Piwigo cannot retrieve upgrade file from server'] = 'Ne c\'hell ket Piwigo delec\'hiañ ar restr hizivaat war ar servijer'; +$lang['Select a zone with your mouse to define a new center of interest.'] = 'Diuzit un takad gant al logodenn evit spisaat an darn talvoudus nevez.'; +$lang['The center of interest is the most meaningful zone in the photo.'] = 'An darn talvoudus a zo an takad ar pouezusañ el luc\'hskeudenn.'; +$lang['Select users...'] = 'Diuzit implijerien...'; +$lang['Select a file'] = 'Diuzit ur restr'; +$lang['Select an album'] = 'Diuzit ur rummad'; +$lang['Select files'] = 'Diuzit restroù'; +$lang['Select groups...'] = 'Diuzit strolladoù...'; +$lang['Select:'] = 'Diuzañ:'; +$lang['Selection'] = 'Diuz'; +$lang['Tag selection'] = 'Diuz merkerioù'; +$lang['on the %d selected photos'] = 'war an %d luc\'hskeudenn diuzet'; +$lang['on the %d selected users'] = 'war an %d implijer diuzet'; +$lang['selection'] = 'diuz'; +$lang['Restore'] = 'Adsevel'; +$lang['See you soon.'] = 'Ken ar c\'hentañ.'; +$lang['ReGalAndroid (RemoteGallery client for Android) is an open source (GPL v3) Piwigo client for the Android platform.'] = 'ReGalAndroid (arval RemoteGallery evit Android) a zo arval Piwigo evit savenn Android, e kod mammennoù a zo digor (GPL v3).'; +$lang['Shotwell is an open source digital photo organizer that runs on Linux. It is the default photo manager in Ubuntu and Fedora.'] = 'Shotwell a zo un dibaber luc\'hskeudennoù, e kod mammennoù a zo digor, mont a ra en-dro war Linux. An dibaber dre ziouer eo e Ubuntu ha Fedora.'; +$lang['Webmaster status is required.'] = 'Ret eo kaout statud ar mestr-gwiad.'; +$lang['Status'] = 'Statud'; +$lang['User status'] = 'Statud an implijer'; +$lang['status'] = 'statud'; +$lang['Show %s users'] = 'Diskouez %s implijer'; +$lang['Show info'] = 'Diskouez an titouroù'; +$lang['Showing %s to %s of %s users'] = 'O-tiskouez %s betek %s etre %s implijer'; +$lang['Remote'] = 'A-bell'; +$lang['Set as default language for unregistered and new users'] = 'Lakaat evel ar yezh dre ziouer evit ar re n\'int ket enrollet, hag an implijerien nevez'; +$lang['Set as default theme for unregistered and new users'] = 'Lakaat evel an tem dre ziouer evit ar re n\'int ket enrollet, hag an implijerien nevez'; +$lang['Set author'] = 'Lakaat an oberour'; +$lang['Set creation date'] = 'Lakaat an deiziad krouidigezh'; +$lang['Set title'] = 'Lakaat an titl'; +$lang['set to'] = 'lakaat da'; +$lang['unset'] = 'dilemel'; +$lang['Send connection settings by email'] = 'Kas an arventennoù kevreañ dre bostel'; +$lang['Send mail on HTML format'] = 'Kas ar bostel e furmad HTML'; +$lang['Send mail to users'] = 'Kas ur bostel d\'an implijerien'; +$lang['To send ?'] = 'Da gas ?'; +$lang['Read Piwigo Documentation'] = 'Lennit teuliadur Piwigo'; +$lang['Send mail as'] = 'Kas ar bostel evel'; +$lang['Quick Local Synchronization'] = 'Sinkroneladur lec\'hel prim'; +$lang['even already synchronized photos'] = 'memes al luc\'hskeudennoù sinkronelaet'; +$lang['synchronize files structure with database'] = 'Sinkronelaat framm ar restroù gant an diaz roadennoù'; +$lang['Predefined filter'] = 'Sil raktermenet'; +$lang['custom'] = 'Personelaet'; +$lang['Waiting'] = 'O c\'hortoz'; +$lang['Time'] = 'Eur'; +$lang['With no album'] = 'Hep rummad'; +$lang['With no tag'] = 'Hep merker'; +$lang['The %d following tags were deleted'] = 'An %d merkerioù-se a zo bet dilemet'; +$lang['albums deleted in the database'] = 'rummad dilemet en diaz roadennoù'; +$lang['delete album'] = 'dilemel ar rummad'; +$lang['group "%s" deleted'] = 'dilemet strollad "%s"'; +$lang['high'] = 'uhel'; +$lang['leave'] = 'kuitaat'; +$lang['middle'] = 'kreiz'; +$lang['modified'] = 'cheñchet'; +$lang['none'] = 'netra'; +$lang['unknown'] = 'dianav'; +$lang['pixels'] = 'pikselioù'; +$lang['ranks'] = 'renkoù'; +$lang['sub-albums'] = 'iz-rummadoù'; +$lang['target'] = 'bukenn'; +$lang['test'] = 'test'; +$lang['the forum'] = 'ar forom'; +$lang['the wiki'] = 'ar wiki'; +$lang['total time'] = 'pad hollek'; +$lang['Type here the author name'] = 'Lakait anv an oberour amañ'; +$lang['Type here the name of the new group'] = 'Lakait anv ar strollad nevez amañ'; +$lang['Type here the title'] = 'Lakait an titl amañ'; +$lang['bottom left corner'] = 'Korn an izelañ a gleiz'; +$lang['bottom right corner'] = 'Korn an izelañ a-zehoù'; +$lang['Week starts on'] = 'Ar sizhun a krog d\''; +$lang['Who can see these photos?'] = 'Piv a c\'hell gwelet al luc\'hskeudennoù-mañ ?'; +$lang['Who can see this photo?'] = 'Piv a c\'hell gwelet al luc\'hskeudenn-mañ ?'; +$lang['X Repeat'] = 'Adober X'; +$lang['Y Repeat'] = 'Adober Y'; +$lang['Zoom'] = 'Zoum'; +$lang['reduce to single existing albums'] = 'bihanaat da rummadoù a zo unan hepken anezho'; +$lang['include child albums'] = 'endelc\'hel rummadoù-bugale'; +$lang['create a new album'] = 'krouiñ ur rummad nevez'; +$lang['Storage album'] = 'Rummad-klenkañ'; +$lang['The Piwigo export plugin allows you to create albums and export photos.'] = 'Gant al lugant ezporzhiañ Piwigo e vo tu deoc\'h krouiñ rummadoù hag ezporzhiañ luc\'hskeudennoù.'; +$lang['jump to album'] = 'Mont d\'ar rummad'; +$lang['This album contains %d photos, added between %s and %s.'] = '%d luc\'hskeudenn ez eus er rummad-mañ, lakaet etre %s hag %s.'; +$lang['Support'] = 'Skor'; +$lang['Simulation'] = 'Darvanerezh'; +$lang['Statistics'] = 'Stadegoù'; +$lang['Repair and optimize database'] = 'Ratreañ ha gwellekaat an diaz roadennoù'; +$lang['Ratio'] = 'Parenn an neuz'; \ No newline at end of file diff --git a/sources/language/br_FR/common.lang.php b/sources/language/br_FR/common.lang.php index e6a547a..7b2d19d 100644 --- a/sources/language/br_FR/common.lang.php +++ b/sources/language/br_FR/common.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -22,7 +22,7 @@ // +-----------------------------------------------------------------------+ /* Language Name: Brezhoneg [FR] -Version: 2.7.1 +Version: 2.8.2 Language URI: http://piwigo.org/ext/extension_view.php?eid=698 Author: Piwigo team Author URI: http://piwigo.org @@ -223,7 +223,7 @@ $lang['Keyword'] = 'Ger alc\'hwez '; $lang['Password'] = 'Ger-tremen'; $lang['Menu'] = 'Lañser'; $lang['Most visited'] = 'Muiañ-gwelet'; -$lang['New on %s'] = 'Nevez d\'an %s'; +$lang['New on %s'] = 'Nevez d\'%s'; $lang['Next'] = 'Da-heul'; $lang['Logout'] = 'Digevreañ'; $lang['Login'] = 'Kevreañ'; @@ -424,4 +424,24 @@ $lang['Photo description'] = 'Deskrivadur al luc\'hskeudenn'; $lang['Photo title'] = 'Titl al luc\'hskeudenn'; $lang['Album name, A → Z'] = 'Anv ar rummad, A → Z'; $lang['Album name, Z → A'] = 'Anv ar rummad, Z → A'; -$lang['Link: %s'] = 'Liamm: %s'; \ No newline at end of file +$lang['Link: %s'] = 'Liamm: %s'; +$lang['month']['12'] = 'a viz Kerzu'; +$lang['month']['11'] = 'a viz Du'; +$lang['month']['10'] = 'a viz Here'; +$lang['month']['9'] = 'a viz Gwengolo'; +$lang['month']['8'] = 'a viz Eost'; +$lang['month']['7'] = 'a viz Gouere'; +$lang['month']['6'] = 'a viz Even'; +$lang['month']['5'] = 'a viz Mae'; +$lang['month']['4'] = 'a viz Ebrel'; +$lang['month']['2'] = 'a viz C\'hwevrer'; +$lang['month']['1'] = 'a viz Genver'; +$lang['day']['0'] = 'ar Sul'; +$lang['day']['6'] = 'ar Sadorn'; +$lang['day']['5'] = 'ar Gwener'; +$lang['day']['4'] = 'ar Yaou'; +$lang['day']['3'] = 'ar Merc\'her'; +$lang['day']['2'] = 'ar Meurzh'; +$lang['month']['3'] = 'a viz Meurzh'; +$lang['day']['1'] = 'al Lun'; +$lang['Your authentication key is no longer valid.'] = 'N\'eo ket gwiriek ken hoc\'h alc\'hwez dilesadur'; \ No newline at end of file diff --git a/sources/language/br_FR/install.lang.php b/sources/language/br_FR/install.lang.php index 81eac2c..3853158 100755 --- a/sources/language/br_FR/install.lang.php +++ b/sources/language/br_FR/install.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -22,7 +22,7 @@ // +-----------------------------------------------------------------------+ $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'Posubl eo deoc\'h cheñch ho-unan kefluniadur PHP, ha adloc\'hañ Piwigo da c\'houde.'; $lang['Download the config file'] = 'Pellgargañ ar restr gefluniañ'; -$lang['Try to configure PHP 5'] = 'Esaeit kefluniañ PHP 5'; +$lang['Try to configure PHP 5'] = 'Esaeit kefluniañ PHP 5.2'; $lang['Basic configuration'] = 'Kefluniadur diazez'; $lang['Database configuration'] = 'Kefluniadur an diaz roadennoù'; $lang['An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning : database.inc.php must only contain what is in the textarea, no line return or space character)'] = 'Un diskoulm all a zo eilañ an destenn eus boest a-us ha pegañ anezhañ da restr "local/config/database.inc.php" (Diwallit: ret eo lakaat e-barzh database.inc.php ar pezh a zo er framm-testenn, distro d\'al linenn ebet, hag arouezenn esaouiñ ebet)'; @@ -34,15 +34,15 @@ $lang['User'] = 'Implijer'; $lang['please enter your password again'] = 'Lakait ho ger-tremen adarre'; $lang['user password given by your host provider'] = 'ger-tremen roet gant ho pourvezer ostiz'; $lang['Password ']['confirm'] = 'Ger-tremen [evit kadarnaat]'; -$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo n\'eo ket deuet a-benn da gefluniañ PHP 5.'; -$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo a c\'hell cheñch ho kefluniadur da PHP 5 en ur grouiñ pe kemmañ ur restr .htaccess.'; +$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo n\'eo ket deuet a-benn da gefluniañ PHP 5.2'; +$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo a c\'hell cheñch ho kefluniadur da PHP 5.2 en ur grouiñ pe kemmañ ur restr .htaccess.'; $lang['Creation of config file local/config/database.inc.php failed.'] = 'C\'hwitet eo krouadur ar restr gefluniañ local/config/database.inc.php.'; $lang['You can download the config file and upload it to local/config directory of your installation.'] = 'Posubl eo deoc\'h pellgargañ ar restr gefluniañ, hag ezkargañ anezhañ da kavlec\'h local/config ho staliadur.'; $lang['Congratulations, Piwigo installation is completed'] = 'Gourc\'hemennoù, echu eo staliadur Piwigo'; $lang['Installation'] = 'Staliadur'; $lang['Start Install'] = 'Kregiñ gant ar staliadur'; $lang['Welcome to your new installation of Piwigo!'] = 'Degemer mat en ho staliadur nevez Piwigo !'; -$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Goulennit da skor ho pourvezer ostiz penaos e c\'hellit implij PHP 5.'; +$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Goulennit da skor ho pourvezer ostiz penaos e c\'hellit implij PHP 5.2'; $lang['It appears your webhost is currently running PHP %s.'] = 'PHP %s a zo o labourat war hoc\'h ostiz.'; $lang['localhost or other, supplied by your host provider'] = 'localhost pe anv all, roet gant ho pourvezer ostiz'; $lang['also given by your host provider'] = 'roet gant ho pourvezer ostiz ivez'; @@ -52,7 +52,7 @@ $lang['Can\'t connect to server'] = 'Ne oa ket posubl kevreañ ouzh ar servijer' $lang['Need help ? Ask your question on Piwigo message board.'] = 'Sikour ho peus ezhom? Savit ho goulennoù war Forom Piwigo.'; $lang['verification'] = 'gwiriadur'; $lang['Sorry!'] = 'Digarezit !'; -$lang['PHP 5 is required'] = 'Ret eo kaout PHP 5'; +$lang['PHP 5 is required'] = 'Ret eo kaout PHP 5.2'; $lang['Just another Piwigo gallery'] = 'Ur palier-luc\'hskeudennoù Piwigo all'; $lang['Hope to see you back soon.'] = 'Ken ar wech all !'; $lang['Don\'t hesitate to consult our forums for any help : %s'] = 'Lennit hor foromoù evit kaout sikour: %s'; @@ -63,5 +63,4 @@ $lang['Welcome to my photo gallery'] = 'Degemer mat war ma palier-luc\'hskeudenn $lang['Database table prefix'] = 'Rakger taolennoù an diaz roadennoù'; $lang['database tables names will be prefixed with it (enables you to manage better your tables)'] = 'Ar rakger-mañ a vo ouzhpennet da anvioù taolennoù an diaz roadennoù (Gwelloc\'h e vo mererezh ho taolennoù)'; $lang['Database name'] = 'Anv an diaz roadennoù'; -$lang['Connection to server succeed, but it was impossible to connect to database'] = 'Kevreet mat ouzh ar servijer omp, met ne oa ket posubl kevreañ ouzh an diaz roadennoù.'; -?> \ No newline at end of file +$lang['Connection to server succeed, but it was impossible to connect to database'] = 'Kevreet mat ouzh ar servijer omp, met ne oa ket posubl kevreañ ouzh an diaz roadennoù.'; \ No newline at end of file diff --git a/sources/language/br_FR/upgrade.lang.php b/sources/language/br_FR/upgrade.lang.php index 6d32e78..0ca6f5c 100755 --- a/sources/language/br_FR/upgrade.lang.php +++ b/sources/language/br_FR/upgrade.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/language/ca_ES/admin.lang.php b/sources/language/ca_ES/admin.lang.php index 55335f7..0561d93 100644 --- a/sources/language/ca_ES/admin.lang.php +++ b/sources/language/ca_ES/admin.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -650,7 +650,7 @@ $lang['Error on file "%s" : %s'] = 'Error a l\'arxiu "%s": %s'; $lang['automatic order'] = 'Ordre automàtic'; $lang['manual order'] = 'ordre manual'; $lang['Albums automatically sorted'] = 'Àlbums ordenats automàticament'; -$lang['Batch Manager'] = 'Gestor per lots'; +$lang['Batch Manager'] = 'Gestor de pocessamet per lots'; $lang['include child albums'] = 'incloure els sub-àlbums'; $lang['Selection'] = 'Selecció'; $lang['Action'] = 'Acció'; @@ -771,7 +771,7 @@ $lang['Select an album'] = 'Seleccioneu un àlbum'; $lang['By default, Piwigo will create a new websize from the HD (high definition) version of your photo.'] = 'Per defecte, Piwigo crearà una nova mida per a la web a partir de les vostres fotos en versió HD (high definition) '; $lang['If no HD is available and if the current websize is bigger than resize dimensions, Piwigo will move it as HD and create a downsized websize photo from it.'] = 'Si no està disponible en alta definició i la mida actual es més gran que les dimensions del canvi de mida, es considerarà \'alta definició\' (HD) tot i què finalment caldrà reduir la mida de la imatge.'; $lang['An error has occured during upgrade.'] = 'S\'ha produït un error durant el procés d\'actualització.'; -$lang['An error has occured during extract. Please check files permissions of your piwigo installation.
Click here to show log error.'] = 'S\'ha produït un error mentre l\'extracció. Reviseu els permisos dels fitxers de la instal·lació de piwigo.
Cliqueu aquí per mostrar el registre de l\'error.'; +$lang['An error has occured during extract. Please check files permissions of your piwigo installation.
Click here to show log error.'] = 'S\'ha produït un error durant l\'extracció. Reviseu els permisos dels fitxers de l\'instal·lació de piwigo.
Cliqueu aquí per mostrar el registre de l\'error.'; $lang['Piwigo cannot retrieve upgrade file from server'] = 'Piwigo no pot recuperar l\'arxiu d\'actualització del servidor'; $lang['Updates'] = 'Actualitzacions'; $lang['%s has been successfully updated.'] = '%s s\'ha actualitzat correctament.'; @@ -991,4 +991,13 @@ $lang['based on'] = 'basat en'; $lang['between %s and %s MB'] = 'entre %s i %s MB'; $lang['date & time'] = 'data i hora'; $lang['file name'] = 'nom del fitxer'; -$lang['width & height'] = 'amplada i alçada'; \ No newline at end of file +$lang['width & height'] = 'amplada i alçada'; +$lang['Delete %d orphan photos'] = 'Eliminar %d fotos òrfenes'; +$lang['Each email sent will contain its own automatic authentication key on links, valid for %s.'] = 'Cada correu electrònic enviat contindrà la seva pròpia clau d\'autenticació en els enllaços, vàlida per %s'; +$lang['Edit user'] = 'Edita l\'usuari'; +$lang['For security reason, authentication keys do not work for administrators.'] = 'Per raons de seguretat, les claus d\'autenticació no funcionen amb els administradors'; +$lang['No recipient selected'] = 'No s\'ha indicat cap destinatari'; +$lang['No user is permitted to see this private album'] = 'No s\'ha indicat cap usuari per veure aquest àlbum privat'; +$lang['Orphans'] = 'Òrfenes'; +$lang['Recipients'] = 'Destinataris'; +$lang['Y Repeat'] = 'Repetició Y'; \ No newline at end of file diff --git a/sources/language/ca_ES/common.lang.php b/sources/language/ca_ES/common.lang.php index b6652e4..0371595 100644 --- a/sources/language/ca_ES/common.lang.php +++ b/sources/language/ca_ES/common.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -22,7 +22,7 @@ // +-----------------------------------------------------------------------+ /* Language Name: Català [CA] -Version: 2.7.0 +Version: 2.8.2 Language URI: http://piwigo.org/ext/extension_view.php?eid=413 Author: Piwigo team Author URI: http://piwigo.org @@ -424,4 +424,5 @@ $lang['Photo description'] = 'Descripció de la foto'; $lang['Photo title'] = 'Títol de la foto'; $lang['Album name, A → Z'] = 'Nom de l\'àlbum, a → Z'; $lang['Album name, Z → A'] = 'Nom de l\'àlbum, Z → A'; -$lang['Link: %s'] = 'Enllaç: %s'; \ No newline at end of file +$lang['Link: %s'] = 'Enllaç: %s'; +$lang['Your authentication key is no longer valid.'] = 'D\'aquí poc temps la teva clau autenticació no serà vàlida'; \ No newline at end of file diff --git a/sources/language/ca_ES/help/photos_add_ftp.html b/sources/language/ca_ES/help/photos_add_ftp.html index 7d0a90e..3037f73 100755 --- a/sources/language/ca_ES/help/photos_add_ftp.html +++ b/sources/language/ca_ES/help/photos_add_ftp.html @@ -25,34 +25,45 @@

Els directoris que representen els àlbums estan en el directori "galleries". Heus aquí la jerarquia d'una galeria molt petita (però amb moltes característiques):

-
+    
 galleries
-|-- casament
-|   |-- celebracio
-|   |   |-- sortida
-|   |   |   |-- pol-sol.jpg
-|   |   |   +-- sara-sola.jpg
-|   |   +-- arrivada
-|   |       +-- pol-i-sara.jpg
-|   +-- festa
-|       |-- ball001.jpg
-|       |-- ball002.jpg
-|       +-- ball003.jpg
-+-- llunademel
-    |-- hotel.png
-    |-- video-avio.avi
-    +-- pwg_representacio
-        +-- video-avio.jpg
+|-- wedding
+|   |-- celebration
+|   |   |-- arrival
+|   |   |   |-- paul-alone.jpg
+|   |   |   +-- sarah-alone.jpg
+|   |   +-- departure
+|   |       +-- paul-and-sarah.jpg
+|   +-- party
+|       |-- dancers001.jpg
+|       |-- dancers002.jpg
+|       +-- dancers003.jpg
++-- honeymoon
+|   |-- hotel.png
+|   |-- video-from-plane.avi
+|   +-- pwg_representative
+|       +-- video-from-plane.jpg
++-- photoshoot
+    |-- img0001.jpg
+    |-- img0002.jpg
+    +-- pwg_format
+        |-- img0001.cr2
+        |-- img0001.cmyk.jpg
+        |-- img0001.zip
+        |-- img0002.cr2
+        +-- img0002.cmyk.jpg
 

 
   
   
-  
  • A excepció de "pwg_representative" (vegeu les explicacions a sota), cada directori en "galleries" produeix un àlbum. No hi ha límit quan a profunditat, és a dir, es poden crear àlbums i sub-àlbums a voluntat.
    • 
+  
  • A excepció de "pwg_representative" and "pwg_format" (vegeu les explicacions a sota), cada directori en "galleries" produeix un àlbum. No hi ha límit quan a profunditat, és a dir, es poden crear àlbums i sub-àlbums a voluntat.
    • 
 
   
  • Bàsicament, un element està representat per un arxiu. Un arxiu pot ser un element per a Piwigo si la seva extensió és entre la llista de paràmetres de configuració file_ext (veure arxiu include/config.inc.php). Un arxiu pot ser una imatge si la seva extensió ès entre el paràmetre de configuració picture_ext.
    • 
 
   
  • No es representen amb una icona per defecte elements com ara arxius de vídeo, sons, textos d'arxius, i altres extensions. Opcionalment, es pot associar una miniatura i un arxiu de representanció (veure el video-avio.avi en l'exemple anterior).
    • 
 
+  
  • Multiple formats: a photo can be available in several formats. In this example, we have 3 additional formats for img0001.jpg. You can activate this feature with $conf['enable_formats'] = true; in your local configuration and define a list of formats, like $conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');
    • 
+
   
  • Una vegada que les fotos estan ben col · locades en els directoris, aneu a: Gestionar (al Tauler de control) » Eines » Sincronitzar
    • 
 
-
\ No newline at end of file
+
diff --git a/sources/language/ca_ES/install.lang.php b/sources/language/ca_ES/install.lang.php
index d206f84..18c4666 100644
--- a/sources/language/ca_ES/install.lang.php
+++ b/sources/language/ca_ES/install.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -46,14 +46,14 @@ $lang['Password [confirm]'] = "Contrasenya [confirmeu]";
 $lang['verification'] = "verificació";
 $lang['Need help ? Ask your question on Piwigo message board.'] = "Necessiteu ajuda? Feu la vostra pregunta a Piwigo message board.";
 $lang['Visitors will be able to contact site administrator with this mail'] = "Els visitants poden utilitzar aquesta adreça de correu electrònic per a contactar amb l'administrador del lloc";
-$lang['PHP 5 is required'] = "Es requereix PHP 5 ";
+$lang['PHP 5 is required'] = 'Es requereix PHP 5.2';
 $lang['It appears your webhost is currently running PHP %s.'] = "Sembla que el vostre amfitrió web està executant la versió PHP %s.";
-$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo pot tractar de canviar la teva configuració per PHP 5 mitjançant la creació o modificació de l\'arxiu .htaccess';
+$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo pot tractar de canviar la teva configuració per PHP 5.2 mitjançant la creació o modificació de l\'arxiu .htaccess';
 $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'Tingues en compte que en qualsevol moment pots canviar la configuració i reiniciar Piwigo.';
-$lang['Try to configure PHP 5'] = "Intenteu configurar PHP 5";
+$lang['Try to configure PHP 5'] = 'Intenteu configurar PHP 5.2';
 $lang['Sorry!'] = "Perdó!";
-$lang['Piwigo was not able to configure PHP 5.'] = "A Piwigo no li ha estat possible configurar PHP 5.";
-$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = "Haurieu d'adreçar-vos al vostre proveidor d'hostatge i averiguar com poder canviar-vos cap a PHP 5.";
+$lang['Piwigo was not able to configure PHP 5.'] = 'A Piwigo no li ha estat possible configurar PHP 5.2';
+$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Haurieu d\'adreçar-vos al vostre proveidor d\'hostatge i averiguar com poder canviar-vos cap a PHP 5.2';
 $lang['Hope to see you back soon.'] = "Esperem tornar-vos a veure ben aviat.";
 $lang['Congratulations, Piwigo installation is completed'] = 'Felicitats, la instal·lació de Piwigo s\'ha completat';
 $lang['An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning : database.inc.php must only contain what is in the textarea, no line return or space character)'] = 'Una solució alternativa és copiar el text del quadre del costat i pegar-lo dins del fitxer "local/config/database.inc.php" (Advertiment : el fitxer database.inc.php només ha de contenir el que hi ha a l\'àrea de text, sense linia de retorn o caràcter d\'espai)';
@@ -64,5 +64,4 @@ $lang['Don\'t hesitate to consult our forums for any help : %s'] = 'No dubtis en
 $lang['Just another Piwigo gallery'] = 'Just another Piwigo gallery';
 $lang['Welcome to my photo gallery'] = 'Benvingut a la meva galeria fotogràfica';
 $lang['Welcome to your new installation of Piwigo!'] = 'Benvingut a la teva nova instal·lació de Piwigo!';
-$lang['localhost or other, supplied by your host provider'] = 'localhost o un altre, facilitat pel teu proveïdor d\'allotjament';
-?>
\ No newline at end of file
+$lang['localhost or other, supplied by your host provider'] = 'localhost o un altre, facilitat pel teu proveïdor d\'allotjament';
\ No newline at end of file
diff --git a/sources/language/ca_ES/upgrade.lang.php b/sources/language/ca_ES/upgrade.lang.php
index eb9c821..ecd80f8 100644
--- a/sources/language/ca_ES/upgrade.lang.php
+++ b/sources/language/ca_ES/upgrade.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/cs_CZ/admin.lang.php b/sources/language/cs_CZ/admin.lang.php
index d931459..347e54d 100644
--- a/sources/language/cs_CZ/admin.lang.php
+++ b/sources/language/cs_CZ/admin.lang.php
@@ -5,7 +5,7 @@
 // +-----------------------------------------------------------------------+
 // | Copyright(C) 2009     Pavel Budka & Petr Jirsa    http://pbudka.co.cc |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -986,4 +986,13 @@ $lang['width & height'] = 'šířka & výška';
 $lang['Empty caddie'] = 'Vyprázdnit košík';
 $lang['No and unlock sub-albums'] = 'Ne a odemknout podalba';
 $lang['The settings for the guest are from the %s user'] = 'Nastavení pro hosta je od uživatele %s';
-$lang['based on'] = 'založeno na';
\ No newline at end of file
+$lang['based on'] = 'založeno na';
+$lang['No recipient selected'] = 'Žádní adresáti nevybráni';
+$lang['Recipients'] = 'Adresáti';
+$lang['Y Repeat'] = 'Y opakování';
+$lang['Orphans'] = 'Sirotci';
+$lang['No user is permitted to see this private album'] = 'Žádní uživatelé nejsou oprávněni vidět toto soukromé album';
+$lang['For security reason, authentication keys do not work for administrators.'] = 'Z bezpečnostních důvodů, ověřovací klíče nefungují pro administrátory.';
+$lang['Edit user'] = 'Upravit uživatele';
+$lang['Each email sent will contain its own automatic authentication key on links, valid for %s.'] = 'Každý odeslaný email bude obsahovat vlastní odkaz obsahující ověřovací klíč, který je platný po %s.';
+$lang['Delete %d orphan photos'] = 'Smazání %d fotografií bez rodiče';
\ No newline at end of file
diff --git a/sources/language/cs_CZ/common.lang.php b/sources/language/cs_CZ/common.lang.php
index 4d2fbc8..8fe3267 100644
--- a/sources/language/cs_CZ/common.lang.php
+++ b/sources/language/cs_CZ/common.lang.php
@@ -5,7 +5,7 @@
 // +-----------------------------------------------------------------------+
 // | Copyright(C) 2009     Pavel Budka & Petr Jirsa    http://pbudka.co.cc |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -25,7 +25,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: Česky [CZ]
-Version: 2.7.1
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=414
 Author: Piwigo team
 Author URI: http://piwigo.org
@@ -431,4 +431,5 @@ $lang['Album name, A → Z'] = 'Název alba, A → Z';
 $lang['Album name, Z → A'] = 'Název alba, Z → A';
 $lang['Apply on properties'] = 'Aplikovat na vlastnosti';
 $lang['Link: %s'] = 'Odkaz: %s';
-$lang['No results for'] = 'Žádné výsledky pro';
\ No newline at end of file
+$lang['No results for'] = 'Žádné výsledky pro';
+$lang['Your authentication key is no longer valid.'] = 'Váš autorizační klíč není nadále platný.';
\ No newline at end of file
diff --git a/sources/language/cs_CZ/help/index.php b/sources/language/cs_CZ/help/index.php
index c8de97f..0b96c3e 100644
--- a/sources/language/cs_CZ/help/index.php
+++ b/sources/language/cs_CZ/help/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/cs_CZ/help/photos_add_ftp.html b/sources/language/cs_CZ/help/photos_add_ftp.html
index e2d9a57..28c6c41 100644
--- a/sources/language/cs_CZ/help/photos_add_ftp.html
+++ b/sources/language/cs_CZ/help/photos_add_ftp.html
@@ -1,102 +1,53 @@
 
    
   Rychlý návod
-
-
      
-  
    1. Vytvořte kategorii (adresář) na Vašem počítači.
      2.   
-
-  
    2. Zkopírujte nějaké fotografije do tohoto adresáře, změňte jejich velikost pro zobrazení na web. Varování: názvy adresářů a souborů musí obsahovat pouze písmena, čísla, "-", "_" or ".". Žádné mezery nebo znaky s diakritikou.
      3. 
-
-  
    3. Pomocí FTP, zkopírujte Váš adresář do adresáře "galleries" vaší instalace  Piwigo.
      4. 
-
-  
    4. Přihlašte se do Vaší Piwigo galerie a přejděte na Administrace » Nástroje » Náhledy abyste vytvořili chybějící náhledy.
      5. 
-
-  
    5. Jděte na Adminstrace a stiskněte velké tlačítko Rychlá místní synchronizace.
      6. 
-
    
-
-Gratulujeme! Právě jste vytvořili vaší první galerii fotografií ve Vaší Piwigo galerii.
+  
      
+    
    1. Vytvořte kategorii (adresář) na svém počítači.
      2. 
+    
    2. Zkopírujte nějaké fotografije do tohoto adresáře, změňte jejich velikost pro zobrazení na web. Varování: název kteréhokoliv adresáře a souboru smí obsahovat pouze alfanumerické znaky, „-“, „_“ a „.“. Mezery nebo znaky s diakritikou nejsou povoleny.
      3. 
+    
    3. Pomocí FTP zkopírujte tento adresář do adresáře "galleries" své instalace Piwigo.
      4. 
+    
    4. Přihlašte se do administrace své galerie Piwigo a přejděte na Administrace a stiskněte velké tlačítko Rychlá místní synchronizace.
      5. 
+  
    
+  Gratulujeme! Právě jste vytvořili svou první galerii fotografií ve své galerii Piwigo.
 
    
-
 
    
-  Organizace souboru a adresářů
-
-
      
-
-  
    • 
-
-    
      Adresáře kategorií jsou v Piwigo adresáři 
-    "galleries". tady je ukázka malé adresářové struktury Piwigo (která ale využívá hodně vlastností Piwigo):
      
-
-    
      -.
-|-- admin
-|-- doc
-|-- galleries
-|   |-- kategorie-1
-|   |   |-- kategorie-1.1
-|   |   |   |-- kategorie-1.1.1
-|   |   |   |   |-- kategorie-1.1.1.1
-|   |   |   |   |   |-- pwg_high
-|   |   |   |   |   |   +-- svatba.jpg
-|   |   |   |   |   |-- thumbnail
-|   |   |   |   |   |   +-- TN-svatba.jpg
-|   |   |   |   |   +-- svatba.jpg
-|   |   |   |   +-- kategorie-1.1.1.2
-|   |   |   +-- kategorie-1.1.2
-|   |   |-- kategorie-1.2
-|   |   |   |-- slon.jpg
-|   |   |   +-- thumbnail
-|   |   |       +-- TN-slon.jpg
-|   |   +-- kategorie-1.3
-|   +-- kategorie-2
-|       |-- selatko.gif
-|       |-- pwg_representative
-|       |   +-- video.jpg
-|       |-- thumbnail
-|       |   +-- TN-selatko.jpg
-|       +-- video.avi
-|-- include
-|-- install
-|-- language
-|-- template
-+-- tool
      
-
-  
      • 
-
-  
    • Kromě adreářů pojmenovaných "thumbnail", "pwg_high" nebo "pwg_representative" (čtěte vysvětlení níže), každý adresář v "galleries" vytvoří kategorii. Není zde omezení hloubky adresářů.
      • 
-
-  
    • Každý element kategorie je reprezentován souborem. Soubor může být elementem Piwigo pokud jeho přípona odpovídá parametru konfigurace file_ext
-  (viz. soubor include/config_default.inc.php). Soubor může být obrázek (fotografie) pokud jeho přípona je uvedena v parametru picture_ext.
      • 
-
-  
    • Obrázky musí mít přiřazen náhled (viz. sekce o náhledech níže)
      • 
-
-  
    • Obrázky mohou mít přiřazenu verzi ve vysoké kvalitě. Jako například svatba.jpg v příkladu výše. Verze ve vysoké kvalitě nemá, na rozdíl od náhledu, žádný prefix v názvu.
      • 
-
-  
    • Elementy které nejsou obrázky (video, zvuky, textové sobubory, cokoli chcete...) mají jako výchozí náhled ikonu, které odpovídá jejich příponě. Volitelně můžete přiřadit náhled a reprezentativní soubor (viz. video.avi v příkladu výše).
      • 
-
-  
    • Varování: názvy adresářů a souborů musí obsahovat pouze písmena, čísla, "-", "_" or ".". Žádné mezery nebo znaky s diakritikou.
      • 
-
-  
    • Když jsou elementy, obrázky, náhledy a reprezentativní soubory umístěny v adresářové struktuře přejděte na: Administrace » Kategorie »
-  Synchronizace
      • 
-
-
    
-
    
-
-
    
-  Náhledy
-
      
-
-  
    • Všechny obrázky (fotografie) musí mít přiřazen náhled.
      • 
-
-  
    • Náhledy jsou umístěny v podadresáři "thumbnail", který je v adresáři kategorie. Náhled má stejný název jako jemu odpovídající obrázek, s prefixem podle konfiguračního parametru prefix_thumbnail (viz. include/config.inc.php).
      • 
-
-  
    • Náhled nemusí mít nutně stejnou příponu jako jemu odpovídající obrázek (například ".jpg" obrázek může mít náhled s ".GIF" příponou).
      • 
-
-  
    • Doporučujeme použít externí aplikaci protvorbu náhledů.
      • 
-
-  
    • Vytvářená náhledů pomocí Piwigo může vést ke špatné kvalitě vytvořených náhledů, protože ta závisí na zdrojích serveru (a toto může být na sdílených serverech (webhosting) problém).
-
-  
    • Pokud budete přesto vytvářet náhledy pomocí Piwigo na serveru, tak musíte povolit přístup pro zápis pro všechny v adresáři "galleries" a všech podadresářích.
      • 
-
-
    
-
    
+  Organizace souborů a adresářů
+  
      
+    
    • 
+      
      Adresáře kategorií jsou v adresáři
+      "galleries". Zde je ukázka adresářové struktury malé galerie Piwigo (která ale využívá hodně vlastností Piwigo):
      
+      
      +  galleries
+  |-- wedding
+  |   |-- celebration
+  |   |   |-- arrival
+  |   |   |   |-- paul-alone.jpg
+  |   |   |   +-- sarah-alone.jpg
+  |   |   +-- departure
+  |   |       +-- paul-and-sarah.jpg
+  |   +-- party
+  |       |-- dancers001.jpg
+  |       |-- dancers002.jpg
+  |       +-- dancers003.jpg
+  +-- honeymoon
+  |   |-- hotel.png
+  |   |-- video-from-plane.avi
+  |   +-- pwg_representative
+  |       +-- video-from-plane.jpg
+  +-- photoshoot
+      |-- img0001.jpg
+      |-- img0002.jpg
+      +-- pwg_format
+          |-- img0001.cr2
+          |-- img0001.cmyk.jpg
+          |-- img0001.zip
+          |-- img0002.cr2
+          +-- img0002.cmyk.jpg
+      
      
+    
      • 
+    
    • Kromě adreářů pojmenovaných „thumbnail“, „pwg_high“, „pwg_format“ a „pwg_representative“ (jejich funkce vysvětleny níže) vytvoří každý adresář v „galleries“ kategorii. Není zde omezení hloubky adresářů.
      • 
+    
    • Každý element kategorie je reprezentován souborem. Soubor může být elementem kategorie, pokud je jeho přípona mezi parametry konfigurace file_ext (vizte soubor include/config_default.inc.php). Soubor může být obrázek (fotografie), pokud je jeho přípona mezi parametry picture_ext.
      • 
+    
    • Elementy, které nejsou obrázky (video, zvuky, textové soubory, cokoli chcete...), mají jako výchozí náhled ikonu, která odpovídá jejich příponě. Volitelně můžete neobrázkovému souboru přiřadit náhled a reprezentativní soubor (vizte „video-from-plane.avi“ a jeho reprezentační obrázek „video-from-plane.jpg“ ve složce „pwg_representative“ v příkladu výše).
      • 
+    
    • Varování: název kteréhokoliv adresáře a souboru smí obsahovat pouze alfanumerické znaky, „-“, „_“ a „.“. Mezery nebo znaky s diakritikou nejsou povoleny.
      • 
+    
    • Více formátů: pro jeden obrázek je možné mít v galerii Piwigo více formátů. V příkladu výše jsou k obrázkům „img0001.jpg“ a „img0002.jpg“ k dispozici tři další formáty ve složce „pwg_formats“. Alternativní formáty je pak možné stáhnout přes tlačítko „Stáhnout“ na stránce daného obrázku. Tuto funkcionalitu můžete aktivovat ve své lokální konfiguraci (za použití doplňku „LocalFiles editor“) definováním seznamu povolených formátů, např.: $conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');.
      • 
+    
    • Když jsou obrázky umístěny v adresářové struktuře, přejděte na: Administrace » Nástroje » Synchronizace a synchronizujte adresáře s databází.
      • 
+  
    
+
\ No newline at end of file
diff --git a/sources/language/cs_CZ/index.php b/sources/language/cs_CZ/index.php
index c8de97f..0b96c3e 100644
--- a/sources/language/cs_CZ/index.php
+++ b/sources/language/cs_CZ/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/cs_CZ/install.lang.php b/sources/language/cs_CZ/install.lang.php
index 7f6d589..dd900f0 100644
--- a/sources/language/cs_CZ/install.lang.php
+++ b/sources/language/cs_CZ/install.lang.php
@@ -5,7 +5,7 @@
 // +-----------------------------------------------------------------------+
 // | Copyright(C) 2009     Pavel Budka & Petr Jirsa    http://pbudka.co.cc |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -34,7 +34,6 @@ $lang['It will be shown to the visitors. It is necessary for website administrat
 $lang['Connection to server succeed, but it was impossible to connect to database'] = 'Spojení na server se podařilo, ale nebylo možné připojit databázi';
 $lang['Can\'t connect to server'] = 'Nebylo možné se připojit k serveru';
 $lang['Host'] = 'MySQL server';
-$lang['localhost, sql.multimania.com, toto.freesurf.fr'] = 'localhost, sql.multimania.com, toto.freesurf.cz';
 $lang['User'] = 'Uživatel';
 $lang['user login given by your host provider'] = 'uživatelské jméno, které Vám přidělil provozovatel serveru';
 $lang['user password given by your host provider'] = 'heslo na tomto serveru';
@@ -50,14 +49,14 @@ $lang['Password [confirm]'] = 'Heslo [potvrzení]';
 $lang['verification'] = 'kontrola';
 $lang['Need help ? Ask your question on Piwigo message board.'] = 'Potřebujete pomoc ? Zeptejte se na Piwigo fóru.';
 $lang['Visitors will be able to contact site administrator with this mail'] = 'Návštěvníci mohou pomocí tohoto e-mailu správce kontaktovat';
-$lang['PHP 5 is required'] = 'Je nutný PHP 5';
+$lang['PHP 5 is required'] = 'Je nutný PHP 5.2';
 $lang['It appears your webhost is currently running PHP %s.'] = 'Na Vašem webhostingu je PHP %s.';
-$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo se může pokusit změnit Vaše nastavení na PHP 5 tím, že vytvoří nebo změní soubor .htaccess.';
+$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo se může pokusit změnit Vaše nastavení na PHP 5.2 tím, že vytvoří nebo změní soubor .htaccess.';
 $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'Případně můžete změnit Vaši konfirguraci sami a potom restartovat Piwigo .';
-$lang['Try to configure PHP 5'] = 'Pokuste se změnit Vaše nastavení na PHP 5';
+$lang['Try to configure PHP 5'] = 'Pokuste se změnit Vaše nastavení na PHP 5.2';
 $lang['Sorry!'] = 'Bohužel!';
-$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo nebylo schopno změnit Vaše nastavení na PHP 5.';
-$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Obraťte se na poskytovatele Vašeho webhostingu, aby jste zjistili, jak můžete změnit Vaše nastavení na PHP 5.';
+$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo nebylo schopno změnit Vaše nastavení na PHP 5.2';
+$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Obraťte se na poskytovatele Vašeho webhostingu, aby jste zjistili, jak můžete změnit Vaše nastavení na PHP 5.2';
 $lang['Hope to see you back soon.'] = 'Věříme, že se brzy uvidíme.';
 $lang['Congratulations, Piwigo installation is completed'] = 'Gratulujeme, Piwigo instalace je ukončena';
 $lang['An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning : database.inc.php must only contain what is in the textarea, no line return or space character)'] = 'Náhradním řešením je zkopírovat text z boxu výše a vložit jej do souboru "local/config/database.inc.php" (Upozornění : soubor database.inc.php smí obsahovat jen to, co je v tomto boxu, žádné znaky odřádkování nebo mezery)';
@@ -68,5 +67,4 @@ $lang['Just another Piwigo gallery'] = 'Jen další galerie Piwigo';
 $lang['Welcome to my photo gallery'] = 'Vítejte na mé fotogalerii';
 $lang['Welcome to your new installation of Piwigo!'] = 'Vítejte v nové instalaci Piwigo!';
 $lang['Don\'t hesitate to consult our forums for any help : %s'] = 'Neváhejte navštívit naše fórum v případě jakýchkoliv dotazů: %s'; 
-$lang['localhost or other, supplied by your host provider'] = 'localhost, nebo jiný, dodaný poskytovatelem hostingu';
-?>
\ No newline at end of file
+$lang['localhost or other, supplied by your host provider'] = 'localhost, nebo jiný, dodaný poskytovatelem hostingu';
\ No newline at end of file
diff --git a/sources/language/cs_CZ/upgrade.lang.php b/sources/language/cs_CZ/upgrade.lang.php
index 7d967f2..dbb8f51 100644
--- a/sources/language/cs_CZ/upgrade.lang.php
+++ b/sources/language/cs_CZ/upgrade.lang.php
@@ -5,7 +5,7 @@
 // +-----------------------------------------------------------------------+
 // | Copyright(C) 2009     Pavel Budka & Petr Jirsa    http://pbudka.co.cc |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/da_DK/admin.lang.php b/sources/language/da_DK/admin.lang.php
index 07ef176..82e4554 100644
--- a/sources/language/da_DK/admin.lang.php
+++ b/sources/language/da_DK/admin.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -73,7 +73,7 @@ $lang['Deletions'] = 'Sletninger';
 $lang['Deny selected groups'] = 'Afvis valgte grupper';
 $lang['Deny selected users'] = 'Afvis valgte brugere';
 $lang['Description'] = 'Beskrivelse';
-$lang['Display options'] = 'Vis muligheder';
+$lang['Display options'] = 'Vis indstillinger';
 $lang['Dissociated'] = 'Tilknytning fjernet';
 $lang['Does not represent'] = 'er ikke miniaturebillede for';
 $lang['Edit selected tags'] = 'Rediger valgte tags';
@@ -113,7 +113,7 @@ $lang['Number of comments per page'] = 'Antal kommentarer pr. side';
 $lang['Number of rates'] = 'Antal bedømmelser';
 $lang['Only private albums are listed'] = 'Kun private albummer er opført';
 $lang['Operating system'] = 'Styresystem';
-$lang['Options'] = 'Valgmuligheder';
+$lang['Options'] = 'Indstillinger';
 $lang['Other private albums'] = 'Andre private albummer';
 $lang['Page banner'] = 'Sidebanner';
 $lang['Parent album'] = 'Overordnet album';
@@ -863,7 +863,7 @@ $lang['Multiple Size'] = 'Flere størrelser';
 $lang['%u users have automatic permission because they belong to a granted group.'] = '%u brugere har automatisk tilladelse, fordi de tilhører en gruppe med tilladelser.';
 $lang['Piwigo for Android application empowers you to connect your Android phone or table to your Piwigo gallery, create some albums and upload several photos at once.'] = 'App\'en Piwigo for Android giver dig mulighed for at forbinde en Android-mobiltelelfon eller -tablet med dit Piwigo-galleri, oprette albummer og uploade flere fotografier på én gang.';
 $lang['Adobe Photoshop Lightroom is a photography software designed to manage large quantities of digital images and doing post production work.'] = 'Adobe Photoshop Lightroom er et fotografiprogram beregnet til at håndtere store mængder digitale billeder og foretage efterbehandling.';
-$lang['Aperture is a powerful tool to refine images and manage massive libraries on Mac.'] = 'Aperture er et ydedygtigt værktøj til at forfine billeder og administrere store biblioteker på Mac.';
+$lang['Aperture is a powerful tool to refine images and manage massive libraries on Mac.'] = 'Aperture er et ydedygtigt værktøj til at forfine billeder og administrere store biblioteker på en Mac.';
 $lang['Aperture is designed for professional photographers with iPhoto simplicity.'] = 'Aperture er udviklet til professionelle fotografer med iPhoto-enkelhed.';
 $lang['By default, the center of interest is placed in the middle of the photo.'] = 'Som standard er fokusområdet placeret i midten af fotografiet';
 $lang['Center of interest'] = 'Fokusområde';
@@ -984,4 +984,13 @@ $lang['date & time'] = 'dato og tid';
 $lang['file name'] = 'filnavn';
 $lang['width & height'] = 'bredde og højde';
 $lang['No and unlock sub-albums'] = 'Nej, og lås underalbummer op';
-$lang['Upload in progress'] = 'Upload i gang';
\ No newline at end of file
+$lang['Upload in progress'] = 'Upload i gang';
+$lang['Delete %d orphan photos'] = 'Slettede %d forældreløse fotografier';
+$lang['Each email sent will contain its own automatic authentication key on links, valid for %s.'] = 'Hver afsendt mail indeholder sin egen automatiske autentifikationsnøgle i links, gyldig i %s.';
+$lang['Edit user'] = 'Rediger bruger';
+$lang['For security reason, authentication keys do not work for administrators.'] = 'Af sikkerhedsgrunde fungerer autentifikationsnøgler ikke for administratorer.';
+$lang['No recipient selected'] = 'Ingen modtager valgt';
+$lang['No user is permitted to see this private album'] = 'Ingen bruger har rettigheder til at se dette private album';
+$lang['Orphans'] = 'Forældreløse';
+$lang['Recipients'] = 'Modtagere';
+$lang['Y Repeat'] = 'Y-gentagelse';
\ No newline at end of file
diff --git a/sources/language/da_DK/common.lang.php b/sources/language/da_DK/common.lang.php
index a5156e6..6add311 100644
--- a/sources/language/da_DK/common.lang.php
+++ b/sources/language/da_DK/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: Dansk [DK]
-Version: 2.7.1
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=415
 Author: Piwigo team
 Author URI: http://piwigo.org
@@ -194,7 +194,7 @@ $lang['included'] = 'medtaget';
 $lang['Invalid password!'] = 'Forkert adgangskode!';
 $lang['Language']='Sprog';
 $lang['last %d days'] = 'seneste %d dage';
-$lang['Last'] = 'Seneste';
+$lang['Last'] = 'Sidste';
 $lang['Logout'] = 'Log af';
 $lang['obligatory'] = 'obligatorisk';
 $lang['display a calendar by creation date'] = 'viser en kalender over oprettelsesdatoer';
@@ -231,7 +231,7 @@ $lang['Click on the photo to see it in high definition'] = 'Klik på fotografiet
 $lang['Show file metadata'] = 'Vis fotografiets metadata';
 $lang['Powered by'] = 'Drives af';
 $lang['Preferences'] = 'Indstillinger';
-$lang['Previous'] = 'Tidligere';
+$lang['Previous'] = 'Forrige';
 $lang['Random photos'] = 'Tilfældige fotografier';
 $lang['display a set of random photos'] = 'vis et sæt tilfældigt valgte fotografier';
 $lang['Recent albums'] = 'Nyeste albummer';
@@ -427,4 +427,5 @@ $lang['Photo description'] = 'Fotobeskrivelse';
 $lang['Photo title'] = 'Fototitel';
 $lang['Album name, A → Z'] = 'Albumnavn, A → Å';
 $lang['Album name, Z → A'] = 'Albumnavn, Å → A';
-$lang['Link: %s'] = 'Link: %s';
\ No newline at end of file
+$lang['Link: %s'] = 'Link: %s';
+$lang['Your authentication key is no longer valid.'] = 'Din autentifikationsnøgle er ikke længere gyldig.';
\ No newline at end of file
diff --git a/sources/language/da_DK/help/photos_add_ftp.html b/sources/language/da_DK/help/photos_add_ftp.html
index ecac367..66f47e6 100755
--- a/sources/language/da_DK/help/photos_add_ftp.html
+++ b/sources/language/da_DK/help/photos_add_ftp.html
@@ -27,27 +27,36 @@
 
     
     galleries
-|-- bryllup
-|   |-- fejring
-|   |   |-- ankomst
-|   |   |   |-- mads-alene.jpg
-|   |   |   +-- mette-alene.jpg
-|   |   +-- afrejse
-|   |       +-- mads-og-mette.jpg
-|   +-- fest
-|       |-- dansende001.jpg
-|       |-- dansende002.jpg
-|       +-- dansende003.jpg
-+-- bryllupsrejse
-    |-- hotel.png
-    |-- video-fra-fly.avi
-    +-- pwg_representative
-        +-- video-fra-fly.jpg
+|-- wedding
+|   |-- celebration
+|   |   |-- arrival
+|   |   |   |-- paul-alone.jpg
+|   |   |   +-- sarah-alone.jpg
+|   |   +-- departure
+|   |       +-- paul-and-sarah.jpg
+|   +-- party
+|       |-- dancers001.jpg
+|       |-- dancers002.jpg
+|       +-- dancers003.jpg
++-- honeymoon
+|   |-- hotel.png
+|   |-- video-from-plane.avi
+|   +-- pwg_representative
+|       +-- video-from-plane.jpg
++-- photoshoot
+    |-- img0001.jpg
+    |-- img0002.jpg
+    +-- pwg_format
+        |-- img0001.cr2
+        |-- img0001.cmyk.jpg
+        |-- img0001.zip
+        |-- img0002.cr2
+        +-- img0002.cmyk.jpg
 
    
 
   
 
-  
  • Bortset fra "pwg_representative" (se forklaring herunder), genererer hver mappe under "galleries" et album. Der er ingen begrænsning på hvor mange niveauer, der kan være.
    • 
+  
  • Bortset fra "pwg_representative" and "pwg_format" (se forklaring herunder), genererer hver mappe under "galleries" et album. Der er ingen begrænsning på hvor mange niveauer, der kan være.
    • 
 
   
  • Grundlæggende repræsenteres et element af en fil. En fil kan være et 
   Piwigo-element, hvis dets filendelse er blandt mulighederne angivet i opsætningsparameteret
@@ -58,10 +67,12 @@ galleries
   
  • Ingen fotoelementer (video, lyde, tekstfiler, alt muligt andet ...) er som standard repræsenteret af en ikon 
   svarende til filendelsen. Man kan valgfrit associere et miniaturebillede og repræsentativ fil (se video.avi i eksemplet herover).
    • 
 
+  
  • Multiple formats: a photo can be available in several formats. In this example, we have 3 additional formats for img0001.jpg. You can activate this feature with $conf['enable_formats'] = true; in your local configuration and define a list of formats, like $conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');
    • 
+
   
  • Advarsel: Navnene på mapper og filer må kun indeholde bogstaver, tal, "-", "_" eller ".". Ingen mellemrum eller accenttegn.
    • 
 
   
  • Når fotografierne er korrekt placeret i mapperne, går man til: Administration » Værktøjer »
   Synkroniser
    • 
 
 
-
\ No newline at end of file
+
diff --git a/sources/language/da_DK/index.php b/sources/language/da_DK/index.php
index c8de97f..0b96c3e 100644
--- a/sources/language/da_DK/index.php
+++ b/sources/language/da_DK/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/da_DK/install.lang.php b/sources/language/da_DK/install.lang.php
index f205989..4e7b451 100644
--- a/sources/language/da_DK/install.lang.php
+++ b/sources/language/da_DK/install.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -46,13 +46,13 @@ $lang['Password [confirm]'] = 'Password [bekræft]';
 $lang['verification'] = 'bekræftelse';
 $lang['Need help ? Ask your question on Piwigo message board.'] = 'Brug for hjælp? Stil dine spørgsmål i Piwigos forum.';
 $lang['Visitors will be able to contact site administrator with this mail'] = 'Besøgende vil ved hjælp af denne e-mail have mulighed for at kontakte administratoren';
-$lang['PHP 5 is required'] = 'PHP 5 er nødvendig';
+$lang['PHP 5 is required'] = 'PHP 5.2 er nødvendig';
 $lang['It appears your webhost is currently running PHP %s.'] = 'Det lader til, at din webhost pt. kører PHP %s.';
-$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo kan prøve at skifte din opsætning til PHP 5 ved at oprette eller ændre en .htaccess-fil.';
+$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo kan prøve at skifte din opsætning til PHP 5.2 ved at oprette eller ændre en .htaccess-fil.';
 $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'Bemærk, at du selv kan ændre din opsætning og derefter genstarte Piwigo.';
-$lang['Try to configure PHP 5'] = 'Prøv at opsætte PHP 5';
+$lang['Try to configure PHP 5'] = 'Prøv at opsætte PHP 5.2';
 $lang['Sorry!'] = 'Hov!';
-$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo var ikke i stand til at opsætte PHP 5.';
+$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo var ikke i stand til at opsætte PHP 5.2';
 $lang["You may referer to your hosting provider's support and see how you could switch to PHP 5 by yourself."] = "Du henvises til din webhost for at se hvordan du selv kan skifte til PHP 5.";
 $lang['Hope to see you back soon.'] = 'Håber snart at se dig igen.';
 $lang['Congratulations, Piwigo installation is completed'] = 'Tillykke, installeringen af Piwigo er afsluttet';
@@ -65,6 +65,5 @@ $lang['Welcome to my photo gallery'] = 'Velkommen til mit fotogalleri';
 $lang['Don\'t hesitate to consult our forums for any help : %s'] = 'Tøv ikke med at besøges vores forum for at få hjælp: %s';
 $lang['Welcome to your new installation of Piwigo!'] = 'Velkommen til din nye Piwigo-installation';
 $lang['Password ']['confirm'] = 'Adgangskode [bekræft]';
-$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Du henvises til din webhosts support for at finde ud af, om du selv kan skifte til PHP 5.';
-$lang['localhost or other, supplied by your host provider'] = 'localhost eller andet, oplyst af din hostingleverandør';
-?>
\ No newline at end of file
+$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Du henvises til din webhosts support for at finde ud af, om du selv kan skifte til PHP 5.2';
+$lang['localhost or other, supplied by your host provider'] = 'localhost eller andet, oplyst af din hostingleverandør';
\ No newline at end of file
diff --git a/sources/language/da_DK/upgrade.lang.php b/sources/language/da_DK/upgrade.lang.php
index 1bc7d19..98646fb 100644
--- a/sources/language/da_DK/upgrade.lang.php
+++ b/sources/language/da_DK/upgrade.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/de_DE/about.html b/sources/language/de_DE/about.html
index 7379e83..396ad99 100644
--- a/sources/language/de_DE/about.html
+++ b/sources/language/de_DE/about.html
@@ -8,6 +8,7 @@ Erweiterungen machen Piwigo leicht anpassbar an die verschiedensten Bedürfnisse
 
    Die deutsche Übersetzung wird gepflegt von (Namen in alphabetischer Reihenfolge):
 
 	
      
+		
    • bigant
      • 
 		
    • duke
      • 
 		
    • el ninjo
      • 
 		
    • fs101299
      • 
diff --git a/sources/language/de_DE/admin.lang.php b/sources/language/de_DE/admin.lang.php
index 083754f..bd5a755 100644
--- a/sources/language/de_DE/admin.lang.php
+++ b/sources/language/de_DE/admin.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,13 +22,13 @@
 // +-----------------------------------------------------------------------+
 
 $lang['%d association'] = '%d Element wird angezeigt';
-$lang['%d associations'] = '%d Elemente werden insgesamt angezeigt';
-$lang['%d album including'] = '%d Album inbegriffen, ';
-$lang['%d albums including'] = '%d Alben inbegriffen, ';
+$lang['%d associations'] = '%d Verknüpfungen';
+$lang['%d album including'] = '%d Album enthalten, ';
+$lang['%d albums including'] = '%d Alben enthalten, ';
 $lang['%d physical'] = 'davon %d physisch';
 $lang['%d physicals'] = 'davon %d physische';
 $lang[' and %d virtual'] = ' und %d virtuell';
-$lang[' and %d virtuals'] = ' und %d virtuelle';
+$lang[' and %d virtuals'] = ' und %d virtuell';
 $lang['%d album moved'] = '%d Album verschoben';
 $lang['%d albums moved'] = '%d Alben verschoben';
 $lang['%d group'] = '%d Gruppe';
@@ -91,7 +91,7 @@ $lang['Group name'] = 'Gruppenname';
 $lang['Groups'] = 'Gruppen';
 $lang['Guests'] = 'Gäste';
 $lang['History'] = 'Statistik';
-$lang['Informations'] = 'Informationen';
+$lang['Informations'] = 'Benachrichtigung';
 $lang['Install'] = 'Installieren';
 $lang['Link all album photos to a new album'] = 'Alle Album-Fotos mit einem neuen Album verknüpfen';
 $lang['Link all album photos to some existing albums'] = 'Alle Album-Fotos mit einem existierenden Album verknüpfen';
@@ -111,7 +111,7 @@ $lang['New name'] = 'Neuer Name';
 $lang['New parent album'] = 'Neues übergeordnetes Album';
 $lang['New tag'] = 'Neues Schlagwort';
 $lang['Number of comments per page'] = 'Anzahl Kommentare pro Seite';
-$lang['Number of rates'] = 'Anzahl von Bewertungen';
+$lang['Number of rates'] = 'Anzahl Bewertungen';
 $lang['Only private albums are listed'] = 'Nur private Alben werden aufgelistet';
 $lang['Operating system'] = 'Betriebssystem';
 $lang['Options'] = 'Optionen';
@@ -163,7 +163,7 @@ $lang['Use the default photo sort order'] = 'Die Standard-Sortierreihenfolge ver
 $lang['User comments validation'] = 'Auf Freigabe wartende Kommentare';
 $lang['Users'] = 'Benutzer';
 $lang['Validate'] = 'Freigeben';
-$lang['Validation'] = 'Freigabe der Kommentare durch den Administrator';
+$lang['Validation'] = 'Freigabe der Kommentare durch den Administrator erforderlich';
 $lang['Version'] = 'Version';
 $lang['Virtual albums to move'] = 'Eines oder mehrere virtuelle Alben auswählen, um sie zu verschieben.';
 $lang['Virtual album name'] = 'Virtueller Albumname';
@@ -174,7 +174,7 @@ $lang['You cannot move an album in its own sub album'] = 'Sie können ein Album
 $lang['You need to confirm deletion'] = 'Löschen bestätigen';
 $lang['Associate to album'] = 'Mit einem Album verbinden';
 $lang['associate to group'] = 'mit Gruppe verbinden';
-$lang['Authorized'] = 'Zugriff erlaubt';
+$lang['Authorized'] = 'Kommentare erlaubt';
 $lang['Add a virtual album'] = 'Virtuelles Album hinzufügen';
 $lang['Authorize users to add comments on selected albums'] = 'Benutzern erlauben, in ausgewählten Alben Kommentare zu schreiben';
 $lang['The name of an album must not be empty'] = 'Der Name eines Albums darf nicht leer sein.';
@@ -192,17 +192,17 @@ $lang['Default display'] = 'Standarddarstellung';
 $lang['The gallery URL is not valid.'] = 'Die URL der Galerie ist ungültig.';
 $lang['The number of comments a page must be between 5 and 50 included.'] = 'Die Anzahl der Kommentare pro Seite muss zwischen 5 und 50 liegen.';
 $lang['Configuration'] = 'Konfiguration';
-$lang['confirm'] = 'bestätigen';
+$lang['confirm'] = 'Bestätigen';
 $lang['Date'] = 'Datum';
 $lang['delete album'] = 'Album löschen';
 $lang['Dissociate from album'] = 'Von Album abtrennen';
 $lang['dissociate from group'] = 'von Gruppe abtrennen';
 $lang['Album updated successfully'] = 'Informationen des Albums wurden erfolgreich aktualisiert.';
-$lang['photos per page'] = 'Fotos je Seite';
+$lang['photos per page'] = 'Bilder pro Seite';
 $lang['High definition enabled'] = 'Hohe Auflösung aktiviert';
 $lang['File'] = 'Datei';
 $lang['first photo added on %s'] = 'erstes Foto am %s hinzugefügt';
-$lang['Forbidden'] = 'Zugriff verweigert';
+$lang['Forbidden'] = 'Keine Kommentare erlaubt';
 $lang['global mode'] = 'Übersicht';
 $lang['group "%s" added'] = 'Gruppe "%s" hinzugefügt';
 $lang['group "%s" deleted'] = 'Gruppe "%s" gelöscht';
@@ -236,12 +236,12 @@ $lang['You have subscribed to receiving notifications by mail.'] = 'Sie sind fü
 $lang['To subscribe'] = 'Zum Anmelden';
 $lang['If you encounter problems or have any question, please send a message to'] = 'Bei Problemen oder Fragen eine E-Mail senden an';
 $lang['[NBM] Problems or questions'] = '[NBM] Probleme oder Fragen';
-$lang['The webmaster has unsubscribed you from receiving notifications by mail.'] = 'Der Webmaster Sie aus der E-Mail-Benachrichtigung ausgetragen.';
+$lang['The webmaster has unsubscribed you from receiving notifications by mail.'] = 'Der Webmaster hat Sie aus der E-Mail-Benachrichtigungsliste ausgetragen.';
 $lang['You have unsubscribed from receiving notifications by mail.'] = 'Sie haben sich aus der E-Mail-Benachrichtigung ausgetragen.';
 $lang[', click on'] = ', auf diesen Link klicken:';
 $lang['To unsubscribe'] = 'Zum Austragen';
 $lang['With blank value, gallery title will be used'] = 'Wenn leer, wird der Galerie-Titel verwendet';
-$lang['Notification'] = 'Benachrichtigung';
+$lang['Notification'] = 'Benachrichtigungen';
 $lang['Error when sending email to %s [%s].'] = 'Fehler beim Versand an %s [%s].';
 $lang['Mail sent to %s [%s].'] = 'E-Mail versendet an %s [%s].';
 $lang['%d mail was sent.'] = '%d E-Mail wurde gesendet.';
@@ -254,7 +254,7 @@ $lang['Subscribers could be listed (available) only if there is new elements to
 $lang['Anyway only webmasters can see this tab and never administrators.'] = 'Wenn niemand in der Mailingliste eingetragen ist, können keine E-Mails versendet werden. Nur der Webmaster erscheint bei Aktualisierungen in dieser Liste.';
 $lang['No user to send notifications by mail.'] = 'Keine Benutzer vorhanden, um Aktualisierungen zu senden.';
 $lang['New photos added'] = 'Neue Fotos hinzugefügt';
-$lang['Subscribe to notification by mail'] = 'Eintragen zur E-Mail-Benachrichtigung';
+$lang['Subscribe to notification by mail'] = 'E-Mail-Benachrichtigung abonnieren';
 $lang['Unsubscribe from notification by mail'] = 'Von der E-Mail-Benachrichtigung austragen';
 $lang['Parameter'] = 'Einstellungen';
 $lang['Continue processing treatment'] = 'Vorgang fortsetzen';
@@ -287,7 +287,7 @@ $lang['Include display of recent photos grouped by dates'] = 'Die neuesten Bilde
 $lang['Available only with HTML format'] = 'Nur verfügbar, wenn die Benachrichtigungen im HTML-Format verschickt werden';
 $lang['no write access'] = 'kein Schreibzugriff';
 $lang['Permissions'] = 'Zugriffsrechte';
-$lang['private'] = 'private';
+$lang['private'] = 'privat';
 $lang['public'] = 'öffentlich';
 $lang['Purge never used notification feeds'] = 'Nicht verwendete Benachrichtigungen löschen';
 $lang['Purge sessions'] = 'Sitzungen löschen';
@@ -322,7 +322,7 @@ $lang['Edit album'] = 'Album bearbeiten';
 $lang['Group management'] = 'Gruppen verwalten';
 $lang['User list'] = 'Benutzer verwalten';
 $lang['Database synchronization with files'] = 'Synchronisierung der Datenbank';
-$lang['all'] = 'alle';
+$lang['all'] = 'Alle';
 $lang['height must be a number superior to'] = 'die Höhe muss größer sein als';
 $lang['width must be a number superior to'] = 'die Breite muss größer sein als';
 $lang['for the file format'] = 'für das Format der Datei';
@@ -352,7 +352,7 @@ $lang['photos candidates for metadata synchronization'] = 'Fotos bereit zur Meta
 $lang['photos informations synchronized with files metadata'] = 'Fotoinformationen mit den Datei-Metadaten synchronisiert';
 $lang['errors during synchronization'] = 'Fehler während der Synchronisation';
 $lang['albums added in the database'] = 'Alben in der Datenbank hinzugefügt';
-$lang['photos added in the database'] = 'der Datenbank hinzugefügte Fotos';
+$lang['photos added in the database'] = 'In der Datenbank hinzugefügte Fotos';
 $lang['photos updated in the database'] = 'in der Datenbank aktualisierte Fotos';
 $lang['Search for new images in the directories'] = 'Nach neuen Fotos in den vorhandenen Verzeichnissen suchen';
 $lang['added'] = 'hinzugefügt';
@@ -360,7 +360,7 @@ $lang['deleted'] = 'gelöscht';
 $lang['Metadata synchronization results'] = 'Ergebnisse der Metadaten-Synchronisierung';
 $lang['only perform a simulation (no change in database will be made)'] = 'Nur Simulation durchführen, ohne Änderungen in der Datenbank vorzunehmen.';
 $lang['Simulation'] = 'Simulation';
-$lang['directories + files'] = 'Verzeichnisse + Dateien';
+$lang['directories + files'] = 'Verzeichnisse und Dateien';
 $lang['only directories'] = 'Nur Verzeichnisse';
 $lang['synchronize files structure with database'] = 'Dateistruktur mit Datenbank synchronisieren';
 $lang['synchronize files metadata with database photos informations'] = 'Datei-Metadaten mit den Fotoinformationen der Datenbank synchronisieren';
@@ -394,9 +394,9 @@ $lang['An information email was sent to group "%s"'] = 'Eine Info-E-Mail wurde a
 $lang['Send an information email to group members'] = 'Eine Info-E-Mail an die Mitglieder dieser Gruppe senden';
 $lang['Group'] = 'Gruppe';
 $lang['[%s] Visit album %s'] = '[%s] Album %s ansehen';
-$lang['Hello,'] = 'Hallo,';
-$lang['See you soon.'] = 'Bis bald.';
-$lang['Discover album:'] = 'Entdecken Sie das Album:';
+$lang['Hello,'] = 'Guten Tag!';
+$lang['See you soon.'] = 'Bis bald!';
+$lang['Discover album:'] = 'Entdecken Sie dieses Album:';
 $lang['Mail content'] = 'Text der E-Mail';
 $lang['none'] = 'nichts';
 $lang['high'] = 'hoch';
@@ -507,7 +507,7 @@ $lang['Templates configuration has been recorded.'] = 'Die Konfiguration der Vor
 $lang['All optimizations have been successfully completed.'] = 'Alle Optimierungen wurden erfolgreich abgeschlossen.';
 $lang['Optimizations have been completed with some errors.'] = 'Bei den durchgeführten Optimierungen sind Fehler aufgetreten.';
 $lang['Modify information'] = 'Informationen ändern';
-$lang['nothing'] = 'nichts';
+$lang['nothing'] = 'Nichts';
 $lang['overrides existing values with empty ones'] = 'Alle in der Datenbank vorhandenen Werte zurücksetzen';
 $lang['Manage photo ranks'] = 'Foto-Sortierreihenfolge';
 $lang['Edit ranks'] = 'Die Reihenfolge ändern';
@@ -529,7 +529,7 @@ $lang['Number of downloads'] = 'Anzahl der Downloads';
 $lang['Piwigo Announcements Newsletter'] = 'Piwigo-Newsletter';
 $lang['Keep in touch with Piwigo project, subscribe to Piwigo Announcement Newsletter. You will receive emails when a new release is available (sometimes including a security bug fix, it\'s important to know and upgrade) and when major events happen to the project. Only a few emails a year.'] = 'Abonnieren Sie den Piwigo-Newsletter. Wenn eine neue Version von Piwigo bereitsteht oder wichtige Sicherheitsaktualisierungen erschienen sind, werden Sie per E-Mail benachrichtigt. Auch über bedeutende Ereignisse rund um das Piwigo-Projekt werden Sie informiert. Es erscheinen nur wenige Newsletter pro Jahr.';
 $lang['Subscribe %s'] = 'Abonnieren %s';
-$lang['Subscribe %s to Piwigo Announcements Newsletter'] = 'Melde %s an für den Piwigo-Newsletter';
+$lang['Subscribe %s to Piwigo Announcements Newsletter'] = '%s für den Piwigo-Newsletter anmelden';
 $lang['Purge search history'] = 'Suchhistorie löschen';
 $lang['Hide'] = 'Ausblenden';
 $lang['Operation in progress'] = 'Vorgang läuft.';
@@ -551,8 +551,8 @@ $lang['Add New Theme'] = 'Ein neues Theme hinzufügen';
 $lang['Forbid this theme to users'] = 'Dieses Theme den Benutzern verbieten';
 $lang['Set as default theme for unregistered and new users'] = 'Standardthema für unregistrierte und neue Benutzer festlegen';
 $lang['unknown'] = 'unbekannt';
-$lang['Upload Photos'] = 'Fotos hochladen';
-$lang['Drop into album'] = 'In das Album hochladen';
+$lang['Upload Photos'] = 'Bilder hochladen';
+$lang['Drop into album'] = 'In dieses Album hochladen';
 $lang['+ Add an upload box'] = '+ Eine weitere Uploadbox hinzufügen';
 $lang['Create the "%s" directory at the root of your Piwigo installation'] = 'Erstellen Sie das Verzeichnis "%s" im Hauptverzeichnis (root) Ihrer Piwigo-Installation';
 $lang['Give write access (chmod 777) to "%s" directory at the root of your Piwigo installation'] = 'Geben Sie dem Verzeichnis "%s" im Hauptverzeichnis (root) Ihrer Piwigo-Installation Schreibrechte (chmod 777)';
@@ -606,7 +606,7 @@ $lang['Main Page'] = 'Hauptseite';
 $lang['Photo Page'] = 'Fotoseite';
 $lang['Activate Navigation Bar'] = 'Navigationsleiste aktivieren';
 $lang['Activate Navigation Thumbnails'] = 'Navigationsvorschaubilder aktivieren';
-$lang['Activate icon "%s"'] = 'Icon »%s« aktivieren';
+$lang['Activate icon "%s"'] = '»%s«-Symbol anzeigen';
 $lang['Photo Properties'] = 'Fotoeigenschaften';
 $lang['Allow user customization'] = 'Anpassungen durch Benutzer erlauben';
 $lang['Execution time is out, treatment must be continue [Estimated time: %d seconds].'] = 'Die Zeit für die Ausführung ist abgelaufen, der Vorgang muss fortgesetzt werden [Noch benötigte Zeit: %d Sekunden].';
@@ -622,7 +622,7 @@ $lang['Miscellaneous'] = 'Verschiedenes';
 $lang['Virtual Links'] = 'Virtuelle Verbindungen';
 $lang['Webmaster status is required.'] = 'Sie benötigen Webmaster-Berechtigung.';
 $lang['Bound Theme'] = 'Verbundenes Thema';
-$lang['Allow rating'] = 'Bewertung von Fotos erlauben';
+$lang['Allow rating'] = 'Bewertungen von Fotos erlauben';
 $lang['Select at least one comment'] = 'Mindestens einen Kommentar auswählen';
 $lang['Active Plugins'] = 'Aktivierte Plugins';
 $lang['Inactive Plugins'] = 'Deaktivierte Plugins';
@@ -721,8 +721,8 @@ $lang['%s photos can not be regenerated'] = '%s Fotos konnten nicht neu erstellt
 $lang['new'] = 'neu';
 $lang['No results'] = 'Keine Ergebnisse';
 $lang['Searching...'] = 'Suche...';
-$lang['Type in a search term'] = 'Geben Sie bitte einen Suchbegriff ein';
-$lang['Activate icon "new" next to albums and pictures'] = 'Das Icon »Neu« neben den Alben und Fotos aktivieren';
+$lang['Type in a search term'] = 'Suchbegriff eingeben';
+$lang['Activate icon "new" next to albums and pictures'] = 'Das »Neu«-Symbolzeichen bei neuen Alben und Fotos anzeigen';
 $lang['Deactivate all'] = 'Alles deaktivieren';
 $lang['Default photos order'] = 'Voreingestellte Fotoanordnung';
 $lang['Restore'] = 'Zurücksetzen';
@@ -949,7 +949,7 @@ $lang['Resize after upload disabled due to the use of GD as graphic library'] =
 $lang['Select at least one tag'] = 'Mindestens ein Schlagwort auswählen';
 $lang['Basic settings'] = 'Grundeinstellungen';
 $lang['General'] = 'Allgemein';
-$lang['Mail theme'] = 'Mail-Theme';
+$lang['Mail theme'] = 'E-Mail-Theme';
 $lang['%d of %d users selected'] = '%d von %d Benutzern ausgewählt';
 $lang['(filtered from %s total users)'] = '(von insgesamt %s Benutzern gefiltert)';
 $lang['All %d users are selected'] = 'Alle %d Benutzer sind ausgewählt';
@@ -973,7 +973,7 @@ $lang['close'] = 'schließen';
 $lang['Close user details'] = 'Benutzerdetails schließen';
 $lang['Open user details'] = 'Benutzerdetails anzeigen';
 $lang['Activate it now'] = 'Jetzt aktivieren';
-$lang['Allow users to add a link to their website'] = 'Benutzer erlauben einen Link Ihrer Webseite einzufügen';
+$lang['Allow users to add a link to their website'] = 'Benutzer erlauben, einen Link Ihrer Webseite einzufügen';
 $lang['Impossible to deactivate the default theme.'] = 'Es ist nicht möglich, das Standard-Theme zu deaktivieren';
 $lang['Mail address is mandatory for registration'] = 'E-Mail-Adresse wird für die Registrierung benötigt';
 $lang['Empty caddie'] = 'Sammelkorb leeren';
@@ -984,4 +984,13 @@ $lang['between %s and %s MB'] = 'zwischen %s und %s MB';
 $lang['date & time'] = 'Datum und Zeit';
 $lang['file name'] = 'Dateiname';
 $lang['width & height'] = 'Breite und Höhe';
-$lang['Upload in progress'] = 'Upload im Gange';
\ No newline at end of file
+$lang['Upload in progress'] = 'Upload im Gange';
+$lang['Delete %d orphan photos'] = '%d verwaiste Fotos löschen';
+$lang['Each email sent will contain its own automatic authentication key on links, valid for %s.'] = 'Jede gesendete E-Mail enthält einen eigenen automatischen Authentifizierungsschlüssel, der eine bestimmte Zeit gültig ist (%s).';
+$lang['Edit user'] = 'Benutzer bearbeiten';
+$lang['For security reason, authentication keys do not work for administrators.'] = 'Aus Sicherheitsgründen funktionieren Authentifizierungsschlüssel nicht für Administratoren.';
+$lang['No recipient selected'] = 'Kein Empfänger ausgewählt';
+$lang['No user is permitted to see this private album'] = 'Es ist keinem Benutzer erlaubt, dieses private Album zu sehen.';
+$lang['Orphans'] = 'Verwaiste Dateien';
+$lang['Recipients'] = 'Empfänger';
+$lang['Y Repeat'] = 'Y Wiederholen';
\ No newline at end of file
diff --git a/sources/language/de_DE/common.lang.php b/sources/language/de_DE/common.lang.php
index d2b6996..6f5710e 100644
--- a/sources/language/de_DE/common.lang.php
+++ b/sources/language/de_DE/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: Deutsch [DE]
-Version: 2.7.2
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=416
 Author: Piwigo team
 Author URI: http://piwigo.org
@@ -38,8 +38,8 @@ $lang_info['zero_plural'] = false;
 $lang['%d Kb'] = '%d kB';
 $lang['%d album updated'] = '%d Album aktualisiert';
 $lang['%d albums updated'] = '%d Alben aktualisiert';
-$lang['%d comment to validate'] = '%d Kommentar freizuschalten';
-$lang['%d comments to validate'] = '%d Kommentare freizuschalten';
+$lang['%d comment to validate'] = '%d Kommentar zu moderieren';
+$lang['%d comments to validate'] = '%d Kommentare zu moderieren';
 $lang['%d new comment'] = '%d neuer Kommentar';
 $lang['%d new comments'] = '%d neue Kommentare';
 $lang['%d comment'] = '%d Kommentar';
@@ -50,10 +50,10 @@ $lang['%d new photo'] = '%d neues Foto';
 $lang['%d new photos'] = '%d neue Fotos';
 $lang['%d new user'] = '%d neuer Benutzer';
 $lang['%d new users'] = '%d neue Benutzer';
-$lang['About'] = 'Über uns';
+$lang['About'] = 'Info';
 $lang['All tags'] = 'Alle Schlagwörter';
 $lang['Any tag'] = 'Beliebiges Schlagwort';
-$lang['At least one listed rule must be satisfied.'] = 'Mindestens eine aufgelistete Regel muss erfüllt werden.';
+$lang['At least one listed rule must be satisfied.'] = 'Mindestens eine aufgelistete Regel muss erfüllt sein.';
 $lang['Author'] = 'Autor';
 $lang['Albums'] = 'Alben';
 $lang['Album'] = 'Album';
@@ -65,7 +65,7 @@ $lang['Login'] = 'Anmeldung';
 $lang['Contact webmaster'] = 'E-Mail an den Webmaster';
 $lang['Create a new account'] = 'Neues Benutzerkonto erstellen';
 $lang['Created on'] = 'Erstellt am';
-$lang['Creation date'] = 'Erstellungsdatum';
+$lang['Creation date'] = 'Aufnahmedatum';
 $lang['Current password is wrong'] = 'Aktuelles Passwort ist falsch.';
 $lang['Dimensions'] = 'Abmessungen';
 $lang['Display'] = 'Anzeige';
@@ -112,7 +112,7 @@ $lang['Sort by'] = 'Sortieren nach';
 $lang['Sort order'] = 'Sortierreihenfolge';
 $lang['Tag'] = 'Schlagwort';
 $lang['Tags'] = 'Schlagwörter';
-$lang['The RSS notification feed provides notification on news from this website : new photos, updated albums, new comments. Use a RSS feed reader.'] = 'Der RSS-Feed stellt Benachrichtigungen dieser Webseite bereit und informiert Sie über neue Fotos, aktualisierte Alben, neue Kommentare. Benutzen Sie dazu einen RSS-Feed-Reader.';
+$lang['The RSS notification feed provides notification on news from this website : new photos, updated albums, new comments. Use a RSS feed reader.'] = 'Der RSS-Feed stellt Benachrichtigungen dieser Webseite bereit und informiert Sie über neue Fotos, aktualisierte Alben sowie neue Kommentare. Benutzen Sie dazu einen RSS-Feed-Reader.';
 $lang['Unknown feed identifier'] = 'Feed-ID unbekannt.';
 $lang['User comments'] = 'Benutzerkommentare';
 $lang['Username'] = 'Benutzername';
@@ -144,12 +144,12 @@ $lang['Click here if your browser does not automatically forward you'] = 'Klicke
 $lang['comment date'] = 'Datum des Kommentars';
 $lang['Comment'] = 'Kommentar';
 $lang['Your comment has been registered'] = 'Ihr Kommentar wurde gespeichert.';
-$lang['Anti-flood system : please wait for a moment before trying to post another comment'] = 'Anti-Floot-Sperre: Vor dem Absenden eines weiteren Kommentars bitte kurz warten.';
+$lang['Anti-flood system : please wait for a moment before trying to post another comment'] = 'Anti-Flood-Sperre: Vor dem Absenden eines weiteren Kommentars bitte einen Moment warten.';
 $lang['Your comment has NOT been registered because it did not pass the validation rules'] = 'Ihr Kommentar wurde abgelehnt, da er den Validierungsregeln nicht entspricht.';
-$lang['An administrator must authorize your comment before it is visible.'] = 'Ein Administrator muss Ihren Beitrag freischalten, bevor er sichtbar wird.';
+$lang['An administrator must authorize your comment before it is visible.'] = 'Ein Administrator muss Ihren Beitrag freigeben, bevor er sichtbar wird.';
 $lang['This login is already used by another user'] = 'Dieser Benutzername ist bereits vergeben.';
 $lang['Comments'] = 'Kommentare';
-$lang['Add a comment'] = 'Kommentar hinzufügen';
+$lang['Add a comment'] = 'Einen Kommentar hinterlassen';
 $lang['created after %s (%s)'] = 'erstellt nach dem %s (%s)';
 $lang['created before %s (%s)'] = 'erstellt vor dem %s (%s)';
 $lang['created between %s (%s) and %s (%s)'] = 'erstellt zwischen %s (%s) und %s (%s)';
@@ -198,7 +198,7 @@ $lang['Last'] = 'Letzte Seite';
 $lang['Logout'] = 'Abmelden';
 $lang['obligatory'] = 'obligatorisch';
 $lang['display a calendar by creation date'] = 'Fotos nach Aufnahmedatum anzeigen';
-$lang['display all photos in all sub-albums'] = 'Alle Fotos aus allen Unteralben anzeigen';
+$lang['display all photos in all sub-albums'] = 'Alle Fotos aller Unteralben anzeigen';
 $lang['return to normal view mode'] = 'Zurück zur normalen Ansicht';
 $lang['display a calendar by posted date'] = 'Fotos nach Veröffentlichungsdatum anzeigen';
 $lang['month'][10] = 'Oktober';
@@ -220,14 +220,14 @@ $lang['New password'] = 'Neues Passwort';
 $lang['Rate this photo'] = 'Foto bewerten';
 $lang['Next'] = 'Vorwärts';
 $lang['no rate'] = 'noch keine Bewertung';
-$lang['Photos posted within the last %d day.'] = 'Fotos eingestellt im letzten %d Tag.';
-$lang['Photos posted within the last %d days.'] = 'Fotos eingestellt in den letzten %d Tagen.';
+$lang['Photos posted within the last %d day.'] = 'Nur hinzugefügte Fotos des letzten %d Tages.';
+$lang['Photos posted within the last %d days.'] = 'Nur hinzugefügte Fotos der letzten %d Tage.';
 $lang['password updated'] = 'Passwort aktualisiert';
-$lang['Recent period must be a positive integer value'] = 'Der Zeitraum muss eine positive Ganzzahl sein';
+$lang['Recent period must be a positive integer value'] = 'Der Zeitraum muss als positive Ganzzahl definiert werden';
 $lang['photo'] = 'Foto';
 $lang['Click on the photo to see it in high definition'] = 'Klicken Sie auf das Foto, um es in hoher Auflösung zu sehen.';
 $lang['Show file metadata'] = 'Metadaten anzeigen';
-$lang['Powered by'] = 'Betrieben durch';
+$lang['Powered by'] = 'Powered by';
 $lang['Preferences'] = 'Einstellungen';
 $lang['Previous'] = 'Zurück';
 $lang['Random photos'] = 'Zufällige Fotos';
@@ -240,7 +240,7 @@ $lang['display most recent photos'] = 'Die neuesten Fotos anzeigen';
 $lang['Redirection...'] = 'Umleitung...';
 $lang['Please, enter a login'] = 'Bitte geben Sie einen Benutzernamen ein.';
 $lang['login mustn\'t end with a space character'] = 'Benutzername darf nicht mit einem Leerzeichen enden';
-$lang['login mustn\'t start with a space character'] = 'Benutzername darf nicht mit einem Leerzeichen anfangen';
+$lang['login mustn\'t start with a space character'] = 'Benutzername darf nicht mit einem Leerzeichen beginnen';
 $lang['this login is already used'] = 'Dieser Benutzername ist bereits vergeben';
 $lang['mail address must be like xxx@yyy.eee (example : jack@altern.org)'] = 'E-Mail-Adresse muss dem Muster xxx@yyy.eee (Beispiel: jack@altern.org) entsprechen';
 $lang['Auto login'] = 'Auto-Login';
@@ -272,11 +272,11 @@ $lang['return to the display of all photos'] = 'Zurück zu allen Fotos';
 $lang['the beginning'] = 'Beginn';
 $lang['Thumbnails'] = 'Vorschaubilder';
 $lang['Menu'] = 'Menü';
-$lang['A comment on your site'] = 'Ein Kommentar auf Ihrer Website';
+$lang['A comment on your site'] = 'Ein Kommentar zu Ihrer Fotogalerie';
 $lang['today'] = 'heute';
 $lang['Update your rating'] = 'Ihre Bewertung aktualisieren';
 $lang['the username must be given'] = 'Benutzername fehlt';
-$lang['useful when password forgotten'] = 'Nützlich, wenn Sie ihr Passwort vergessen haben';
+$lang['useful when password forgotten'] = 'Nützlich, wenn Sie Ihr Passwort vergessen haben';
 $lang['Quick search'] = 'Schnellsuche';
 $lang['Connected user: %s'] = 'Angemeldete Benutzer: %s';
 $lang['IP: %s'] = 'IP: %s';
@@ -286,7 +286,7 @@ $lang['Comment: %s'] = 'Kommentar: %s';
 $lang['Comment by %s'] = 'Kommentar von %s';
 $lang['User: %s'] = 'Benutzer: %s';
 $lang['Email: %s'] = 'E-Mail-Adresse: %s';
-$lang['Admin: %s'] = 'Verwaltung: %s';
+$lang['Admin: %s'] = 'Admin: %s';
 $lang['Registration of %s'] = 'Registrierung von %s';
 $lang['Album: %s'] = 'Album: %s';
 $lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'Ungültiger »Gast«-Status. Stattdessen wird der Standard-Status verwendet. Bitte informieren Sie den Webmaster.';
@@ -294,19 +294,19 @@ $lang['this email address is already in use'] = 'Diese E-Mail-Adresse wird berei
 $lang['Album results for'] = 'Albumresultate für';
 $lang['Tag results for'] = 'Schlagwortergebnisse für';
 $lang['from %s to %s'] = 'von %s bis %s';
-$lang['Play of slideshow'] = 'Diashow fortsetzen';
+$lang['Play of slideshow'] = 'Diashow abspielen';
 $lang['Pause of slideshow'] = 'Diashow anhalten';
 $lang['Repeat the slideshow'] = 'Diashow wiederholen';
 $lang['Not repeat the slideshow'] = 'Diashow nicht wiederholen';
 $lang['Reduce diaporama speed'] = 'Diashow langsamer';
 $lang['Accelerate diaporama speed'] = 'Diashow schneller';
-$lang['Submit'] = 'Bestätigen';
+$lang['Submit'] = 'Absenden';
 $lang['Yes'] = 'Ja';
 $lang['No'] = 'Nein';
 $lang['%d photo'] = '%d Foto';
 $lang['%d photos'] = '%d Fotos';
-$lang['%d photo is also linked to current tags'] = '%d Foto ist auch mit diesen Schlagwörtern verknüpft';
-$lang['%d photos are also linked to current tags'] = '%d Fotos sind auch mit diesen Schlagwörtern verknüpft';
+$lang['%d photo is also linked to current tags'] = '%d Foto ist ebenfalls mit diesen Schlagwörtern verknüpft';
+$lang['%d photos are also linked to current tags'] = '%d Fotos sind ebenfalls mit diesen Schlagwörtern verknüpft';
 $lang['display photos linked to this tag'] = 'Fotos mit diesem Schlagwort anzeigen';
 $lang['photos posted during the last %d days'] = 'Fotos eingestellt während der letzten %d Tage';
 $lang['Piwigo Help'] = 'Piwigo-Hilfe';
@@ -321,11 +321,11 @@ $lang['Sent by'] = 'Gesendet von';
 $lang['Are you sure?'] = 'Sind Sie sicher?';
 $lang['Cookies are blocked or not supported by your browser. You must enable cookies to connect.'] = 'Cookies werden geblockt oder von Ihrem Browser nicht unterstützt. Sie müssen Cookies erlauben, um sich anzumelden.';
 $lang['Edit a comment'] = 'Einen Kommentar bearbeiten';
-$lang['(!) This comment requires validation'] = '(!) Dieser Kommentar muss überprüft werden.';
+$lang['(!) This comment requires validation'] = '(!) Dieser Kommentar erfordert Überprüfung.';
 $lang['Welcome'] = 'Willkommen';
 $lang['Welcome to your Piwigo photo gallery!'] = 'Willkommen!';
 $lang['... or browse your empty gallery'] = '...oder durchstöbern Sie Ihre leere Galerie.';
-$lang['... or please deactivate this message, I will find my way by myself'] = '...oder übergehe diese Meldung. Ich finde mich selbst zurecht.';
+$lang['... or please deactivate this message, I will find my way by myself'] = '...oder diese Meldung übergehen. Ich finde mich selbst zurecht.';
 $lang['Hello %s, your Piwigo photo gallery is empty!'] = 'Hallo %s, Ihre Piwigo-Fotogalerie ist leer!';
 $lang['I want to add photos'] = 'Ich möchte Fotos hinzufügen.';
 $lang['Manage this user comment: %s'] = 'Diesen Kommentar bearbeiten: %s';
@@ -335,7 +335,7 @@ $lang['html tags are not allowed in login'] = 'HTML-Tags sind im Benutzernamen n
 $lang['The number of photos per page must be a not null scalar'] = 'Die Anzahl der Fotos pro Seite muss eine Ganzzahl größer Null sein.';
 $lang['Number of photos per page'] = 'Anzahl der Fotos pro Seite';
 $lang['%d rates'] = '%d Bewertungen';
-$lang['Rating score'] = 'Bewertungsstand';
+$lang['Rating score'] = 'Bewertung';
 $lang['Change my password'] = 'Mein Passwort ändern';
 $lang['Check your email for the confirmation link'] = 'Überprüfen Sie Ihr E-Mail-Postfach auf eine E-Mail mit Bestätigungslink.';
 $lang['Enter your new password below.'] = 'Neues Passwort unten eingeben.';
@@ -356,7 +356,7 @@ $lang['You will receive a link to create a new password via email.'] = 'Per E-Ma
 $lang['Your password has been reset'] = 'Ihr Passwort wurde zurückgesetzt.';
 $lang['Edit'] = 'Bearbeiten';
 $lang['Hello %s,'] = 'Hallo %s,';
-$lang['Here are your connection settings'] = 'Das sind Ihre Verbindungseinstellungen:';
+$lang['Here are your connection settings'] = 'Dies sind Ihre Verbindungseinstellungen:';
 $lang['If you think you\'ve received this email in error, please contact us at %s'] = 'Sollten Sie diese E-Mail irrtümlich erhalten haben, setzen Sie sich bitte mit uns in Verbindung: %s.';
 $lang['large'] = 'groß';
 $lang['medium'] = 'mittel';
@@ -364,7 +364,7 @@ $lang['Original'] = 'Original';
 $lang['Password: %s'] = 'Passwort: %s';
 $lang['Send my connection settings by email'] = 'Verbindungseinstellungen per E-Mail senden';
 $lang['small'] = 'klein';
-$lang['Someone requested that the password be reset for the following user account:'] = 'Eine Anfrage zum Zurücksetzen des Passworts für den folgenden Benutzer wurde gestellt:';
+$lang['Someone requested that the password be reset for the following user account:'] = 'Eine Anfrage zum Zurücksetzen des Passworts wurde für den folgenden Benutzer gestellt:';
 $lang['square'] = 'quadratisch';
 $lang['Successfully registered, you will soon receive an email with your connection settings. Welcome!'] = 'Erfolgreiche Registrierung! Sie erhalten in Kürze eine E-Mail mit Ihren Zugangsdaten. Herzlich Willkommen!';
 $lang['Thank you for registering at %s!'] = 'Danke für Ihre Registrierung bei %s!';
@@ -403,14 +403,14 @@ $lang['Bad request'] = 'Fehlerhafte Anfrage';
 $lang['Forbidden'] = 'Verboten';
 $lang['Page not found'] = 'Seite nicht gefunden.';
 $lang['Permalink for album not found'] = 'Permalink für Album nicht gefunden.';
-$lang['Piwigo encountered a non recoverable error'] = 'Piwigo ist auf einen nicht nachvollziehbaren Fehler gestoßen.';
+$lang['Piwigo encountered a non recoverable error'] = 'Piwigo ist auf einen nicht behebbaren Fehler gestoßen.';
 $lang['Requested album does not exist'] = 'Das gewählte Album existiert nicht.';
 $lang['Requested tag does not exist'] = 'Das gewähltes Schlagwort existiert nicht.';
 $lang['Email address is mandatory'] = 'Email Adresse ist erforderlich';
 $lang['Username is mandatory'] = 'Benutzername ist erforderlich';
 $lang['mandatory'] = 'erforderlich';
-$lang['Website'] = 'Webseite';
-$lang['Your website URL is invalid'] = 'Deine Webseiten URL ist ungültig';
+$lang['Website'] = 'Ihre Webseite';
+$lang['Your website URL is invalid'] = 'Die Webseiten-URL ist ungültig';
 $lang['Email'] = 'E-Mail';
 $lang['First Page'] = 'Erste Seite';
 $lang['Go back to the album'] = 'Zurück zum Album';
@@ -425,4 +425,5 @@ $lang['Photo title'] = 'Bildtitel';
 $lang['Album name, A → Z'] = 'Albumname, A → Z';
 $lang['Album name, Z → A'] = 'Albumname, Z → A';
 $lang['Apply on properties'] = 'Eigenschaften übernehmen';
-$lang['Link: %s'] = 'Adresse: %s';
\ No newline at end of file
+$lang['Link: %s'] = 'Adresse: %s';
+$lang['Your authentication key is no longer valid.'] = 'Ihr Authentifizierungs-Schlüssel ist nicht mehr gültig.';
\ No newline at end of file
diff --git a/sources/language/de_DE/help/index.php b/sources/language/de_DE/help/index.php
index c8de97f..0b96c3e 100644
--- a/sources/language/de_DE/help/index.php
+++ b/sources/language/de_DE/help/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/de_DE/help/photos_add_ftp.html b/sources/language/de_DE/help/photos_add_ftp.html
index 5dcee02..8a0a07b 100644
--- a/sources/language/de_DE/help/photos_add_ftp.html
+++ b/sources/language/de_DE/help/photos_add_ftp.html
@@ -35,29 +35,38 @@
       Die Albenverzeichnisse sind im Piwigo-Verzeichnis "galleries" untergebracht. 
       Im Folgenden ist der Verzeichnisbaum einer kleinen Galerie dargestellt: 
     
      
-
      +    
       galleries
-|-- Hochzeit
-|   |-- Trauung
-|   |   |-- Ankunft
-|   |   |   |-- Paul.jpg
-|   |   |   +-- Sarah.jpg
-|   |   +-- Abfahrt
-|   |       +-- Paul-und-Sarah.jpg
-|   +-- Feier
-|       |-- tanzen001.jpg
-|       |-- tanzen002.jpg
-|       +-- tanzen003.jpg
-+-- Flitterwochen
-    |-- Hotel.png
-    |-- Video-aus-dem-Flugzeug.avi
-    +-- pwg_representative
-        +-- Video-aus-dem-Flugzeug.jpg
+|-- wedding
+|   |-- celebration
+|   |   |-- arrival
+|   |   |   |-- paul-alone.jpg
+|   |   |   +-- sarah-alone.jpg
+|   |   +-- departure
+|   |       +-- paul-and-sarah.jpg
+|   +-- party
+|       |-- dancers001.jpg
+|       |-- dancers002.jpg
+|       +-- dancers003.jpg
++-- honeymoon
+|   |-- hotel.png
+|   |-- video-from-plane.avi
+|   +-- pwg_representative
+|       +-- video-from-plane.jpg
++-- photoshoot
+    |-- img0001.jpg
+    |-- img0002.jpg
+    +-- pwg_format
+        |-- img0001.cr2
+        |-- img0001.cmyk.jpg
+        |-- img0001.zip
+        |-- img0002.cr2
+        +-- img0002.cmyk.jpg
 
      
 
 
 
    • 
- Außer dem Verzeichnisse "pwg_representative" erzeugt jedes 
+ Außer dem Verzeichnisse "pwg_representative" und "pwg_format" erzeugt jedes 
  Unterverzeichnis ein neues Album in der Galerie.
  Es kann beliebig viele Unterverzeichnisse (Unteralben) geben.
 
      • 
@@ -81,6 +90,8 @@ galleries
    class = "filename">Video-aus-dem-Flugzeug.jpg im Beispiel oben).
 
 
+
    • Multiple formats: a photo can be available in several formats. In this example, we have 3 additional formats for img0001.jpg. You can activate this feature with $conf['enable_formats'] = true; in your local configuration and define a list of formats, like $conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');
      • 
+
 
    • 
   Achtung: Der Name für ein Verzeichnis oder eine Datei darf
   nur aus Buchstaben, Zahlen, "-", "_" und "." bestehen. Leerzeichen, Umlaute, "ß" 
diff --git a/sources/language/de_DE/index.php b/sources/language/de_DE/index.php
index c8de97f..0b96c3e 100644
--- a/sources/language/de_DE/index.php
+++ b/sources/language/de_DE/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/de_DE/install.lang.php b/sources/language/de_DE/install.lang.php
index c13e35f..18abe5c 100644
--- a/sources/language/de_DE/install.lang.php
+++ b/sources/language/de_DE/install.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -35,7 +35,7 @@ $lang['User'] = 'Benutzer';
 $lang['user login given by your host provider'] = 'Benutzername Ihrer MySQL-Datenbank (wie von Ihrem Hosting-Provider angegeben)';
 $lang['user password given by your host provider'] = 'Kennwort Ihrer MySQL-Datenbank (wie von Ihrem Hosting-Provider angegeben)';
 $lang['Database name'] = 'Name der Datenbank';
-$lang['also given by your host provider'] = 'Sowie von Ihrem Hosting-Provider bereitgestellt';
+$lang['also given by your host provider'] = '(auch von Ihrem Hosting-Provider bereitgestellt)';
 $lang['Database table prefix'] = 'Präfix der Datenbanktabellen';
 $lang['database tables names will be prefixed with it (enables you to manage better your tables)'] = 'Präfix der Datenbanktabellen-Namen, damit Tabellen einfacher verwaltet werden können';
 $lang['enter a login for webmaster'] = 'Geben Sie den Benutzernamen des Webmasters an';
@@ -50,20 +50,20 @@ $lang['PHP 5 is required'] = 'PHP 5.2 ist erforderlich';
 $lang['It appears your webhost is currently running PHP %s.'] = 'Anscheinend läuft auf Ihrem Server die PHP-Version %s.';
 $lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo wird versuchen, Ihre Konfiguration auf PHP 5.2 umzustellen. Zu diesem Zweck wird eine .htaccess-Datei erstellt oder geändert.';
 $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'Hinweis: Sie können Ihre Konfiguration selbst ändern. Starten Sie Piwigo danach neu.';
-$lang['Try to configure PHP 5'] = 'Es wird versucht PHP 5.2 zu konfigurieren';
+$lang['Try to configure PHP 5'] = 'Es wird versucht, PHP 5.2 zu konfigurieren';
 $lang['Sorry!'] = 'Verzeihung!';
 $lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo ist nicht in der Lage, PHP 5.2 zu konfigurieren.';
 $lang["You may referer to your hosting provider's support and see how you could switch to PHP 5 by yourself."] = "Sie können Kontakt zu ihrem Hosting-Provider aufnehmen und um Unterstützung bitten zur Umstellung auf PHP 5.";
 $lang['Hope to see you back soon.'] = 'Hoffentlich bis bald!';
 $lang['Congratulations, Piwigo installation is completed'] = 'Glückwunsch! Sie haben Piwigo erfolgreich installiert';
-$lang['An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning : database.inc.php must only contain what is in the textarea, no line return or space character)'] = 'Sie können auch den Text in der Box unten kopieren und in die Datei local/config/database.inc.php einfügen. (Warnung: database.inc.php darf nur reinen Text ohne Zeilenumbrüche und Leerzeichen enthalten)';
-$lang['Creation of config file local/config/database.inc.php failed.'] = 'Die Erstellung der Datei local/config/database.inc.php ist fehlgeschlagen.';
+$lang['An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning : database.inc.php must only contain what is in the textarea, no line return or space character)'] = 'Sie können auch den Text aus der Box unten kopieren und in die Datei local/config/database.inc.php einfügen. (Warnung: database.inc.php darf nur reinen Text ohne Zeilenumbrüche und Leerzeichen enthalten)';
+$lang['Creation of config file local/config/database.inc.php failed.'] = 'Das Erstellen der Datei local/config/database.inc.php ist fehlgeschlagen.';
 $lang['Download the config file'] = 'Die Konfigurationsdatei herunterladen';
 $lang['You can download the config file and upload it to local/config directory of your installation.'] = 'Sie können die Konfigurationsdatei herunterladen und in das Verzeichnis local/config Ihrer Installation hochladen.';
 $lang['Just another Piwigo gallery'] = 'Meine Piwigo-Fotogalerie';
 $lang['Welcome to my photo gallery'] = 'Willkommen!';
 $lang['Don\'t hesitate to consult our forums for any help : %s'] = 'Besuchen Sie für Hilfe unser Forum: %s';
 $lang['Welcome to your new installation of Piwigo!'] = 'Ihre neue Piwigo-Installation heißt Sie willkommen!';
-$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Sie können Kontakt mit Ihrem Provider aufnehmen und um Unterstützung bei der Umstellung auf PHP 5.2 bitten.';
-$lang['localhost or other, supplied by your host provider'] = 'Localhost oder weitere, bereitgestellt durch Ihren Provider';
+$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Sie sollten Kontakt mit Ihrem Provider aufnehmen und um Unterstützung bei der Umstellung auf PHP 5.2 bitten.';
+$lang['localhost or other, supplied by your host provider'] = '\'localhost\' oder Name des DB-Servers, bereitgestellt durch Ihren Hosting-Provider';
 $lang['Password ']['confirm'] = 'Kennwort [Bestätigung]';
\ No newline at end of file
diff --git a/sources/language/de_DE/upgrade.lang.php b/sources/language/de_DE/upgrade.lang.php
index 3684ccd..872d0bc 100644
--- a/sources/language/de_DE/upgrade.lang.php
+++ b/sources/language/de_DE/upgrade.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/dv_MV/common.lang.php b/sources/language/dv_MV/common.lang.php
index c5d6cc8..e70b6eb 100644
--- a/sources/language/dv_MV/common.lang.php
+++ b/sources/language/dv_MV/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: Dhivehi [MV]
-Version: 2.5.0
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=570
 Author: Piwigo team
 Author URI: http://piwigo.org
diff --git a/sources/language/dv_MV/index.php b/sources/language/dv_MV/index.php
index c8de97f..0b96c3e 100644
--- a/sources/language/dv_MV/index.php
+++ b/sources/language/dv_MV/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/el_GR/admin.lang.php b/sources/language/el_GR/admin.lang.php
index b202ae7..661c2cb 100644
--- a/sources/language/el_GR/admin.lang.php
+++ b/sources/language/el_GR/admin.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -984,4 +984,13 @@ $lang['between %s and %s MB'] = 'μεταξύ %s και %s MB';
 $lang['based on'] = 'βασισμένο σε';
 $lang['The settings for the guest are from the %s user'] = 'Οι ρυθμίσεις για τους επισκέπτες είναι από το χρήστη %s';
 $lang['No and unlock sub-albums'] = 'Όχι και ξεκλείδωμα υπο-λευκώματα';
-$lang['Upload in progress'] = 'Μεταφόρτωση σε εξέλιξη ';
\ No newline at end of file
+$lang['Upload in progress'] = 'Μεταφόρτωση σε εξέλιξη ';
+$lang['Y Repeat'] = 'Y Επανάληψη';
+$lang['Recipients'] = 'Παραλήπτες';
+$lang['Orphans'] = 'Ορφανά';
+$lang['No user is permitted to see this private album'] = 'Κανένας χρήστης δεν επιτρέπεται να δεί αυτό το ιδιωτικό λεύκωμα';
+$lang['No recipient selected'] = 'Δεν έχει επιλεγεί παραλήπτης';
+$lang['For security reason, authentication keys do not work for administrators.'] = 'Για λόγους ασφαλείας, τα πλήκτρα ελέγχου ταυτότητας δεν λειτουργούν για διαχειριστές.';
+$lang['Edit user'] = 'Επεξεργασία χρήστη';
+$lang['Each email sent will contain its own automatic authentication key on links, valid for %s.'] = 'Κάθε email που στέλνεται θα περιέχει το δικό του κλειδί για αυτόματο έλεγχο ταυτότητας της σε συνδέσμους, που ισχύει για το %s.';
+$lang['Delete %d orphan photos'] = 'Διαγραφή %d ορφανών φωτογραφιών';
\ No newline at end of file
diff --git a/sources/language/el_GR/common.lang.php b/sources/language/el_GR/common.lang.php
index 233ae8e..ef3d03b 100644
--- a/sources/language/el_GR/common.lang.php
+++ b/sources/language/el_GR/common.lang.php
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: Ελληνικά [GR]
-Version: 2.7.0
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=508
 Author: Piwigo team
 Author URI: http://piwigo.org
@@ -425,4 +425,5 @@ $lang['Photo description'] = 'Περιγραφή Φωτογραφίας';
 $lang['Apply on properties'] = 'Εφαρμόστε σε ιδιότητες';
 $lang['Album name, Z → A'] = 'Όνομα Λευκώματος, Ω → Α';
 $lang['Album name, A → Z'] = 'Όνομα Λευκώματος, Α → Ω';
-$lang['Link: %s'] = 'Σύνδεσμος: %s';
\ No newline at end of file
+$lang['Link: %s'] = 'Σύνδεσμος: %s';
+$lang['Your authentication key is no longer valid.'] = 'Το κλειδί ταυτοποίησης σας δεν είναι πλέον έγκυρο.';
\ No newline at end of file
diff --git a/sources/language/el_GR/help/photos_add_ftp.html b/sources/language/el_GR/help/photos_add_ftp.html
index e29c2a4..07b1458 100755
--- a/sources/language/el_GR/help/photos_add_ftp.html
+++ b/sources/language/el_GR/help/photos_add_ftp.html
@@ -1,68 +1,79 @@
-
      
-  Γρήγορη Εκκίνηση
-
-
        
-  
      1. Δημιουργήστε έναν κατάλογο στον υπολογιστή σας.
        2.   
-
-  
      2. Αντιγράψτε μερικές φωτογραφίες μέσα σε αυτόν τον κατάλογο, κι αλλάξετε το μέγεθός τους για προβολή σε ιστοσελίδες. Προειδοποίηση: το όνομα των αρχείων και καταλόγων πρέπει να περιέχει μόνο γράμματα, αριθμούς, "-", "_" ή ".". Όχι κενά διαστήματα, ούτε τονιζόμενους χαρακτήρες.
        3. 
-
-  
      3. Με τη βοήθεια ενός προγράμματος FTP, αντιγράψτε τον κατάλογό σας στο κατάλογο "galleries" της Piwigo εγκατάστασης σας .
        4. 
-
-  
      4. Συνδεθείτε στη γκαλερί σας και πηγαίνετε στο Διαχείριση και κάντε κλικ στο μεγάλο κουμπί Συγχρονισμός.
        5. 
-
      
-
-
      Συγχαρητήρια! Έχετε δημιουργήσει με επιτυχία το πρώτο λεύκωμα της συλλογής φωτογραφιών σας.
      
-
      
-
-
      
-  Οργάνωση καταλόγων και αρχείων
-
-
        
-
-  
      • 
-
-    
        Καταλόγοι λευκωμάτων στον κατάλογο "galleries" του Piwigo.
-     Ακολουθεί παρακάτω το δέντρο καταλόγου μιας πολύ μικρής γκαλερί(αλλά
-    με πολλά χαρακτηριστικά γνωρίσματα):
        
-
-    
        -Γκαλλερί
-|-- γάμος
-|   |-- εορτασμός
-|   |   |-- άφιξη
-|   |   |   |-- paul-alone.jpg
-|   |   |   +-- sarah-alone.jpg
-|   |   +-- αναχώρηση
-|   |       +-- paul-and-sarah.jpg
-|   +-- πάρτυ
-|       |-- dancers001.jpg
-|       |-- dancers002.jpg
-|       +-- dancers003.jpg
-+-- μήνας του μέλιτος
-    |-- hotel.png
-    |-- video-from-plane.avi
-    +-- pwg_representative
-        +-- video-from-plane.jpg
-
        
-
-  
        • 
-
-  
      • Εκτός από "pwg_representative" (βλέπε τις εξηγήσεις παρακάτω), κάθε κατάλογο κάτω απο το "galleries" παράγει ένα λεύκωμα. Δεν υπάρχει όριο στο βάθος.
        • 
-
-  
      • Βασικά, κάθε στοιχείο αντιπροσωπεύεται από ένα αρχείο. Ένα αρχείο μπορεί να είναι ένα
-  στοιχείο Piwigo εάν η επέκταση της είναι μεταξύ file_ext των
-  δυνατότητων παράμετρου διαμόρφωσης(βλέπε include/config_default.inc.php file). Ένα αρχείο μπορεί
-  να είναι μια εικόνα εάν η επέκταση της είναι μεταξύ picture_ext
-  των δυνατότητων παράμετρου διαμόρφωσης.
        • 
-
-  
      • Δεν υπάρχουν στοιχεία φωτογραφία (βίντεο, ήχους, κείμενα αρχείου, ό, τι θέλετε ...) αντιπροσωπεύονται από προεπιλογή από ένα εικονίδιο που αντιστοιχεί στο όνομα επέκτασης αρχείου. Προαιρετικά, μπορείτε να συνδέσετε μια μικρογραφία και ένα αντιπροσωπευτικό αρχείο (βλέπε video.avi στο παραπάνω παράδειγμα).
        • 
-
-  
      • Προειδοποίηση: το όνομα των αρχείων και καταλόγων πρέπει να περιέχει μόνο γράμματα, αριθμούς, "-", "_" ή ".". Όχι κενά διαστήματα, ούτε τονιζόμενους χαρακτήρες.
        • 
-
-  
      • Αφού οι φωτογραφίες είναι σωστά τοποθετημένους
-  καταλόγους, μεταβείτε στη διεύθυνση: Διαχείρηση » Εργαλεία »
-  Συνγχρονισμός
        • 
-
-
      
-
      
\ No newline at end of file
+
      
+  Γρήγορη Εκκίνηση
+
+
        
+  
      1. Δημιουργήστε έναν κατάλογο στον υπολογιστή σας.
        2.   
+
+  
      2. Αντιγράψτε μερικές φωτογραφίες μέσα σε αυτόν τον κατάλογο, κι αλλάξετε το μέγεθός τους για προβολή σε ιστοσελίδες. Προειδοποίηση: το όνομα των αρχείων και καταλόγων πρέπει να περιέχει μόνο γράμματα, αριθμούς, "-", "_" ή ".". Όχι κενά διαστήματα, ούτε τονιζόμενους χαρακτήρες.
        3. 
+
+  
      3. Με τη βοήθεια ενός προγράμματος FTP, αντιγράψτε τον κατάλογό σας στο κατάλογο "galleries" της Piwigo εγκατάστασης σας .
        4. 
+
+  
      4. Συνδεθείτε στη γκαλερί σας και πηγαίνετε στο Διαχείριση και κάντε κλικ στο μεγάλο κουμπί Συγχρονισμός.
        5. 
+
      
+
+
      Συγχαρητήρια! Έχετε δημιουργήσει με επιτυχία το πρώτο λεύκωμα της συλλογής φωτογραφιών σας.
      
+
      
+
+
      
+  Οργάνωση καταλόγων και αρχείων
+
+
        
+
+  
      • 
+
+    
        Καταλόγοι λευκωμάτων στον κατάλογο "galleries" του Piwigo.
+     Ακολουθεί παρακάτω το δέντρο καταλόγου μιας πολύ μικρής γκαλερί(αλλά
+    με πολλά χαρακτηριστικά γνωρίσματα):
        
+
+    
        +galleries
+|-- wedding
+|   |-- celebration
+|   |   |-- arrival
+|   |   |   |-- paul-alone.jpg
+|   |   |   +-- sarah-alone.jpg
+|   |   +-- departure
+|   |       +-- paul-and-sarah.jpg
+|   +-- party
+|       |-- dancers001.jpg
+|       |-- dancers002.jpg
+|       +-- dancers003.jpg
++-- honeymoon
+|   |-- hotel.png
+|   |-- video-from-plane.avi
+|   +-- pwg_representative
+|       +-- video-from-plane.jpg
++-- photoshoot
+    |-- img0001.jpg
+    |-- img0002.jpg
+    +-- pwg_format
+        |-- img0001.cr2
+        |-- img0001.cmyk.jpg
+        |-- img0001.zip
+        |-- img0002.cr2
+        +-- img0002.cmyk.jpg
+
        
+
+  
        • 
+
+  
      • Εκτός από "pwg_representative" and "pwg_format" (βλέπε τις εξηγήσεις παρακάτω), κάθε κατάλογο κάτω απο το "galleries" παράγει ένα λεύκωμα. Δεν υπάρχει όριο στο βάθος.
        • 
+
+  
      • Βασικά, κάθε στοιχείο αντιπροσωπεύεται από ένα αρχείο. Ένα αρχείο μπορεί να είναι ένα
+  στοιχείο Piwigo εάν η επέκταση της είναι μεταξύ file_ext των
+  δυνατότητων παράμετρου διαμόρφωσης(βλέπε include/config_default.inc.php file). Ένα αρχείο μπορεί
+  να είναι μια εικόνα εάν η επέκταση της είναι μεταξύ picture_ext
+  των δυνατότητων παράμετρου διαμόρφωσης.
        • 
+
+  
      • Δεν υπάρχουν στοιχεία φωτογραφία (βίντεο, ήχους, κείμενα αρχείου, ό, τι θέλετε ...) αντιπροσωπεύονται από προεπιλογή από ένα εικονίδιο που αντιστοιχεί στο όνομα επέκτασης αρχείου. Προαιρετικά, μπορείτε να συνδέσετε μια μικρογραφία και ένα αντιπροσωπευτικό αρχείο (βλέπε video.avi στο παραπάνω παράδειγμα).
        • 
+
+  
      • Multiple formats: a photo can be available in several formats. In this example, we have 3 additional formats for img0001.jpg. You can activate this feature with $conf['enable_formats'] = true; in your local configuration and define a list of formats, like $conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');
        • 
+
+  
      • Προειδοποίηση: το όνομα των αρχείων και καταλόγων πρέπει να περιέχει μόνο γράμματα, αριθμούς, "-", "_" ή ".". Όχι κενά διαστήματα, ούτε τονιζόμενους χαρακτήρες.
        • 
+
+  
      • Αφού οι φωτογραφίες είναι σωστά τοποθετημένους
+  καταλόγους, μεταβείτε στη διεύθυνση: Διαχείρηση » Εργαλεία »
+  Συνγχρονισμός
        • 
+
+
      
+
      
diff --git a/sources/language/el_GR/index.php b/sources/language/el_GR/index.php
index c8de97f..0b96c3e 100644
--- a/sources/language/el_GR/index.php
+++ b/sources/language/el_GR/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/el_GR/install.lang.php b/sources/language/el_GR/install.lang.php
index b749253..82c5a9b 100644
--- a/sources/language/el_GR/install.lang.php
+++ b/sources/language/el_GR/install.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -30,14 +30,14 @@ $lang['Password [confirm]'] = "Κωδικός [επιβεβαίωση]";
 $lang['verification'] = "Επιβεβαίωση";
 $lang['Need help ? Ask your question on Piwigo message board.'] = "Χρειάζεστε βοήθεια; Ρωτήστε στο Πίνακα μηνυμάτων του Piwigo.";
 $lang['Visitors will be able to contact site administrator with this mail'] = "Οι επισκέπτες θα μπορούν να χρησιμοποιήσουν αυτό το email για να επικοινωνήσουν με τον διαχειριστή του site";
-$lang['PHP 5 is required'] = "Aπαιτείτε PHP 5";
+$lang['PHP 5 is required'] = 'Aπαιτείτε PHP 5.2';
 $lang['It appears your webhost is currently running PHP %s.'] = "Φαίνετται ότι ο webhost τώρα τρέχει PHP %s.";
-$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = "Το Piwigo θα προσπαθήσει να αλλάξει την διαμόρφωση της PHP 5 δημιουργώντας ή τροποποιώντας ένα .htaccess αρχείο.";
+$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Το Piwigo θα προσπαθήσει να αλλάξει την διαμόρφωση της PHP 5.2 δημιουργώντας ή τροποποιώντας ένα .htaccess αρχείο.';
 $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = "Λάβε υπ' όψη ότι μπορείς να αλλάξεις την διαμόρφωση και να επανεκκινήσεις το Piwigo μετά από αυτό.";
-$lang['Try to configure PHP 5'] = "Προσπάθησε να διαμορφώσεις την PHP 5";
+$lang['Try to configure PHP 5'] = 'Προσπάθησε να διαμορφώσεις την PHP 5.2';
 $lang['Sorry!'] = "Συγγνώμη!";
-$lang['Piwigo was not able to configure PHP 5.'] = "Το Piwigo δεν είναι σε θέση να διαμορφώσει την PHP 5.";
-$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = "Πρέπει να αναφέρετε στην υποστήριξη του παροχέα ςσας για να διαπιστώσετε πως μπορείτε να αλλάξετε σε PHP 5 μόνοι σας.";
+$lang['Piwigo was not able to configure PHP 5.'] = 'Το Piwigo δεν είναι σε θέση να διαμορφώσει την PHP 5.2';
+$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Πρέπει να αναφέρετε στην υποστήριξη του παροχέα ςσας για να διαπιστώσετε πως μπορείτε να αλλάξετε σε PHP 5.2 μόνοι σας.';
 $lang['Hope to see you back soon.'] = "Ελπίζουμε να σας δούμε πάλι σύντομα.";
 $lang['Congratulations, Piwigo installation is completed'] = 'Συγχαρητήρια, η εγκατάσταση του Piwigo ολοκληρώθηκε';
 $lang['An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning : database.inc.php must only contain what is in the textarea, no line return or space character)'] = 'Μια εναλλακτική λύση είναι να αντιγράψετε το κείμενο σε στο πλαίσιο παρακάτω και να το επικολλήστε στο αρχείο "local/config/database.inc.php" (Προειδοποίηση : το database.inc.php πρέπει να περιέχει ότι είναι στην περιοχή κειμένου, χωρίς enter ή κενό)';
@@ -64,5 +64,4 @@ $lang['Welcome to your new installation of Piwigo!'] = 'Καλώς ήρθατε
 $lang['also given by your host provider'] = 'Επίσης, δίνεται από την εταιρία φιλοξενίας σας';
 $lang['user login given by your host provider'] = 'Όνομα χρήστη που έχει λάβει από το φορέα υποδοχής σας';
 $lang['user password given by your host provider'] = 'Κωδικός προσβασης χρήστη που έχει λάβει από το φορέα υποδοχής σας';
-$lang['localhost or other, supplied by your host provider'] = 'localhost ή άλλο, που σας παρέχεται από τον πάροχο φιλοξενίας σας';
-?>
\ No newline at end of file
+$lang['localhost or other, supplied by your host provider'] = 'localhost ή άλλο, που σας παρέχεται από τον πάροχο φιλοξενίας σας';
\ No newline at end of file
diff --git a/sources/language/el_GR/upgrade.lang.php b/sources/language/el_GR/upgrade.lang.php
index 29b9635..ab5d1ab 100755
--- a/sources/language/el_GR/upgrade.lang.php
+++ b/sources/language/el_GR/upgrade.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/en_GB/admin.lang.php b/sources/language/en_GB/admin.lang.php
index b6cce5b..94ddda9 100644
--- a/sources/language/en_GB/admin.lang.php
+++ b/sources/language/en_GB/admin.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -160,4 +160,24 @@ $lang['Help Me'] = 'Help me';
 $lang['An error occured during extraction (%s).'] = 'An error occurred during the files (%s) extraction.';
 $lang['An error has occured during upgrade.'] = 'An error has occurred during upgrade.';
 $lang['An error has occured during extract. Please check files permissions of your piwigo installation.
      Click here to show log error.'] = 'An error has occurred during extract. Please check file permissions of your Piwigo installation.
      Click here to show log error.';
-$lang['Empty caddie'] = 'Empty basket';
\ No newline at end of file
+$lang['Empty caddie'] = 'Empty basket';
+$lang[' and %d virtual'] = ' and %d virtual';
+$lang[' and %d virtuals'] = ' and %d virtual';
+$lang['%d album moved'] = '%d album moved';
+$lang['%d albums moved'] = '%d albums moved';
+$lang['%d anomalies have been detected corrected.'] = '%d anomalies have been detected and corrected.';
+$lang['%d anomalies have been detected.'] = '%d anomalies have been detected.';
+$lang['%d anomalies have been ignored.'] = '%d anomalies have been ignored.';
+$lang['%d anomalies have not been corrected.'] = '%d anomalies have not been corrected.';
+$lang['%d anomaly has been corrected.'] = '%d anomaly has been corrected.';
+$lang['%d anomaly has been detected.'] = '%d anomaly has been detected.';
+$lang['%d anomaly has been ignored.'] = '%d anomaly has been ignored.';
+$lang['%d anomaly has not been corrected.'] = '%d anomaly has not been corrected.';
+$lang['%d association'] = '%d association';
+$lang['%d associations'] = '%d associations';
+$lang['%d day'] = '%d day';
+$lang['%d days'] = '%d days';
+$lang['%d group'] = '%d group';
+$lang['%d groups'] = '%d groups';
+$lang['%d guest'] = '%d guest';
+$lang['%d guests'] = '%d guests';
\ No newline at end of file
diff --git a/sources/language/en_GB/common.lang.php b/sources/language/en_GB/common.lang.php
index f328d25..c6b217f 100644
--- a/sources/language/en_GB/common.lang.php
+++ b/sources/language/en_GB/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: English [GB]
-Version: 2.7.0
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=716
 Author: Piwigo team
 Author URI: http://piwigo.org
diff --git a/sources/language/en_GB/index.php b/sources/language/en_GB/index.php
index c8de97f..0b96c3e 100644
--- a/sources/language/en_GB/index.php
+++ b/sources/language/en_GB/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/en_GB/install.lang.php b/sources/language/en_GB/install.lang.php
index 8f5d165..8197396 100755
--- a/sources/language/en_GB/install.lang.php
+++ b/sources/language/en_GB/install.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/en_UK/admin.lang.php b/sources/language/en_UK/admin.lang.php
index 3312822..ba13047 100644
--- a/sources/language/en_UK/admin.lang.php
+++ b/sources/language/en_UK/admin.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -435,7 +435,7 @@ $lang['Installed Themes'] = "Installed Themes";
 $lang['Instructions to use Piwigo'] = "Instructions to use Piwigo";
 $lang['Invert'] = 'Invert';
 $lang['IP'] = "IP";
-$lang['iPhoto is the default photo manager on MacOSX. The Piwigo export plugin let you create new albums and export your photos directly from iPhoto to your Piwigo photo gallery.'] = 'iPhoto is the default photo manager on MacOSX. The Piwigo export plugin let you create new albums and export your photos directly from iPhoto to your Piwigo photo gallery.';
+$lang['iPhoto is the default photo manager on MacOSX. The Piwigo export plugin let you create new albums and export your photos directly from iPhoto to your Piwigo photo gallery.'] = 'iPhoto is the default photo manager on MacOSX. The Piwigo export plugin lets you create new albums and export your photos directly from iPhoto to your Piwigo photo gallery.';
 $lang['jump to album'] = "jump to album";
 $lang['jump to photo'] = "jump to photo";
 $lang['Keep in touch with Piwigo project, subscribe to Piwigo Announcement Newsletter. You will receive emails when a new release is available (sometimes including a security bug fix, it\'s important to know and upgrade) and when major events happen to the project. Only a few emails a year.'] = "Keep in touch with Piwigo project, subscribe to Piwigo Announcement Newsletter. You will be sent emails when a new release is available (sometimes including a security bug fix, it is important to know and upgrade) and when major events happen to the project. Only a few emails a year.";
@@ -931,6 +931,7 @@ $lang['wrong filename'] = "wrong filename";
 $lang['X Position'] = 'X Position';
 $lang['X Repeat'] = 'X Repeat';
 $lang['Y Position'] = 'Y Position';
+$lang['Y Repeat'] = 'Y Repeat';
 $lang['Year'] = "Year";
 $lang['You are running on development sources, no check possible.'] = "You are running on development sources, no check possible.";
 $lang['You are running the latest version of Piwigo.'] = "You are running Piwigo latest version.";
@@ -980,4 +981,12 @@ $lang['based on'] = 'based on';
 $lang['file name'] = 'file name';
 $lang['date & time'] = 'date & time';
 $lang['width & height'] = 'width & height';
-$lang['Upload in progress'] = 'Upload in progress';
\ No newline at end of file
+$lang['Upload in progress'] = 'Upload in progress';
+$lang['Orphans'] = 'Orphans';
+$lang['Delete %d orphan photos'] = 'Delete %d orphan photos';
+$lang['Edit user'] = 'Edit user';
+$lang['Recipients'] = 'Recipients';
+$lang['No recipient selected'] = 'No recipient selected';
+$lang['No user is permitted to see this private album'] = 'No user is permitted to see this private album';
+$lang['Each email sent will contain its own automatic authentication key on links, valid for %s.'] = 'Each email sent will contain its own automatic authentication key on links, valid for %s.';
+$lang['For security reason, authentication keys do not work for administrators.'] = 'For security reason, authentication keys do not work for administrators.';
\ No newline at end of file
diff --git a/sources/language/en_UK/common.lang.php b/sources/language/en_UK/common.lang.php
index 512cbad..30de664 100644
--- a/sources/language/en_UK/common.lang.php
+++ b/sources/language/en_UK/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: English [UK]
-Version: 2.7.1
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=417
 Author: Piwigo team
 Author URI: http://piwigo.org
@@ -425,4 +425,5 @@ $lang['Photo description'] = 'Photo description';
 $lang['Album name, A → Z'] = 'Album name, A → Z';
 $lang['Album name, Z → A'] = 'Album name, Z → A';
 $lang['Link: %s'] = 'Link: %s';
+$lang['Your authentication key is no longer valid.'] = 'Your authentication key is no longer valid.';
 ?>
\ No newline at end of file
diff --git a/sources/language/en_UK/help/index.php b/sources/language/en_UK/help/index.php
index c8de97f..0b96c3e 100644
--- a/sources/language/en_UK/help/index.php
+++ b/sources/language/en_UK/help/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/en_UK/help/photos_add_ftp.html b/sources/language/en_UK/help/photos_add_ftp.html
index 3d39f1e..ce90aeb 100644
--- a/sources/language/en_UK/help/photos_add_ftp.html
+++ b/sources/language/en_UK/help/photos_add_ftp.html
@@ -39,15 +39,24 @@ galleries
 |       |-- dancers002.jpg
 |       +-- dancers003.jpg
 +-- honeymoon
-    |-- hotel.png
-    |-- video-from-plane.avi
-    +-- pwg_representative
-        +-- video-from-plane.jpg
+|   |-- hotel.png
+|   |-- video-from-plane.avi
+|   +-- pwg_representative
+|       +-- video-from-plane.jpg
++-- photoshoot
+    |-- img0001.jpg
+    |-- img0002.jpg
+    +-- pwg_format
+        |-- img0001.cr2
+        |-- img0001.cmyk.jpg
+        |-- img0001.zip
+        |-- img0002.cr2
+        +-- img0002.cmyk.jpg
 
      • 
 
   
 
-  
    • Except for "pwg_representative" (see explanations below), each directory under "galleries" produces a album. There is no limit on deepness.
      • 
+  
    • Except for "pwg_representative" and "pwg_format" (see explanations below), each directory under "galleries" produces a album. There is no limit on deepness.
      • 
 
   
    • Basically, an element is represented by a file. A file can be a
   Piwigo element if its extension is among file_ext
@@ -56,10 +65,12 @@ galleries
   be a picture if its extension is among picture_ext
   configuration parameter possibilities.
      • 
 
-  
    • No photo elements (video, sounds, file texts, whatever you want...) are represented by default by an icon corresponding to the filename
+  
    • Non photo elements (video, sounds, file texts, whatever you want...) are represented by default by an icon corresponding to the filename
   extension. Optionally, you can associate a thumbnail and a representative
   file (see video.avi in the example above).
      • 
 
+  
    • Multiple formats: a photo can be available in several formats. In this example, we have 3 additional formats for img0001.jpg. You can activate this feature with $conf['enable_formats'] = true; in your local configuration and define a list of formats, like $conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');
      • 
+
   
    • Warning: the name of directories and files must contain only letters, figures, "-", "_" or ".". No blank space, nor accentuated characters.
      • 
 
   
    • Once photos are correctly placed in the
diff --git a/sources/language/en_UK/help/quick_search.html b/sources/language/en_UK/help/quick_search.html
index 717c09a..d78652a 100644
--- a/sources/language/en_UK/help/quick_search.html
+++ b/sources/language/en_UK/help/quick_search.html
@@ -67,6 +67,13 @@
 file:DSC_
 
 
+
+author:
+
+Searches by author.
      
+author:John
+
+
 
 created:
      
 taken:
diff --git a/sources/language/en_UK/index.php b/sources/language/en_UK/index.php
index c8de97f..0b96c3e 100644
--- a/sources/language/en_UK/index.php
+++ b/sources/language/en_UK/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/en_UK/install.lang.php b/sources/language/en_UK/install.lang.php
index 17f94e1..a8da0a8 100644
--- a/sources/language/en_UK/install.lang.php
+++ b/sources/language/en_UK/install.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -47,14 +47,14 @@ $lang['Password [confirm]'] = "Password [confirm]";
 $lang['verification'] = "verification";
 $lang['Need help ? Ask your question on Piwigo message board.'] = 'Need help? Ask your question on the Piwigo message board.';
 $lang['Visitors will be able to contact site administrator with this mail'] = 'Visitors will be able to use this email to contact the site administrator';
-$lang['PHP 5 is required'] = "PHP 5 is required";
+$lang['PHP 5 is required'] = 'PHP 5.2 is required';
 $lang['It appears your webhost is currently running PHP %s.'] = "It appears your webhost is currently running PHP %s.";
-$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = "Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.";
+$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo may try to switch your configuration to PHP 5.2 by creating or modifying a .htaccess file.';
 $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'Note you can change your configuration by yourself and then restart Piwigo.';
-$lang['Try to configure PHP 5'] = "Try to configure PHP 5";
+$lang['Try to configure PHP 5'] = 'Try to configure PHP 5.2';
 $lang['Sorry!'] = "Sorry!";
-$lang['Piwigo was not able to configure PHP 5.'] = "Piwigo was not able to configure PHP 5.";
-$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = "You should refer to your hosting provider's support and see how you can switch to PHP 5 by yourself.";
+$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo was not able to configure PHP 5.2';
+$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'You should refer to your hosting provider\'s support and see how you can switch to PHP 5.2 by yourself.';
 $lang['Hope to see you back soon.'] = "Hope to see you back soon.";
 $lang['Congratulations, Piwigo installation is completed'] = 'Congratulations, Piwigo installation is completed';
 $lang['An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning : database.inc.php must only contain what is in the textarea, no line return or space character)'] = 'An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning: database.inc.php must only contain what is in the textarea, no line return or space character)';
@@ -64,5 +64,4 @@ $lang['You can download the config file and upload it to local/config directory
 $lang['Just another Piwigo gallery'] = 'Just another Piwigo gallery';
 $lang['Welcome to my photo gallery'] = 'Welcome to my photo gallery';
 $lang['Welcome to your new installation of Piwigo!'] = 'Welcome to your new installation of Piwigo!';
-$lang['Don\'t hesitate to consult our forums for any help : %s'] = 'Don\'t hesitate to consult our forums for any help: %s';
-?>
\ No newline at end of file
+$lang['Don\'t hesitate to consult our forums for any help : %s'] = 'Don\'t hesitate to consult our forums for any help: %s';
\ No newline at end of file
diff --git a/sources/language/en_UK/upgrade.lang.php b/sources/language/en_UK/upgrade.lang.php
index 3d40fce..f279fe6 100644
--- a/sources/language/en_UK/upgrade.lang.php
+++ b/sources/language/en_UK/upgrade.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/en_US/admin.lang.php b/sources/language/en_US/admin.lang.php
index fec4125..d8c873d 100644
--- a/sources/language/en_US/admin.lang.php
+++ b/sources/language/en_US/admin.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/en_US/common.lang.php b/sources/language/en_US/common.lang.php
index 0c442e4..f21487f 100644
--- a/sources/language/en_US/common.lang.php
+++ b/sources/language/en_US/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: English [US]
-Version: 2.7.1
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=717
 Author: Piwigo team
 Author URI: http://piwigo.org
diff --git a/sources/language/en_US/index.php b/sources/language/en_US/index.php
index c8de97f..0b96c3e 100644
--- a/sources/language/en_US/index.php
+++ b/sources/language/en_US/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/eo_EO/admin.lang.php b/sources/language/eo_EO/admin.lang.php
index db18ea4..b9e71fb 100644
--- a/sources/language/eo_EO/admin.lang.php
+++ b/sources/language/eo_EO/admin.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/eo_EO/common.lang.php b/sources/language/eo_EO/common.lang.php
index 49346d1..22fc3d8 100644
--- a/sources/language/eo_EO/common.lang.php
+++ b/sources/language/eo_EO/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: Esperanto [EO]
-Version: 2.7.1
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=596
 Author: Piwigo team
 Author URI: http://piwigo.org
diff --git a/sources/language/eo_EO/help/help_misc.html b/sources/language/eo_EO/help/help_misc.html
new file mode 100644
index 0000000..77ab2dd
--- /dev/null
+++ b/sources/language/eo_EO/help/help_misc.html
@@ -0,0 +1,9 @@
+
      Post kreado de via galerio eblas al vi agordi ĝin por viaj vizitontoj
+
        
+	
      • La apriora montro kiel vi deziras en Administrado » Agordoj » Elektebloj langeto Agordoj de invitito
        • 
+	
      • La apriora temo en Administrado » Agordoj » Temoj
        • 
+	
      • La apriora lingvo en Administrado » Agordoj » Lingvoj
        • 
+ 
      
+ Apriore, ĉiu nova uzanto ricevos tiujn ecojn je registriĝo.
+
      
+
      Se vi havas iun ajn demandon, Piwigo-komunumo bonvenigos vin ĉe ĝia forumo.
      
\ No newline at end of file
diff --git a/sources/language/eo_EO/install.lang.php b/sources/language/eo_EO/install.lang.php
index 7a80237..b544c84 100755
--- a/sources/language/eo_EO/install.lang.php
+++ b/sources/language/eo_EO/install.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -27,10 +27,10 @@ $lang['user login given by your host provider'] = 'uzanto-salutnomo provizita de
 $lang['please enter your password again'] = 'bonvolu tajpi vian pasvorton denove';
 $lang['enter a login for webmaster'] = 'entajpu retestran salutnomon';
 $lang['database tables names will be prefixed with it (enables you to manage better your tables)'] = 'per ĝi, prefiksoj aldoniĝos sur la nomojn de la datumtabelo (ebligas al vi pli bone mastrumi viajn tabelojn)';
-$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Vi devus vin direkti al la subtenoservo de via provizanto de gastigo, kaj serĉi kiel vi mem povas interŝanĝi al PHP 5.';
+$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Vi devus vin direkti al la subtenoservo de via provizanto de gastigo, kaj serĉi kiel vi mem povas interŝanĝi al PHP 5.2';
 $lang['You can download the config file and upload it to local/config directory of your installation.'] = 'Vi povas elŝuti la agordan dosieron kaj alŝuti ĝin al la dosierujo "local/config" dum via instalado.';
 $lang['Just another Piwigo gallery'] = 'Nur alia bildogalerio ĉe Piwigo';
-$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Eblas, ke Piwigo provos interŝanĝi vian agordon al PHP 5 kreante aŭ modifiante iun .htaccess-dosieron.';
+$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Eblas, ke Piwigo provos interŝanĝi vian agordon al PHP 5.2 kreante aŭ modifiante iun .htaccess-dosieron.';
 $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'Notu, ke eblas ŝanĝi vian agordon mem kaj poste restartigi Piwigo.';
 $lang['Keep it confidential, it enables you to access administration panel'] = 'Gardu ĝin sekreta, ĝi ebligas al vi aliri la administran panelon';
 $lang['It will be shown to the visitors. It is necessary for website administration'] = 'Ĝi montriĝos al vizitantoj. Necesas por reteja administrado';
@@ -38,16 +38,16 @@ $lang['It appears your webhost is currently running PHP %s.'] = 'Ŝajnas, ke via
 $lang['Welcome to your new installation of Piwigo!'] = 'Bonvenon al via nova instalado de Piwigo!';
 $lang['also given by your host provider'] = 'ankaŭ provizita de via provizanto de gastigo';
 $lang['Need help ? Ask your question on Piwigo message board.'] = 'Ĉu vi bezonas helpon? Starigu demandon ĉe la mesaĝtabulo de Piwigo.';
-$lang['Try to configure PHP 5'] = 'Provu agordi PHP 5';
+$lang['Try to configure PHP 5'] = 'Provu agordi PHP 5.2';
 $lang['Sorry!'] = 'Pardonu!';
 $lang['Visitors will be able to contact site administrator with this mail'] = 'La vizitantoj povos uzi tiun retadreson por kontakti la retestron';
 $lang['Welcome to my photo gallery'] = 'Bonvenon al mia foto-galerio';
-$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo ne kapablis agordi PHP 5.';
+$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo ne kapablis agordi PHP 5.2';
 $lang['verification'] = 'kontrolado';
 $lang['Hope to see you back soon.'] = 'Ĝis baldaŭa vizito via.';
 $lang['Start Install'] = 'Komenci la instaladon';
 $lang['Password ']['confirm'] = 'Pasvorto [konfirmu]';
-$lang['PHP 5 is required'] = 'Necesas PHP 5';
+$lang['PHP 5 is required'] = 'Necesas PHP 5.2';
 $lang['User'] = 'Uzanto';
 $lang['Download the config file'] = 'Elŝuti la agordan dosieron';
 $lang['Database table prefix'] = 'Prefikso de datumtabeloj';
@@ -64,5 +64,4 @@ $lang['Congratulations, Piwigo installation is completed'] = 'Gratulon, la insta
 $lang['Can\'t connect to server'] = 'Ne eblas konekti kun la servilo';
 $lang['Basic configuration'] = 'Baza agordo';
 $lang['Admin configuration'] = 'Administra agordo';
-$lang['localhost or other, supplied by your host provider'] = 'loka gasto (localhost) aŭ alia, provizita de via provizanto de gastigo';
-?>
\ No newline at end of file
+$lang['localhost or other, supplied by your host provider'] = 'loka gasto (localhost) aŭ alia, provizita de via provizanto de gastigo';
\ No newline at end of file
diff --git a/sources/language/eo_EO/upgrade.lang.php b/sources/language/eo_EO/upgrade.lang.php
index 4200e8d..e681cf3 100755
--- a/sources/language/eo_EO/upgrade.lang.php
+++ b/sources/language/eo_EO/upgrade.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/es_AR/common.lang.php b/sources/language/es_AR/common.lang.php
index 4ee6593..393e726 100644
--- a/sources/language/es_AR/common.lang.php
+++ b/sources/language/es_AR/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: Argentina [AR]
-Version: 2.7.0
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=418
 Author: Piwigo team
 Author URI: http://piwigo.org
@@ -421,4 +421,10 @@ $lang['%d photos per page'] = '%d fotos por página';
 $lang['Password confirmation is missing. Please confirm the chosen password.'] = 'Falta confirmación de su contraseña. Por favor confirme la contraseña elegida.';
 $lang['Password is missing. Please enter the password.'] = 'Falta la contraseña. Por favor escriba su contraseña';
 $lang['Theme'] = 'Tema';
-?>
\ No newline at end of file
+$lang['Album name, A → Z'] = 'Nombre del álbum, A → Z';
+$lang['Album name, Z → A'] = 'Nombre del álbum, Z → A';
+$lang['Apply on properties'] = 'Aplicar a las propiedades';
+$lang['Link: %s'] = 'Enlace: %s';
+$lang['No results for'] = 'No hay resultados para';
+$lang['Photo description'] = 'Descripción de la foto';
+$lang['Photo title'] = 'Título de la foto';
\ No newline at end of file
diff --git a/sources/language/es_AR/index.php b/sources/language/es_AR/index.php
index c8de97f..0b96c3e 100644
--- a/sources/language/es_AR/index.php
+++ b/sources/language/es_AR/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/es_ES/admin.lang.php b/sources/language/es_ES/admin.lang.php
index 4a19bdd..1ea8205 100644
--- a/sources/language/es_ES/admin.lang.php
+++ b/sources/language/es_ES/admin.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -980,4 +980,13 @@ $lang['between %s and %s MB'] = 'entre %s y %s MB';
 $lang['based on'] = 'basada en ';
 $lang['Upload in progress'] = 'Carga en proceso';
 $lang['The settings for the guest are from the %s user'] = 'Los ajustes para el cliente son del usuario %s';
-$lang['No and unlock sub-albums'] = 'No, y desbloquear los subálbumes';
\ No newline at end of file
+$lang['No and unlock sub-albums'] = 'No, y desbloquear los subálbumes';
+$lang['Each email sent will contain its own automatic authentication key on links, valid for %s.'] = 'Cada email enviado contendrá las claves de autenticación automáticas en el enlace, validas para %s.';
+$lang['Delete %d orphan photos'] = 'Borrar %d fotos huérfanas';
+$lang['Edit user'] = 'Editar usuario';
+$lang['For security reason, authentication keys do not work for administrators.'] = 'Por razones de seguridad, las claves de autenticación no funcionan para administradores.';
+$lang['No recipient selected'] = 'No se ha seleccionado ningún recipiente.';
+$lang['No user is permitted to see this private album'] = 'Ningún usuario puede ver este álbum privado.';
+$lang['Orphans'] = 'Huérfanas';
+$lang['Recipients'] = 'Recipiente';
+$lang['Y Repeat'] = 'Repetir Y';
\ No newline at end of file
diff --git a/sources/language/es_ES/common.lang.php b/sources/language/es_ES/common.lang.php
index 3da25c9..faf36de 100644
--- a/sources/language/es_ES/common.lang.php
+++ b/sources/language/es_ES/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: Español [ES]
-Version: 2.7.0
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=169
 Author: Piwigo team
 Author URI: http://piwigo.org
@@ -433,4 +433,5 @@ $lang['Photo description'] = 'Descripción de la foto';
 $lang['Photo title'] = 'Título de la foto';
 $lang['Album name, Z → A'] = 'Nombre del album, Z → A';
 $lang['Album name, A → Z'] = 'Nombre del album, A → Z';
-$lang['Link: %s'] = 'Enlace: %s';
\ No newline at end of file
+$lang['Link: %s'] = 'Enlace: %s';
+$lang['Your authentication key is no longer valid.'] = 'Su clave de autenticación no es válida.';
\ No newline at end of file
diff --git a/sources/language/es_ES/help/index.php b/sources/language/es_ES/help/index.php
index c8de97f..0b96c3e 100644
--- a/sources/language/es_ES/help/index.php
+++ b/sources/language/es_ES/help/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/es_ES/help/photos_add_ftp.html b/sources/language/es_ES/help/photos_add_ftp.html
index 9bc1dda..7c6babc 100644
--- a/sources/language/es_ES/help/photos_add_ftp.html
+++ b/sources/language/es_ES/help/photos_add_ftp.html
@@ -15,29 +15,40 @@
 			
      Cada álbum se representa por una carpeta dentro del directorio "galleries". 
 			He aquí un ejemplo del árbol de directorios de una galería muy pequeña (pero
 			utilizando muchas características):
      
-			
      -			galleries
-			|-- boda
-			|   |-- celebracion
-			|   |   |-- llegada
-			|   |   |   |-- paul-solo.jpg
-			|   |   |   +-- sara-sola.jpg
-			|   |   +-- salida
-			|   |       +-- paul-y-sara.jpg
-			|   +-- fiesta
-			|       |-- baile001.jpg
-			|       |-- baile002.jpg
-			|       +-- baile003.jpg
-			+-- luna-de-miel
-				|-- hotel.png
-				|-- video-desde-el-avion.avi
-				+-- pwg_representative
-					+-- video-desde-el-avion.jpg
-			
      
+    
      +galleries
+|-- wedding
+|   |-- celebration
+|   |   |-- arrival
+|   |   |   |-- paul-alone.jpg
+|   |   |   +-- sarah-alone.jpg
+|   |   +-- departure
+|   |       +-- paul-and-sarah.jpg
+|   +-- party
+|       |-- dancers001.jpg
+|       |-- dancers002.jpg
+|       +-- dancers003.jpg
++-- honeymoon
+|   |-- hotel.png
+|   |-- video-from-plane.avi
+|   +-- pwg_representative
+|       +-- video-from-plane.jpg
++-- photoshoot
+    |-- img0001.jpg
+    |-- img0002.jpg
+    +-- pwg_format
+        |-- img0001.cr2
+        |-- img0001.cmyk.jpg
+        |-- img0001.zip
+        |-- img0002.cr2
+        +-- img0002.cmyk.jpg
+
      
 		
      • 
-		
    • A excepción de "pwg_representative" (ver explicaciones debajo), cada subdirectorio de "galleries" genera un álbum. No hay limite de profundidad en cuanto el número de subniveles a crear.
      • 
+		
    • A excepción de "pwg_representative" o "pwg_format" (ver explicaciones debajo), cada subdirectorio de "galleries" genera un álbum. No hay limite de profundidad en cuanto el número de subniveles a crear.
      • 
 		
    • Fundamentalmente, cada elemento es representado por un archivo. Piwigo sólo reconocerá los archivos cuyas extensiones figuren en los parámetros de configuración file_ext (Ver archivo include/config_default.inc.php). Para Piwigo, un archivo de imagen será reconocido como una imagen sólo si su extensión se encuentra dentro de los parámetros de configuración picture_ext.
      • 
 		
    • Los elementos que no son imágenes (vídeos, sonidos, archivos de texto, todo lo que quieras...) son representados de forma predeterminada por iconos que corresponden a la extensión cada archivo. Opcionalmente, puedes asociar una miniatura y un archivo de representación (ver video.avi en el ejemplo anterior).
      • 
+  
    • Multiple formats: a photo can be available in several formats. In this example, we have 3 additional formats for img0001.jpg. You can activate this feature with $conf['enable_formats'] = true; in your local configuration and define a list of formats, like $conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');
      • 
+
 		
    • Una vez todas las fotos estén organizadas y correctamente situadas en sus correspondientes carpetas, ir a Administración » Herramientas » Sincronizar.
      • 
 	
    
 
diff --git a/sources/language/es_ES/index.php b/sources/language/es_ES/index.php
index c8de97f..0b96c3e 100644
--- a/sources/language/es_ES/index.php
+++ b/sources/language/es_ES/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/es_ES/install.lang.php b/sources/language/es_ES/install.lang.php
index 84283b4..147a4a9 100644
--- a/sources/language/es_ES/install.lang.php
+++ b/sources/language/es_ES/install.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -46,13 +46,13 @@ $lang['Password [confirm]'] = 'Contraseña [Confirmar]';
 $lang['verification'] = 'Comprobación';
 $lang['Need help ? Ask your question on Piwigo message board.'] = '¿ Necesidad de ayuda? Plantee su pregunta sobre él foro de Piwigo.';
 $lang['Visitors will be able to contact site administrator with this mail'] = 'Los visitantes podrán ponerse en contacto con usted por este mail';
-$lang['PHP 5 is required'] = 'PHP 5  requerido';
+$lang['PHP 5 is required'] = 'PHP 5.2  requerido';
 $lang['It appears your webhost is currently running PHP %s.'] = 'Aparentemente, la versión PHP de su alojador web es PHP %s.';
-$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo va a tratar de pasar en PHP 5 creando o modificando el fichero .htaccess.';
+$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo va a tratar de pasar en PHP 5.2 creando o modificando el fichero .htaccess.';
 $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'Note que usted mismo puede cambiar la configuración PHP y volver a lanzar  Piwigo después.';
-$lang['Try to configure PHP 5'] = 'Trate de configurar PHP 5';
+$lang['Try to configure PHP 5'] = 'Trate de configurar PHP 5.2';
 $lang['Sorry!'] = 'Lo siento!';
-$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo no pudo configurar PHP 5.';
+$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo no pudo configurar PHP 5.2';
 $lang["You may referer to your hosting provider's support and see how you could switch to PHP 5 by yourself."] = 'Usted debe ponerse en contacto con su alojador web con el fin de saber cómo configurar PHP 5';
 $lang['Hope to see you back soon.'] = 'Esperando verle  muy pronto...';
 $lang['Congratulations, Piwigo installation is completed'] = 'Félicitation, Piwigo está completamente instalado';
@@ -65,4 +65,4 @@ $lang['Welcome to my photo gallery'] = 'Bienvenido a mi galería de fotos';
 $lang['Don\'t hesitate to consult our forums for any help : %s'] = 'No dudes en escribir en nuestros foros para cualquier duda: %s';
 $lang['Welcome to your new installation of Piwigo!'] = '¡Bienvenid@ a la instalación de Piwigo!';
 $lang['localhost or other, supplied by your host provider'] = 'host local o de otro tipo, suministrado por el proveedor de alojamiento';
-?>
\ No newline at end of file
+$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Usted debe ponerse en contacto con su alojador web con el fin de saber cómo configurar PHP 5.2';
\ No newline at end of file
diff --git a/sources/language/es_ES/upgrade.lang.php b/sources/language/es_ES/upgrade.lang.php
index fba1f4d..e8d5f97 100644
--- a/sources/language/es_ES/upgrade.lang.php
+++ b/sources/language/es_ES/upgrade.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/es_MX/common.lang.php b/sources/language/es_MX/common.lang.php
index 7da98db..a0cb277 100644
--- a/sources/language/es_MX/common.lang.php
+++ b/sources/language/es_MX/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: México [MX]
-Version: 2.7.1
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=726
 Author: Piwigo team
 Author URI: http://piwigo.org
diff --git a/sources/language/es_MX/install.lang.php b/sources/language/es_MX/install.lang.php
index 2076f34..ebc52c1 100644
--- a/sources/language/es_MX/install.lang.php
+++ b/sources/language/es_MX/install.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/et_EE/admin.lang.php b/sources/language/et_EE/admin.lang.php
index 6f1d22b..8a229b4 100644
--- a/sources/language/et_EE/admin.lang.php
+++ b/sources/language/et_EE/admin.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/et_EE/common.lang.php b/sources/language/et_EE/common.lang.php
index 8f74406..7c149d0 100644
--- a/sources/language/et_EE/common.lang.php
+++ b/sources/language/et_EE/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: Estonian [EE]
-Version: 2.7.0
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=569
 Author: Piwigo team
 Author URI: http://piwigo.org
diff --git a/sources/language/et_EE/install.lang.php b/sources/language/et_EE/install.lang.php
index 45e9d91..e4bd314 100755
--- a/sources/language/et_EE/install.lang.php
+++ b/sources/language/et_EE/install.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -40,21 +40,21 @@ $lang['It appears your webhost is currently running PHP %s.'] = 'Paistab, et su
 $lang['It will be shown to the visitors. It is necessary for website administration'] = 'Seda näidetakse külastajatele ning on vajalik veebilehe haldamiseks';
 $lang['Just another Piwigo gallery'] = 'Lihtsalt veel üks järjekordne Piwigo gallerii';
 $lang['Keep it confidential, it enables you to access administration panel'] = 'Hoia seda salaja, sellega saad lehekülje haldurisse sisse';
-$lang['PHP 5 is required'] = 'Vajatakse PHP versiooni 5';
+$lang['PHP 5 is required'] = 'Vajatakse PHP versiooni 5.2';
 $lang['Password ']['confirm'] = 'Kinnita parooli';
 $lang['Sorry!'] = 'Vabandust!';
 $lang['Start Install'] = 'Alusta paigaldamist';
-$lang['Try to configure PHP 5'] = 'Proovi häälestada PHP 5';
+$lang['Try to configure PHP 5'] = 'Proovi häälestada PHP 5.2';
 $lang['User'] = 'Kasutaja';
 $lang['Welcome to my photo gallery'] = 'Tere tulemast mu fotogalleriisse';
 $lang['Welcome to your new installation of Piwigo!'] = 'Tere tulemast äsja installitud Piwigosse!';
 $lang['You can download the config file and upload it to local/config directory of your installation.'] = 'Sa võid laadida häälestusfaili alla ja ise paigaldada selle oma "local/config" kaustasse.';
-$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Sa peaksid küsima oma veebimajutuse teenusepakkuja käest, kas on võimalik minna üle PHP versioonile 5.';
+$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Sa peaksid küsima oma veebimajutuse teenusepakkuja käest, kas on võimalik minna üle PHP versioonile 5.2';
 $lang['Don\'t hesitate to consult our forums for any help : %s'] = 'Muidugi kasuta meie foorumeid abi leidmiseks: %s';
 $lang['Need help ? Ask your question on Piwigo message board.'] = 'Vajad abi? Küsi Piwigo abilauast.';
 $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'Sa võid teha muudatusi seadistusfailis ja pärast ümberkäivitada Piwigo.';
-$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo oskab ise proovida seadistada PHP 5, seadistades selleks .htaccess faili.';
-$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo ei suutnud seadistada PHP 5 kasutamist.';
+$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo oskab ise proovida seadistada PHP 5.2, seadistades selleks .htaccess faili.';
+$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo ei suutnud seadistada PHP 5.2 kasutamist.';
 $lang['Visitors will be able to contact site administrator with this mail'] = 'Külalised võivad kasutada seda epost-aadressi et ühendust võtta administraatoriga';
 $lang['also given by your host provider'] = 'samuti antud veebimajutuse teenusepakkuja poolt';
 $lang['database tables names will be prefixed with it (enables you to manage better your tables)'] = 'andmebaasi tabelite nimed alustatakse selle eesliitega (see hõlpsustab tabelite korraspidamist samas andmebaasis)';
@@ -64,5 +64,4 @@ $lang['user login given by your host provider'] = 'veebimajutuse kasutajanimi';
 $lang['user password given by your host provider'] = 'veebimajutuse parool';
 $lang['verification'] = 'kinnitamine';
 $lang['webmaster login can\'t contain characters \' or "'] = 'veebimeistri kasutajanimi ei saa sisaldada jutumärke';
-$lang['localhost or other, supplied by your host provider'] = 'localhost või teised, antud teenusepakkuja poolt';
-?>
\ No newline at end of file
+$lang['localhost or other, supplied by your host provider'] = 'localhost või teised, antud teenusepakkuja poolt';
\ No newline at end of file
diff --git a/sources/language/et_EE/upgrade.lang.php b/sources/language/et_EE/upgrade.lang.php
index b9c12e6..d142c60 100755
--- a/sources/language/et_EE/upgrade.lang.php
+++ b/sources/language/et_EE/upgrade.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/eu_ES/common.lang.php b/sources/language/eu_ES/common.lang.php
index fcca4c0..2a94520 100644
--- a/sources/language/eu_ES/common.lang.php
+++ b/sources/language/eu_ES/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: Euskara [ES]
-Version: 2.7.0
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=725
 Author: Piwigo team
 Author URI: http://piwigo.org
diff --git a/sources/language/fa_IR/admin.lang.php b/sources/language/fa_IR/admin.lang.php
index c395c53..1fec7ef 100644
--- a/sources/language/fa_IR/admin.lang.php
+++ b/sources/language/fa_IR/admin.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -983,4 +983,13 @@ $lang['file name'] = 'نامِ فایل';
 $lang['width & height'] = 'بلندا و پهنا';
 $lang['Empty caddie'] = 'خالی کردنِ سبد';
 $lang['No and unlock sub-albums'] = 'خیر و زیرآلبوم‌ها را باز کن';
-$lang['The settings for the guest are from the %s user'] = 'تنظیماتِ مهمان‌ها از کاربر %s گرفته می‌شود';
\ No newline at end of file
+$lang['The settings for the guest are from the %s user'] = 'تنظیماتِ مهمان‌ها از کاربر %s گرفته می‌شود';
+$lang['Each email sent will contain its own automatic authentication key on links, valid for %s.'] = 'هر ایمیلی که فرستاده می‌شود، به طور خودکار دارای یک کلید احراز هویت مخصوص بوده که برای %s معتبر است.';
+$lang['Edit user'] = 'ویرایش کاربر';
+$lang['For security reason, authentication keys do not work for administrators.'] = 'به دلایل امنیتی، کلیدهای احراز هویت برای مدیران فعال نیست.';
+$lang['No recipient selected'] = 'دریافت کننده‌ای انتخاب نشده است';
+$lang['No user is permitted to see this private album'] = 'هیچ کاربری اجازه‌ی دیدن این آلبوم شخصی را ندارد';
+$lang['Recipients'] = 'دریافت کنندگان';
+$lang['Y Repeat'] = 'تکرار در محور Y';
+$lang['Delete %d orphan photos'] = 'پاک کردنِ %d عکس بی‌ریشه';
+$lang['Orphans'] = 'بی‌ریشه‌ها';
\ No newline at end of file
diff --git a/sources/language/fa_IR/common.lang.php b/sources/language/fa_IR/common.lang.php
index 035e450..6b5e403 100644
--- a/sources/language/fa_IR/common.lang.php
+++ b/sources/language/fa_IR/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: پارسی [IR]
-Version: 2.7.1
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=419
 Author: Piwigo team
 Author URI: http://piwigo.org
@@ -431,4 +431,5 @@ $lang['Photo title'] = 'عنوانِ عکس';
 $lang['Album name, A → Z'] = 'نام آلبوم، به ترتیب حروف الفبا';
 $lang['Album name, Z → A'] = 'نام آلبوم، برعکسِ حروف الفبا';
 $lang['Apply on properties'] = 'تایید مشخصات';
-$lang['Link: %s'] = 'لینک: %s';
\ No newline at end of file
+$lang['Link: %s'] = 'لینک: %s';
+$lang['Your authentication key is no longer valid.'] = 'کلید احراز هویت شما نامعتبر بوده و باید دوباره ارسال شود.';
\ No newline at end of file
diff --git a/sources/language/fa_IR/index.php b/sources/language/fa_IR/index.php
index c8de97f..0b96c3e 100644
--- a/sources/language/fa_IR/index.php
+++ b/sources/language/fa_IR/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/fa_IR/install.lang.php b/sources/language/fa_IR/install.lang.php
index 26f0aeb..25b0c74 100644
--- a/sources/language/fa_IR/install.lang.php
+++ b/sources/language/fa_IR/install.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -46,14 +46,14 @@ $lang['Password [confirm]'] = "تاييد گذرواژه";
 $lang['verification'] = 'تأیید';
 $lang['Need help ? Ask your question on Piwigo message board.'] = 'به کمک نیاز دارید ؟ پرسش خود را در تالارهای پشتیبانی Piwigo مطرح نمایید.';
 $lang['Visitors will be able to contact site administrator with this mail'] = 'بازدیدکنندگان می توانند بوسیله ی این ایمیل با مدیرکل ارتباط برقرار کنند';
-$lang['PHP 5 is required'] = 'نگارش پنجم PHP لازم است';
+$lang['PHP 5 is required'] = 'نگارش پنجم PHP 5.2 لازم است';
 $lang['It appears your webhost is currently running PHP %s.'] = 'به نظر می رسد هاست شما دارای نگارش PHP %s باشد.';
-$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo می‌تواند تنظیمات PHP شما را با ایجاد یا ویرایش یک فایل .htaccess به PHP 5 تغییر دهد.';
+$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo می‌تواند تنظیمات PHP شما را با ایجاد یا ویرایش یک فایل .htaccess به PHP 5.2 تغییر دهد.';
 $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'شما می توانید خودتان تنظیمات را تغییر دهید و Piwigo را دوباره راه اندازی کنید.';
-$lang['Try to configure PHP 5'] = 'در حال تنظیم PHP 5';
+$lang['Try to configure PHP 5'] = 'در حال تنظیم PHP 5.2';
 $lang['Sorry!'] = "شرمنده!";
-$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo قادر به پیکربندی PHP 5 نیست.';
-$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'شما باید با سرویس دهنده ی هاست خود تماس گرفته و از آنها بپرسید که چگونه می توانید تنظیمات خود را به PHP 5 تغییر دهید.';
+$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo قادر به پیکربندی PHP 5.2 نیست.';
+$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'شما باید با سرویس دهنده ی هاست خود تماس گرفته و از آنها بپرسید که چگونه می توانید تنظیمات خود را به PHP 5.2 تغییر دهید.';
 $lang['Hope to see you back soon.'] = 'به امید دیدار دوباره ی شما.';
 $lang['Congratulations, Piwigo installation is completed'] = 'Piwigo با موفقیت نصب شد';
 $lang['An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning : database.inc.php must only contain what is in the textarea, no line return or space character)'] = 'یک راه دیگر این است که شما متن بالا را کپی کنید و بدون اضافه یا کم کردن حتی یک حرف ،آن را در آدرس : "local/config/database.inc.php" قرار دهید';
@@ -65,5 +65,4 @@ $lang['Just another Piwigo gallery'] = 'یک گالری دیگر با Piwigo';
 $lang['Password ']['confirm'] = 'تأیید گذرواژه';
 $lang['Welcome to my photo gallery'] = 'به گالری عکس من خوش آمدید';
 $lang['Welcome to your new installation of Piwigo!'] = 'به گالری Piwigo ی خود خوش آمدید!';
-$lang['localhost or other, supplied by your host provider'] = 'localhost یا ادرس دیگر ، این را باید از هاست دریافت نمایید(در حالت معمول localhost میباشد)';
-?>
\ No newline at end of file
+$lang['localhost or other, supplied by your host provider'] = 'localhost یا ادرس دیگر ، این را باید از هاست دریافت نمایید(در حالت معمول localhost میباشد)';
\ No newline at end of file
diff --git a/sources/language/fa_IR/upgrade.lang.php b/sources/language/fa_IR/upgrade.lang.php
index 30f67f4..8a5b08b 100644
--- a/sources/language/fa_IR/upgrade.lang.php
+++ b/sources/language/fa_IR/upgrade.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/fi_FI/admin.lang.php b/sources/language/fi_FI/admin.lang.php
index d71b408..27d3d86 100755
--- a/sources/language/fi_FI/admin.lang.php
+++ b/sources/language/fi_FI/admin.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -517,4 +517,54 @@ $lang['Language has been successfully installed'] = 'Kielipaketti asennettiin on
 $lang['Hour'] = 'Tunti';
 $lang['Inactive Languages'] = 'Inaktiiviset kielet';
 $lang['Inactive Plugins'] = 'Inaktiiviset liitännäiset';
-$lang['Inactive Themes'] = 'Inaktiiviset teemat';
\ No newline at end of file
+$lang['Inactive Themes'] = 'Inaktiiviset teemat';
+$lang['Failed to write file to disk'] = 'Levylle kirjoittaminen epäonnistui';
+$lang['Features include gallery browsing, album creation and photo upload.'] = 'Toiminnallisuuksiin kuuluu gallerian selaaminen, albumien luominen ja kuvien siirtäminen';
+$lang['File/directory read error'] = 'Tiedoston tai hakemiston lukuvirhe';
+$lang['Following plugins may not be compatible with the new version of Piwigo:'] = 'Seuraavat laajennokset eivät välttämättä ole yhteensopivia uuden Piwigo version kanssa:';
+$lang['Following themes may not be compatible with the new version of Piwigo:'] = 'Seuraavat teemat eivät välttämättä ole yhteensopivia uuden Piwigo version kanssa:';
+$lang['Forbid this theme to users'] = 'Estä tämän teeman käyttö käyttäjiltä';
+$lang['Forbidden'] = 'Estetty';
+$lang['GD library is missing'] = 'GD kirjasto puuttuu';
+$lang['GD version'] = 'GD versio';
+$lang['Gallery unlocked'] = 'Galleria avattu';
+$lang['Get Support on Piwigo Forum'] = 'Hanki tukia Piwigon foorumeilta';
+$lang['Give write access (chmod 777) to "%s" directory at the root of your Piwigo installation'] = 'Anna kirjoitus oikeudet (chmod 777) "%s" hakemistolle Piwigo asennuksesi juuressa';
+$lang['Graphics Library'] = 'Grafiikka kirjasto';
+$lang['High definition'] = 'Teräväpiirto';
+$lang['High definition enabled'] = 'Teräväpiirto käytössä';
+$lang['Piwigo for iOS application empowers you to connect to your Piwigo gallery from your iPhone, iPad or iPod Touch, create some albums and upload several photos at once.'] = 'Piwigo iOS:lle sovellus mahdollistaa yhdistämisen Piwigo galleriaasi iPhone, iPad tai iPod Touch laitettasi käyttäen. Voit luoda albumeja ja jopa siirtää useita kuvia kerralla.';
+$lang['Adobe Photoshop Lightroom is a photography software designed to manage large quantities of digital images and doing post production work.'] = 'Adobe Photoshop Lightroom on valokuvausohjelmisto, joka on suunniteltu suuren valokuvamäärän hallinnointii ja jälkiprosessointiin.';
+$lang['Aperture is a powerful tool to refine images and manage massive libraries on Mac.'] = 'Aperture on tehokas työkalu kuvien parantamiseen ja suurien valokuvakirjastojen hallintaan Mac-laitteilla.';
+$lang['Aperture is designed for professional photographers with iPhoto simplicity.'] = 'Aperture on suunniteltu ammattilaiskuvaajile, ollen samalla yhtä yksinkertainen kuin iPhoto.';
+$lang['Approximate maximum resolution: %dM pixels (that\'s %dx%d pixels).'] = 'Arvioitu maksimi tarkkuus: %dM pikseliä (eli %d x %d pikseliä).';
+$lang['Are you sure to install this upgrade? You must verify if this version does not need uninstallation.'] = 'Oletko varma, että haluat asentaa tämän päivityksen? Sinun täytyy varmistaa, ettei tämä versio vaadi ensin ensin asennuksen poistamista.';
+$lang['Authorize users to add comments on selected albums'] = 'Valtuuta käyttäjät lisäämään kommentteja valikoituihin albumeihin.';
+$lang['By default, Piwigo will create a new websize from the HD (high definition) version of your photo.'] = 'Oletusarvoisesti Piwigo luo uuden verkko kokoisen kuvan HD (teräväpiirto) versiosta kuvaasi.';
+$lang['By default, the center of interest is placed in the middle of the photo.'] = 'Oletusarvoisesti kiinnostuksen keskipiste on kuvan keskellä.';
+$lang['Complementary mail content'] = 'Täydentävä sähköpostisisältö';
+$lang['Correction applied with error'] = 'Virheeseen tehty korjaus';
+$lang['Correction the anomaly will cancel the fact that it\'s ignored'] = 'Korjattua ilmiötä ei enää ohiteta';
+$lang['Duplicate selected tags'] = 'Monista valitut tagit';
+$lang['Edit ranks'] = 'Muokaa sijoituksia';
+$lang['Error when sending email to %s [%s].'] = 'Virhe lähetettäessä sähköpostia %slle [%s].';
+$lang['Execution time is out, treatment must be continue [Estimated time: %d second].'] = 'Suorituksen aikakatkaisu, käsittelyä täytyy jatkaa [Arvoitu jäljellä oleva aika: %d sekuntia].';
+$lang['Execution time is out, treatment must be continue [Estimated time: %d seconds].'] = 'Suoritusaika ylitetty, käsittelyä täytyy jatkaa [Arviotu jäljellä oleva aika: %d sekuntia].';
+$lang['Exif extension not available, admin should disable exif use'] = 'Exif laajennos ei ole käytettävissä, ylläpitäjän tulee poistaa exif käytöstä';
+$lang['Level 8'] = 'Ylläpitäjät';
+$lang['Link all album photos to some existing albums'] = 'Linkitä kaikki albumin kuvat johonkin olemassa olevaan albumiin';
+$lang['Mail address is mandatory for registration'] = 'Sähköpostiosoite on pakollinen rekisteröidyttäessä';
+$lang['Impossible to deactivate this language, you need at least one language.'] = 'Mahdotonta poistaa kieltä käytöstä, vähintään yksi kieli täytyy olla käytössä.';
+$lang['Impossible to deactivate this theme, you need at least one theme.'] = 'Mahdotonta poistaa teemaa käytöstä, vähintään yksi teema täytyy olla käytössä.';
+$lang['Invert'] = 'Käännä';
+$lang['Landscape'] = 'Vaaka';
+$lang['Each email sent will contain its own automatic authentication key on links, valid for %s.'] = 'Jokainen lähetetty viesti sisältää linkeissä omat todennusavaimet, jotka ovat voimassa %s.';
+$lang['Edit user'] = 'Muokkaa käyttäjää';
+$lang['For security reason, authentication keys do not work for administrators.'] = 'Turvallisuus syistä todennusavaimet eivät toimi ylläpitäjille.';
+$lang['History'] = 'Historia';
+$lang['Hit'] = 'Osuma';
+$lang['Ignore selected anomalies'] = 'Jätä seuraava poikkeamat huomiotta';
+$lang['Impossible automatic correction'] = 'Automaattinen korjaus ei onnistu';
+$lang['Impossible to activate this theme, the parent theme is missing: %s'] = 'Tämän teeman aktivointi ei onnistu, sillä alemman tason teemasta puuttuu: %s';
+$lang['Impossible to deactivate the default theme.'] = 'Oletus teeman poistaminen käytöstä ei onnistu.';
+$lang['Impossible to deactivate this language, first set another language as default.'] = 'Kielen poistaminen käytöstä ei onnistu, valitse ensin toinen kieli oletukseksi.';
\ No newline at end of file
diff --git a/sources/language/fi_FI/common.lang.php b/sources/language/fi_FI/common.lang.php
index 5b007d4..7ebb126 100644
--- a/sources/language/fi_FI/common.lang.php
+++ b/sources/language/fi_FI/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: Finnish [FI]
-Version: 2.7.1
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=686
 Author: Piwigo team
 Author URI: http://piwigo.org
@@ -427,4 +427,5 @@ $lang['Photo title'] = 'Kuvan otsikko';
 $lang['Album name, A → Z'] = 'Albumin nimi, A → Z';
 $lang['Album name, Z → A'] = 'Albumin nimi, Z → A';
 $lang['Apply on properties'] = 'Käytä asetuksia';
-$lang['Link: %s'] = 'Linkki: %s';
\ No newline at end of file
+$lang['Link: %s'] = 'Linkki: %s';
+$lang['Your authentication key is no longer valid.'] = 'Todennusavaimesi ei ole enää voimassa.';
\ No newline at end of file
diff --git a/sources/language/fi_FI/install.lang.php b/sources/language/fi_FI/install.lang.php
index 254dfea..b38ad69 100755
--- a/sources/language/fi_FI/install.lang.php
+++ b/sources/language/fi_FI/install.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -43,9 +43,9 @@ $lang['Don\'t hesitate to consult our forums for any help : %s'] = 'Älä epär
 $lang['It appears your webhost is currently running PHP %s.'] = 'Näyttää että palveluntarjoajasi käyttää PHP %s.';
 $lang['Need help ? Ask your question on Piwigo message board.'] = 'Tarvitsetko apua? Kysy asiasta Piwigon keskustelupalstalla';
 $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'Voit muokata asetuksia itse ja käynnistää Piwigon uudelleen tämän jälkeen.';
-$lang['PHP 5 is required'] = 'PHP 5 vaaditaan';
+$lang['PHP 5 is required'] = 'PHP 5.2 vaaditaan';
 $lang['Password ']['confirm'] = 'Salasana [hyväksy]';
-$lang['Try to configure PHP 5'] = 'Yritä määrittää PHP 5';
+$lang['Try to configure PHP 5'] = 'Yritä määrittää PHP 5.2';
 $lang['Visitors will be able to contact site administrator with this mail'] = 'Vierailijat voivat ottaa yhteyttä sivuston ylläpitäjään tätä sähköpostiosoitetta käyttäen';
 $lang['Welcome to my photo gallery'] = 'Tervetuloa kuvagalleriaani';
 $lang['enter a login for webmaster'] = 'Lisää käyttäjätunnus ylläpitäjälle';
@@ -57,12 +57,11 @@ $lang['Download the config file'] = 'Lataa konfigurointitiedosto';
 $lang['Hope to see you back soon.'] = 'Toivottavasti näemme pian';
 $lang['Just another Piwigo gallery'] = 'Yksi Piwigo -galleria lisää';
 $lang['Keep it confidential, it enables you to access administration panel'] = 'Pidä salassa, se mahdollistaa pääsyn pääkäyttäjän paneeliin';
-$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo voi yrittää vaihtaa konfiguraation PHP 5 :seen luomalla tai muuttamalla .htaccess -tiedostoa.';
-$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo ei pystynyt konfiguroimaan PHP5 :sta.';
+$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo voi yrittää vaihtaa konfiguraation PHP 5.2 :seen luomalla tai muuttamalla .htaccess -tiedostoa.';
+$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo ei pystynyt konfiguroimaan PHP5.2 :sta.';
 $lang['Sorry!'] = 'Anteeksi!';
 $lang['Welcome to your new installation of Piwigo!'] = 'Tervetuloa uuteen Piwigo -asennukseesi!';
 $lang['You can download the config file and upload it to local/config directory of your installation.'] = 'Voit ladata konfiguraatiotiedoston ja siirtää sen asennuksesi local/config -hakemistoon. ';
-$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Sinun tulee kääntyä hosting -palveluntarjoajasi puoleen ja kysyä kuinka voit vaihtaa PHP 5:seen itse.';
+$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Sinun tulee kääntyä hosting -palveluntarjoajasi puoleen ja kysyä kuinka voit vaihtaa PHP 5.2 :seen itse.';
 $lang['database tables names will be prefixed with it (enables you to manage better your tables)'] = 'se tulee tietokannan taulun nimen etuliitteeksi (mahdollistaa taulujen helpomman hallinnan)';
-$lang['verification'] = 'vahvistus';
-?>
\ No newline at end of file
+$lang['verification'] = 'vahvistus';
\ No newline at end of file
diff --git a/sources/language/fi_FI/upgrade.lang.php b/sources/language/fi_FI/upgrade.lang.php
index 37112f6..7e03806 100755
--- a/sources/language/fi_FI/upgrade.lang.php
+++ b/sources/language/fi_FI/upgrade.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/fr_CA/admin.lang.php b/sources/language/fr_CA/admin.lang.php
index 166df67..c245d40 100644
--- a/sources/language/fr_CA/admin.lang.php
+++ b/sources/language/fr_CA/admin.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -113,7 +113,6 @@ $lang['New parent album'] = "Nouvelle catégorie parente";
 $lang['New tag'] = "Nouveau mot clé";
 $lang['Number of comments per page'] = "Nombre de commentaires par page";
 $lang['Number of rates'] = "Nombre de notes";
-$lang['Number of thumbnails to create'] = "Nombre de miniatures à créer";
 $lang['Only private albums are listed'] = "Seules les catégories privées sont listées";
 $lang['Operating system'] = "Système d'exploitation";
 $lang['Options'] = "Options";
@@ -336,7 +335,6 @@ $lang['Photo unreachable or no support'] = "Image inaccessible ou format non sup
 $lang['GD version'] = "version de GD";
 $lang['General statistics'] = "Statistiques générales";
 $lang['average time'] = "temps moyen";
-$lang['number of miniaturized photos'] = "nombre de miniatures créées";
 $lang['total time'] = "temps total";
 $lang['for this file format'] = "pour ce format de fichier";
 $lang['unit mode'] = "Mode unitaire";
@@ -455,7 +453,6 @@ $lang['add new photos to caddie'] = "Ajouter les nouveaux éléments au panier";
 $lang['No display'] = "Pas d'affichage";
 $lang['Classic display'] = "Affichage classique";
 $lang['Hoverbox display'] = "Affichage lors du survol";
-$lang['Mail address is obligatory for all users'] = "L'adresse courriel est obligatoire pour tous les utilisateurs";
 $lang['Minimum privacy level'] = "Niveau minimal de confidentialité";
 $lang['Privacy level'] = "Niveau de confidentialité";
 $lang['Level 0'] = "---";
@@ -483,7 +480,6 @@ $lang['Are you sure you want to delete this plugin?'] = "Êtes-vous sûr de voul
 $lang['Are you sure you want to install this plugin?'] = "Êtes-vous sûr de vouloir installer ce plugin?";
 $lang['Are you sure to install this upgrade? You must verify if this version does not need uninstallation.'] = "Êtes-vous sur de vouloir installer cette mise à jour? Vous devez vérifiez que cette mise à jour ne nécessite pas de désinstallation préalable.";
 $lang['Plugin has been successfully copied'] = "Le plugin a été copié avec succès.";
-$lang['You might go to plugin list to install and activate it.'] = "Rendez-vous dans la liste des plugins pour l'installer et l'activer.";
 $lang['Can\'t create temporary file.'] = "Impossible de créer un fichier temporaire.";
 $lang['Can\'t download archive.'] = "Impossible de télécharger l'archive.";
 $lang['Can\'t read or extract archive.'] = "Impossible de lire ou d'extraire l'archive.";
@@ -982,4 +978,16 @@ $lang['on the %d selected users'] = 'sur les %d utilisateurs sélectionnés';
 $lang['Close user details'] = 'Fermer les détails de l\'utilisateur';
 $lang['Open user details'] = 'Ouvrir les détails de l\'utilisateur';
 $lang['close'] = 'Fermer';
-?>
\ No newline at end of file
+$lang['Activate it now'] = 'L\'activer maintenant';
+$lang['Allow users to add a link to their website'] = 'Autoriser les utilisateurs à donner un lien vers leur site web';
+$lang['Empty caddie'] = 'Vider le panier';
+$lang['Impossible to deactivate the default theme.'] = 'Impossible de désactiver le thème par défaut.';
+$lang['Mail address is mandatory for registration'] = 'L\'adresse de courriel est obligatoire pour l\'enregistrement ';
+$lang['No and unlock sub-albums'] = 'Non, et déverrouiller les sous-albums';
+$lang['The settings for the guest are from the %s user'] = 'Les préféreces des invités sont celles de l\'utilisateur %s';
+$lang['Upload in progress'] = 'Transfert en cours...';
+$lang['based on'] = 'basé sur';
+$lang['between %s and %s MB'] = 'entre %s et %s Mo';
+$lang['date & time'] = 'date et heure';
+$lang['file name'] = 'nom de fichier';
+$lang['width & height'] = 'largeur et hauteur';
\ No newline at end of file
diff --git a/sources/language/fr_CA/common.lang.php b/sources/language/fr_CA/common.lang.php
index a6be5b9..81b77ee 100644
--- a/sources/language/fr_CA/common.lang.php
+++ b/sources/language/fr_CA/common.lang.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
 // +-----------------------------------------------------------------------+
 /*
 Language Name: Français [QC]
-Version: 2.7.0
+Version: 2.8.2
 Language URI: http://piwigo.org/ext/extension_view.php?eid=420
 Author: Piwigo team
 Author URI: http://piwigo.org
@@ -423,4 +423,10 @@ $lang['Password is missing. Please enter the password.'] = "Le mot de passe manq
 $lang['Password confirmation is missing. Please confirm the chosen password.'] = "La confirmation du mot de passe manque. Veuillez confirmer le mot de passe choisi.";
 $lang['%d photos per page'] = '%d photos par page';
 $lang['Theme'] = 'Thème';
-?>
\ No newline at end of file
+$lang['Album name, A → Z'] = 'Nom de l\'album, A → Z';
+$lang['Album name, Z → A'] = 'Nom de l\'album, Z → A';
+$lang['Apply on properties'] = 'Appliquer sur les propriétés';
+$lang['Link: %s'] = 'Lien: %s';
+$lang['No results for'] = 'Aucun résultat pour';
+$lang['Photo description'] = 'Description de la photo';
+$lang['Photo title'] = 'Titre de la photo';
\ No newline at end of file
diff --git a/sources/language/fr_CA/help/index.php b/sources/language/fr_CA/help/index.php
index c8de97f..0b96c3e 100644
--- a/sources/language/fr_CA/help/index.php
+++ b/sources/language/fr_CA/help/index.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
 // +-----------------------------------------------------------------------+
diff --git a/sources/language/fr_CA/help/photos_add_ftp.html b/sources/language/fr_CA/help/photos_add_ftp.html
index e3bfad1..39b4fb3 100644
--- a/sources/language/fr_CA/help/photos_add_ftp.html
+++ b/sources/language/fr_CA/help/photos_add_ftp.html
@@ -4,16 +4,14 @@
 
      
   
    1. Créez un répertoire sur votre ordinateur.
      2. 
 
-  
    2. Copiez des photos à l'intérieur de ce répertoire, puis redimensionnez-les pour un affichage sur le web. Attention : le nom des répertoires et des fichiers ne doit contenir que des lettres, des chiffres et les caractères  "-", "_" ou ".". Pas d'espace ou de caractères accentués.
      3. 
+  
    3. Copiez des photos à l'intérieur de ce répertoire. Attention : le nom des répertoires et des fichiers ne doit contenir que des lettres, des chiffres et les caractères  "-", "_" ou ".". Pas d'espace ou de caractères accentués.
      4. 
 
   
    4. Avec un client FTP, copiez le répertoire dans le répertoire "galleries" de votre installation de Piwigo.
      5. 
 
-  
    5. Connectez-vous à votre galerie Piwigo et rendez-vous sur Administration » Images » Miniatures pour créer les miniatures manquantes.
      6. 
-
-  
    6. Rendez-vous sur Administration et cliquez sur le gros bouton de synchronisation.
      7. 
+  
    7. Connectez-vous à votre galerie Piwigo, rendez-vous sur Administration et cliquez sur le gros bouton de synchronisation.
      8. 
 
    
 
-
    Bravo ! Vous avez créé avec succès la première catégorie de votre galerie.
    
+
    Bravo ! Vous avez créé avec succès le premier album de votre galerie.
    
 
 
 
@@ -41,81 +39,50 @@ galleries
 |       |-- discours002.jpg
 |       +-- discours003.jpg
 +-- voyage-de-noces
-    |-- hotel.png
-    |-- video-decollage-avion.avi
-    +-- pwg_representative
-        +-- video-decollage-avion.jpg
+|   |-- hotel.png
+|   |-- video-decollage-avion.avi
+|   +-- pwg_representative
+|       +-- video-decollage-avion.jpg
++-- seance-photographe
+    |-- img0001.jpg
+    |-- img0002.jpg
+    +-- pwg_format
+        |-- img0001.cr2
+        |-- img0001.cmyk.jpg
+        |-- img0001.zip
+        |-- img0002.cr2
+        +-- img0002.cmyk.jpg
    -
  • A l'exception de celui appelé "pwg_representative", chaque répertoire dans "galleries" génère un album. Le nombre de niveaux (profondeur) n'est pas limité.
    • +
  • A l'exception de "pwg_representative" et "pwg_format", chaque répertoire dans "galleries" génère un album. Le nombre de niveaux (profondeur) n'est pas limité.
    • -
  • Fondamentalement, un élément est représenté par un fichier. Pour Piwigo, un fichier peut être un élément si son extension figure dans la liste du paramètre de configuration file_ext (voir +
  • Fondamentalement, une photo est représentée par un fichier. Pour Piwigo, un fichier peut être une photo si son extension figure dans la liste du paramètre de configuration file_ext (voir fichier include/config.inc.php). Un fichier -peut être une image si son extension figure dans la liste du paramètre de configuration +peut être une photo si son extension figure dans la liste du paramètre de configuration picture_ext.
    • -
  • Les éléments de type image doivent avoir une miniature associée (voir la -section suivante à propos des miniatures).
    • - -
  • Les éléments de type image peuvent avoir un image en grand format -associé. Comme pour le fichier mariage.jpg -dans l'exemple ci-dessus. Aucun préfixe n'est nécessaire sur le nom du -fichier.
    • - -
  • Les éléments autres que les images (vidéos, sons, fichiers texte, tout ce que vous +
  • Les éléments autres que les photos (vidéos, sons, fichiers texte, tout ce que vous voulez...) sont représentés par défaut par une icône correspondant à -l'extension du nom du fichier. Optionnellement, une miniature et un -représentant peuvent être associés (voir le fichier video.avi dans l'exemple).
    • +l'extension du nom du fichier. Optionnellement, un +représentant peut être associé (voir le fichier video-decollage-avion.avi dans l'exemple). + +
  • Formats multiples : vous pouvez proposer une photo dans plusieurs formats. Dans cet exemple, il y a 3 formats supplémentaires pour img0001.jpg. Vous pouvez activer cette fonctionnalité en ajoutant $conf['enable_formats'] = true; à votre configuration locale et en définissant une liste de formats, comme $conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');
  • Attention : le nom d'un répertoire ou d'un fichier ne doit être composé que de lettres, de chiffres, de "-", "_" ou ".". Pas d'espace ou de caractères accentués.
    • -
  • Conseil : une catégorie peut contenir des éléments et des -sous-catégories à la fois. Néanmoins, il est fortement conseillé pour chaque -catégorie de choisir entre contenir des éléments ou bien -des sous-catégories.
    • +
  • Conseil : un album peut contenir des photos et des +sous-album à la fois. Néanmoins, il est fortement conseillé pour chaque +album de choisir entre contenir des photos ou bien +des sous-album.
    • -
  • Une fois que les fichiers, les miniatures et les représentants sont +
  • Une fois que les fichiers sont correctement placés dans les répertoires, se rendre sur l'écran Administration » Catégories » Synchroniser.
    • - - - - - -
    - Miniatures - -
      - -
    • Comme mentionné précédemment, chaque élément de type image doit être -associé à une miniature.
      • - -
    • Les miniatures sont stockées dans le sous-répertoire "thumbnail" de -chaque répertoire représentant une catégorie. Une miniature est un fichier -de type image (même extension du nom du fichier) dont le nom de fichier est -préfixé par le paramètre de configuration prefix_thumbnail -(voir include/config.inc.php).
      • - -
    • Les miniatures n'ont pas besoin d'avoir la même extension que leur -image associée (une image avec ".jpg" comme extension peut avoir une -miniature en ".GIF" par exemple).
      • - -
    • Il est conseillé d'utiliser un outil externe pour la création des -miniatures.
      • - -
    • Vous pouvez également utiliser l'outil de création de miniatures -intégré à Piwigo mais cela est déconseillé car la qualité risque -d'être décevante et cela utilise inutilement les ressources du serveur (ce -qui peut être un grave problème sur un serveur mutualisé).
      • - -
    • Si vous choisissez d'utiliser le serveur web pour générer les -miniatures, vous devez donner les droits en écriture sur les -répertoires.
      • +class="pwgScreen">Administration » Outils » Synchroniser.
    diff --git a/sources/language/fr_CA/index.php b/sources/language/fr_CA/index.php index c8de97f..0b96c3e 100644 --- a/sources/language/fr_CA/index.php +++ b/sources/language/fr_CA/index.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/language/fr_CA/install.lang.php b/sources/language/fr_CA/install.lang.php index 452322e..5a8a4b8 100644 --- a/sources/language/fr_CA/install.lang.php +++ b/sources/language/fr_CA/install.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -46,14 +46,14 @@ $lang['Password [confirm]'] = "Mot de passe [Confirmer]"; $lang['verification'] = "vérification"; $lang['Need help ? Ask your question on Piwigo message board.'] = "Besoin d'aide ? Posez votre question sur le forum de Piwigo."; $lang['Visitors will be able to contact site administrator with this mail'] = "Les visiteurs pourront contacter l'administrateur du site par ce courriel"; -$lang['PHP 5 is required'] = "PHP 5 est requis"; +$lang['PHP 5 is required'] = 'PHP 5.2 est requis'; $lang['It appears your webhost is currently running PHP %s.'] = "Apparemment, la version PHP de votre hébergeur est PHP %s."; -$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = "Piwigo va essayer de passer en PHP 5 en créant ou modifiant le fichier .htaccess."; +$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo va essayer de passer en PHP 5.2 en créant ou modifiant le fichier .htaccess.'; $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = "Notez que vous pouvez modifier vous-même la configuration PHP et re-lancer Piwigo ensuite."; -$lang['Try to configure PHP 5'] = "Essayer de configurer PHP 5"; +$lang['Try to configure PHP 5'] = 'Essayer de configurer PHP 5.2'; $lang['Sorry!'] = "Désolé!"; -$lang['Piwigo was not able to configure PHP 5.'] = "Piwigo n'a pas pu configurer PHP 5."; -$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = "Il vous faut contacter le support de votre hébergeur pour savoir comment configurer vous-même PHP 5."; +$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo n\'a pas pu configurer PHP 5.2'; +$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Il vous faut contacter le support de votre hébergeur pour savoir comment configurer vous-même PHP 5.2'; $lang['Hope to see you back soon.'] = "En espérant vous revoir très prochainement."; $lang['Congratulations, Piwigo installation is completed'] = 'Félicitations, l\'installation de Piwigo est terminée'; $lang['An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning : database.inc.php must only contain what is in the textarea, no line return or space character)'] = 'Une solution alternative est de copier le texte dans la zone ci-dessous et de le coller dans le fichier "local/config/database.inc.php" (Attention: database.inc.php ne doit contenir que ce qui se trouve dans la zone, pas de retour à la ligne, pas d\'espace)'; @@ -64,5 +64,4 @@ $lang['Just another Piwigo gallery'] = 'Une galerie Piwigo de plus'; $lang['Welcome to my photo gallery'] = 'Bienvenue sur ma galerie photo'; $lang['Welcome to your new installation of Piwigo!'] = 'Bienvenue sur votre nouvelle installtion de Piwigo!'; $lang['Don\'t hesitate to consult our forums for any help : %s'] = 'N\'hésitez pas à consulter bos forums si vous avez le moindre problème : %s'; -$lang['localhost or other, supplied by your host provider'] = 'localhost ou autre, communiqué par votre hébergeur'; -?> \ No newline at end of file +$lang['localhost or other, supplied by your host provider'] = 'localhost ou autre, communiqué par votre hébergeur'; \ No newline at end of file diff --git a/sources/language/fr_CA/upgrade.lang.php b/sources/language/fr_CA/upgrade.lang.php index 00b613a..6c7acc7 100644 --- a/sources/language/fr_CA/upgrade.lang.php +++ b/sources/language/fr_CA/upgrade.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/language/fr_FR/admin.lang.php b/sources/language/fr_FR/admin.lang.php index 801ea77..0036542 100644 --- a/sources/language/fr_FR/admin.lang.php +++ b/sources/language/fr_FR/admin.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -185,7 +185,7 @@ $lang['Lock albums'] = 'Verrouiller les albums'; $lang['Private'] = 'Album privé'; $lang['Public'] = 'Album public'; $lang['Find a new representant by random'] = "Trouver un nouveau représentant au hasard"; -$lang['Public / Private'] = "Publique / Privée"; +$lang['Public / Private'] = 'Public / Privé'; $lang['Manage authorizations for selected albums'] = 'Gérer le type d\'accès pour les albums sélectionnés'; $lang['Virtual album added'] = 'Album virtuel ajouté'; $lang['Virtual album deleted'] = 'Album virtuel supprimé'; @@ -807,8 +807,8 @@ $lang['Send connection settings by email'] = 'Envoyer les identifiants par email $lang['Activate comments'] = 'Activer les commentaires'; $lang['Default comments order'] = 'Ordre par défaut des commentaires'; $lang['A locked gallery is only visible to administrators'] = 'Une galerie verrouillée n\'est visible que des administrateurs'; -$lang['Unlock gallery'] = 'Déverouiller la galerie'; -$lang['Gallery unlocked'] = 'Galerie déverouillée'; +$lang['Unlock gallery'] = 'Déverrouiller la galerie'; +$lang['Gallery unlocked'] = 'Galerie déverrouillée'; $lang['Notify administrators when a comment is'] = 'Notifier les administrateurs lorsqu\'un commentaire est'; $lang['modified'] = 'modifié'; $lang['deleted'] = 'supprimé'; @@ -982,4 +982,13 @@ $lang['file name'] = 'nom de fichier'; $lang['date & time'] = 'date et heure'; $lang['width & height'] = 'largeur et hauteur'; $lang['No and unlock sub-albums'] = 'Non, et déverrouiller les sous-albums'; -$lang['Upload in progress'] = 'Transfert en cours...'; \ No newline at end of file +$lang['Upload in progress'] = 'Transfert en cours...'; +$lang['Orphans'] = 'Orphelines'; +$lang['Delete %d orphan photos'] = 'Supprimer les %d photos orphelines'; +$lang['Edit user'] = 'Éditer l\'utilisateur'; +$lang['Recipients'] = 'Destinataires'; +$lang['No recipient selected'] = 'Choisissez un destinataire'; +$lang['No user is permitted to see this private album'] = 'Aucun utilisateur n\'est autorisé à voir cet album privé'; +$lang['Each email sent will contain its own automatic authentication key on links, valid for %s.'] = 'Chaque email envoyé contiendra sa propre clef d\'identification automatique sur les liens, valide %s.'; +$lang['For security reason, authentication keys do not work for administrators.'] = 'Par mesure de sécurité les clefs d\'identification ne fonctionnent pas pour les administrateurs.'; +$lang['Y Repeat'] = 'Répétition Y'; \ No newline at end of file diff --git a/sources/language/fr_FR/common.lang.php b/sources/language/fr_FR/common.lang.php index 67823ad..89a9e18 100644 --- a/sources/language/fr_FR/common.lang.php +++ b/sources/language/fr_FR/common.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -22,7 +22,7 @@ // +-----------------------------------------------------------------------+ /* Language Name: Français [FR] -Version: 2.7.0 +Version: 2.8.2 Language URI: http://piwigo.org/ext/extension_view.php?eid=421 Author: Piwigo team Author URI: http://piwigo.org @@ -424,4 +424,5 @@ $lang['Photo title'] = 'Titre de la photo'; $lang['Photo description'] = 'Description de la photo'; $lang['Album name, A → Z'] = 'Nom de l\'album, A → Z'; $lang['Album name, Z → A'] = 'Nom de l\'album, Z → A'; -$lang['Link: %s'] = 'Lien: %s'; \ No newline at end of file +$lang['Link: %s'] = 'Lien: %s'; +$lang['Your authentication key is no longer valid.'] = 'Votre clef d\'identification n\'est plus valide.'; \ No newline at end of file diff --git a/sources/language/fr_FR/help/index.php b/sources/language/fr_FR/help/index.php index c8de97f..0b96c3e 100644 --- a/sources/language/fr_FR/help/index.php +++ b/sources/language/fr_FR/help/index.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/language/fr_FR/help/photos_add_ftp.html b/sources/language/fr_FR/help/photos_add_ftp.html index 7ab8e19..39b4fb3 100644 --- a/sources/language/fr_FR/help/photos_add_ftp.html +++ b/sources/language/fr_FR/help/photos_add_ftp.html @@ -39,15 +39,24 @@ galleries | |-- discours002.jpg | +-- discours003.jpg +-- voyage-de-noces - |-- hotel.png - |-- video-decollage-avion.avi - +-- pwg_representative - +-- video-decollage-avion.jpg +| |-- hotel.png +| |-- video-decollage-avion.avi +| +-- pwg_representative +| +-- video-decollage-avion.jpg ++-- seance-photographe + |-- img0001.jpg + |-- img0002.jpg + +-- pwg_format + |-- img0001.cr2 + |-- img0001.cmyk.jpg + |-- img0001.zip + |-- img0002.cr2 + +-- img0002.cmyk.jpg -
  • A l'exception de celui appelé "pwg_representative", chaque répertoire dans "galleries" génère un album. Le nombre de niveaux (profondeur) n'est pas limité.
    • +
  • A l'exception de "pwg_representative" et "pwg_format", chaque répertoire dans "galleries" génère un album. Le nombre de niveaux (profondeur) n'est pas limité.
  • Fondamentalement, une photo est représentée par un fichier. Pour Piwigo, un fichier peut être une photo si son extension figure dans la liste du paramètre de configuration file_ext (voir fichier include/config.inc.php). Un fichier @@ -60,6 +69,8 @@ l'extension du nom du fichier. Optionnellement, un représentant peut être associé (voir le fichier video-decollage-avion.avi dans l'exemple).
    • +
  • Formats multiples : vous pouvez proposer une photo dans plusieurs formats. Dans cet exemple, il y a 3 formats supplémentaires pour img0001.jpg. Vous pouvez activer cette fonctionnalité en ajoutant $conf['enable_formats'] = true; à votre configuration locale et en définissant une liste de formats, comme $conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');
    • +
  • Attention : le nom d'un répertoire ou d'un fichier ne doit être composé que de lettres, de chiffres, de "-", "_" ou ".". Pas d'espace ou de caractères accentués.
    • diff --git a/sources/language/fr_FR/index.php b/sources/language/fr_FR/index.php index c8de97f..0b96c3e 100644 --- a/sources/language/fr_FR/index.php +++ b/sources/language/fr_FR/index.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/language/fr_FR/install.lang.php b/sources/language/fr_FR/install.lang.php index 8143cf8..b21e275 100644 --- a/sources/language/fr_FR/install.lang.php +++ b/sources/language/fr_FR/install.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -47,14 +47,14 @@ $lang['Password [confirm]'] = "Mot de passe [Confirmer]"; $lang['verification'] = "vérification"; $lang['Need help ? Ask your question on Piwigo message board.'] = "Besoin d'aide ? Posez votre question sur le forum de Piwigo."; $lang['Visitors will be able to contact site administrator with this mail'] = "Les visiteurs pourront contacter l'administrateur du site par ce mail"; -$lang['PHP 5 is required'] = "PHP 5 est requis"; +$lang['PHP 5 is required'] = 'PHP 5.2 est requis'; $lang['It appears your webhost is currently running PHP %s.'] = "Apparemment, la version PHP de votre hébergeur est PHP %s."; -$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = "Piwigo va essayer de passer en PHP 5 en créant ou modifiant le fichier .htaccess."; +$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo va essayer de passer en PHP 5.2 en créant ou modifiant le fichier .htaccess.'; $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = "Notez que vous pouvez modifier vous-même la configuration PHP et re-lancer Piwigo ensuite."; -$lang['Try to configure PHP 5'] = "Essayer de configurer PHP 5"; +$lang['Try to configure PHP 5'] = 'Essayer de configurer PHP 5.2'; $lang['Sorry!'] = "Désolé!"; -$lang['Piwigo was not able to configure PHP 5.'] = "Piwigo n'a pas pu configurer PHP 5."; -$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = "Il vous faut contacter le support de votre hébergeur pour savoir comment configurer vous-même PHP 5."; +$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo n\'a pas pu configurer PHP 5.2'; +$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Il vous faut contacter le support de votre hébergeur pour savoir comment configurer vous-même PHP 5.2'; $lang['Hope to see you back soon.'] = "En espérant vous revoir très prochainement."; $lang['Congratulations, Piwigo installation is completed'] = 'Félicitations, l\'installation de Piwigo est terminée'; $lang['An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning : database.inc.php must only contain what is in the textarea, no line return or space character)'] = 'Une solution alternative est de copier le texte dans la zone ci-dessous et de le coller dans le fichier "local/config/database.inc.php" (Attention: database.inc.php ne doit contenir que ce qui se trouve dans la zone, pas de retour à la ligne, pas d\'espace)'; @@ -64,5 +64,4 @@ $lang['You can download the config file and upload it to local/config directory $lang['Just another Piwigo gallery'] = 'Une galerie Piwigo de plus'; $lang['Welcome to my photo gallery'] = 'Bienvenue sur ma galerie photo'; $lang['Welcome to your new installation of Piwigo!'] = 'Bienvenue sur votre nouvelle installation de Piwigo !'; -$lang['Don\'t hesitate to consult our forums for any help : %s'] = 'N\'hésitez pas à consulter nos forums si vous avez le moindre problème : %s'; -?> +$lang['Don\'t hesitate to consult our forums for any help : %s'] = 'N\'hésitez pas à consulter nos forums si vous avez le moindre problème : %s'; \ No newline at end of file diff --git a/sources/language/fr_FR/upgrade.lang.php b/sources/language/fr_FR/upgrade.lang.php index a99f797..6c2d6b5 100644 --- a/sources/language/fr_FR/upgrade.lang.php +++ b/sources/language/fr_FR/upgrade.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/language/ga_IE/common.lang.php b/sources/language/ga_IE/common.lang.php index f0bd62e..84dd8e3 100644 --- a/sources/language/ga_IE/common.lang.php +++ b/sources/language/ga_IE/common.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -22,7 +22,7 @@ // +-----------------------------------------------------------------------+ /* Language Name: Gaeilge [IE] -Version: 2.5.0 +Version: 2.8.2 Language URI: http://piwigo.org/ext/extension_view.php?eid=708 Author: Piwigo team Author URI: http://piwigo.org diff --git a/sources/language/gl_ES/admin.lang.php b/sources/language/gl_ES/admin.lang.php index f6c92a6..9499550 100755 --- a/sources/language/gl_ES/admin.lang.php +++ b/sources/language/gl_ES/admin.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -976,4 +976,12 @@ $lang['between %s and %s MB'] = 'entre %s e %s MB'; $lang['date & time'] = 'data & hora'; $lang['file name'] = 'nome de ficheiro'; $lang['width & height'] = 'largo & alto'; -$lang['Allow users to add a link to their website'] = 'Permite ós usuarios engadir unha ligazón ó seu sitio web'; \ No newline at end of file +$lang['Allow users to add a link to their website'] = 'Permite ós usuarios engadir unha ligazón ó seu sitio web'; +$lang['Delete %d orphan photos'] = 'Eliminar %d fotos orfas'; +$lang['Each email sent will contain its own automatic authentication key on links, valid for %s.'] = 'Cada correo enviado conterá súa propia chave de autenticación automática nas ligazóns, válida para %s.'; +$lang['Edit user'] = 'Modificar usuario'; +$lang['For security reason, authentication keys do not work for administrators.'] = 'Por motivos de seguranza, as chaves de autenticación non funcionan para os administradores.'; +$lang['No recipient selected'] = 'Non hai ningún destinatario seleccionado'; +$lang['No user is permitted to see this private album'] = 'O usuario non ten permitido ver este álbum privado'; +$lang['Orphans'] = 'Orfos'; +$lang['Recipients'] = 'Destinatarios'; \ No newline at end of file diff --git a/sources/language/gl_ES/common.lang.php b/sources/language/gl_ES/common.lang.php index 3a5ec34..aa8e1dc 100644 --- a/sources/language/gl_ES/common.lang.php +++ b/sources/language/gl_ES/common.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -22,7 +22,7 @@ // +-----------------------------------------------------------------------+ /* Language Name: Galego [ES] -Version: 2.7.1 +Version: 2.8.2 Language URI: http://piwigo.org/ext/extension_view.php?eid=681 Author: Piwigo team Author URI: http://piwigo.org @@ -423,4 +423,5 @@ $lang['Link: %s'] = 'Ligazón: %s'; $lang['Photo description'] = 'Descrición da foto'; $lang['Photo title'] = 'Título da foto'; $lang['Album name, A → Z'] = 'Nome do álbum, A → Z'; -$lang['Album name, Z → A'] = 'Nome do álbum, A → Z'; \ No newline at end of file +$lang['Album name, Z → A'] = 'Nome do álbum, A → Z'; +$lang['Your authentication key is no longer valid.'] = 'A túa chave de autenticación xa non é válida.'; \ No newline at end of file diff --git a/sources/language/gl_ES/help/photos_add_ftp.html b/sources/language/gl_ES/help/photos_add_ftp.html index 0d1caf7..046e119 100644 --- a/sources/language/gl_ES/help/photos_add_ftp.html +++ b/sources/language/gl_ES/help/photos_add_ftp.html @@ -37,21 +37,32 @@ galleries | |-- dancers002.jpg | +-- dancers003.jpg +-- honeymoon - |-- hotel.png - |-- video-from-plane.avi - +-- pwg_representative - +-- video-from-plane.jpg +| |-- hotel.png +| |-- video-from-plane.avi +| +-- pwg_representative +| +-- video-from-plane.jpg ++-- photoshoot + |-- img0001.jpg + |-- img0002.jpg + +-- pwg_format + |-- img0001.cr2 + |-- img0001.cmyk.jpg + |-- img0001.zip + |-- img0002.cr2 + +-- img0002.cmyk.jpg -
  • A excepción de "pwg_representative" (ver explicación debaixo), cada cartafol dentro de "galleries" produce un álbum. Non hai límite de profundidade.
    • +
  • A excepción de "pwg_representative" é "pwg_format (ver explicación debaixo), cada cartafol dentro de "galleries" produce un álbum. Non hai límite de profundidade.
  • Basicamente, un elemento é representado por un ficheiro. Un ficheiro pode ser un elemento Piwigo se súa extensión está entre as posibles nos parámetros de configuración file_ext (ver o ficheiro include/config_default.inc.php). Un ficheiro pode ser unha imaxe se súa extensión está entre as posibles nos parámetros de configuración picture_ext.
  • Os elementos que non son fotos (vídeo, sons, ficheiros de texto, calquera outro...) son representados de xeito predeterminado por unha icona correspondente á extensión do ficheiro. Opcionalmente, podes asociar unha miniatura e un ficheiro representativo (ver video.avi no exemplo de arriba).
    • +
  • Multiple formats: a photo can be available in several formats. In this example, we have 3 additional formats for img0001.jpg. You can activate this feature with $conf['enable_formats'] = true; in your local configuration and define a list of formats, like $conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');
    • +
  • Aviso: o nome dos cartafoles e ficheiros debe conter só letras, números, "-", "_" ou ".". Sen espazos en branco nin caracteres acentuados.
  • Unha vez que as imaxes estean correctamente situadas nos cartafoles, vai a: Administración » Ferramentas » Sincronizar
    • diff --git a/sources/language/gl_ES/install.lang.php b/sources/language/gl_ES/install.lang.php index 1179cad..7b7bc57 100755 --- a/sources/language/gl_ES/install.lang.php +++ b/sources/language/gl_ES/install.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -28,19 +28,19 @@ $lang['user login given by your host provider'] = 'nome de usuario fornecido pol $lang['user password given by your host provider'] = 'clave de usuario fornecida polo teu provedor do aloxamento'; $lang['verification'] = 'verificación'; $lang['webmaster login can\'t contain characters \' or "'] = 'o nome de usuario do administrador web non pode conter caranteres \' nin "'; -$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Tes que poñerte en contacto co teu fornecedor do aloxamento coa fin de saber como mudar a PHP 5.'; +$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Tes que poñerte en contacto co teu fornecedor do aloxamento coa fin de saber como mudar a PHP 5.2'; $lang['also given by your host provider'] = 'tamén fornecido polo teu provedor do aloxamento'; -$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo pode tratar de mudar a túa configuración PHP 5 a traveso da creación ou modificación dun ficheiro .htaccess.'; -$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo non foi quen de configurar o PHP 5.'; +$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo pode tratar de mudar a túa configuración PHP 5.2 a traveso da creación ou modificación dun ficheiro .htaccess.'; +$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo non foi quen de configurar o PHP 5.2'; $lang['Sorry!'] = 'Sentímolo!'; $lang['Start Install'] = 'Comezar a instalación'; -$lang['Try to configure PHP 5'] = 'Tratar de configurar PHP 5'; +$lang['Try to configure PHP 5'] = 'Tratar de configurar PHP 5.2'; $lang['User'] = 'Usuario'; $lang['Visitors will be able to contact site administrator with this mail'] = 'Os visitantes poderán empregar este correo electrónico para contactar co administrador do sitio'; $lang['Welcome to my photo gallery'] = 'Benvido a miña galería de fotos'; $lang['Welcome to your new installation of Piwigo!'] = 'Benvido a túa nova instalación de piwigo!'; $lang['You can download the config file and upload it to local/config directory of your installation.'] = 'Podes descargar o ficheiro de configuración e subilo a local/config na túa instalación.'; -$lang['PHP 5 is required'] = 'É preciso PHP 5'; +$lang['PHP 5 is required'] = 'É preciso PHP 5.2'; $lang['Password ']['confirm'] = 'Clave [confirmar]'; $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'Fíxate que podes mudar ti mesmo a túa configuración e reiniciar o Piwigo despois.'; $lang['Need help ? Ask your question on Piwigo message board.'] = 'Precisas axuda? Pregunta as túas dúbidas no panel de mensaxes Piwigo. '; @@ -64,5 +64,4 @@ $lang['Hope to see you back soon.'] = 'Esperamos verte de volta en breve.'; $lang['Host'] = 'Servidor'; $lang['Installation'] = 'Instalación'; $lang['Admin configuration'] = 'Configuración da adminstración'; -$lang['localhost or other, supplied by your host provider'] = 'aloxamento local ou outro, fornecido polo seu aloxador'; -?> \ No newline at end of file +$lang['localhost or other, supplied by your host provider'] = 'aloxamento local ou outro, fornecido polo seu aloxador'; \ No newline at end of file diff --git a/sources/language/gl_ES/upgrade.lang.php b/sources/language/gl_ES/upgrade.lang.php index 5e59031..b665881 100755 --- a/sources/language/gl_ES/upgrade.lang.php +++ b/sources/language/gl_ES/upgrade.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/language/gu_IN/common.lang.php b/sources/language/gu_IN/common.lang.php index 8953cdc..42d67cc 100644 --- a/sources/language/gu_IN/common.lang.php +++ b/sources/language/gu_IN/common.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -22,7 +22,7 @@ // +-----------------------------------------------------------------------+ /* Language Name: ગુજરાતી[IN] -Version: 2.6.0 +Version: 2.8.2 Language URI: http://piwigo.org/ext/extension_view.php?eid=767 Author: Piwigo team Author URI: http://piwigo.org @@ -82,4 +82,14 @@ $lang['the beginning'] = 'શુરુઆત'; $lang['this email address is already in use'] = 'આ ઈમેલ અડ્રેસ પેહલા થી વપરાશ મા છે'; $lang['this login is already used'] = 'આ લોગિન પેહલા થી વપરાશ મા છે'; $lang['today'] = 'આજે'; -$lang['wrong date'] = 'ખોટી તારીખ'; \ No newline at end of file +$lang['wrong date'] = 'ખોટી તારીખ'; +$lang['set as album representative'] = 'થંબનેલ ની જેમ મુકો '; +$lang['thumb'] = 'થંબનેલ'; +$lang['slideshow'] = 'સ્લાઇડ શો'; +$lang['small'] = 'નાનું'; +$lang['stop the slideshow'] = 'સ્લાઇડ શો બંધ કરો'; +$lang['xsmall'] = 'વધારે નાનું'; +$lang['xxlarge'] = 'વિશાળ'; +$lang['xlarge'] = 'વધારે મોટું'; +$lang['useful when password forgotten'] = 'કામ નુ અગર પાસવર્ડ ભૂલી ગયા હોઇ તો'; +$lang['the username must be given'] = 'યૂજ઼ર નેમ નાખવુ જરૂરી છે'; \ No newline at end of file diff --git a/sources/language/he_IL/admin.lang.php b/sources/language/he_IL/admin.lang.php index 76c1bab..149bfab 100644 --- a/sources/language/he_IL/admin.lang.php +++ b/sources/language/he_IL/admin.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -21,768 +21,768 @@ // | USA. | // +-----------------------------------------------------------------------+ -$lang['%d association'] = 'סך הכול %d'; -$lang['%d associations'] = 'סך הכול %d'; -$lang['%d album including'] = 'כולל הקטגוריה %d'; -$lang['%d albums including'] = 'כולל הקטגוריות %d'; +$lang['%d association'] = '%d שיוך'; +$lang['%d associations'] = '%d שיוכים'; +$lang['%d album including'] = '%d אלבום כולל'; +$lang['%d albums including'] = '%d אלבומים כולל'; $lang['%d physical'] = 'פיזי %d'; $lang[' and %d virtual'] = 'ו %d וירטואלי'; -$lang['%d album moved'] = '%d קטגוריה עברה'; -$lang['%d albums moved'] = '%d קטגוריות עברו'; +$lang['%d album moved'] = '%d אלבום שינה מקום'; +$lang['%d albums moved'] = '%d אלבומים שינו מקום'; $lang['%d group'] = '%d קבוצה'; $lang['%d groups'] = '%d קבוצות'; $lang['%d member'] = '%d חבר'; $lang['%d members'] = '%d חברים'; -$lang['%d tag'] = '%d תג'; +$lang['%d tag'] = '%d תגית'; $lang['%d tags'] = '%d תגיות'; $lang['%d user comment rejected'] = '%d תגובת המשתמש נדחתה'; $lang['%d user comments rejected'] = '%d תגובות המשתמש נדחו'; $lang['%d user comment validated'] = '%d תגובת המשתמש אושרה'; $lang['%d user comments validated'] = '%d תגובות המשתמש אושרו'; -$lang['%d user deleted'] = '%d המשתמש נמחק'; -$lang['%d users deleted'] = '%d המשתמשים נמחקו'; +$lang['%d user deleted'] = '%d משתמש נמחק'; +$lang['%d users deleted'] = '%d משתמשים נמחקו'; $lang['%d user'] = '%d משתמש'; $lang['%d users'] = '%d משתמשים'; $lang['%d waiting for validation'] = '%d מחכה לאימות'; $lang['Actions'] = 'פעולות'; -$lang['Activate'] = 'להפעיל'; -$lang['Add/delete a permalink'] = 'הוספה / מחיקה של קישורית'; +$lang['Activate'] = 'הפעל'; +$lang['Add/delete a permalink'] = 'הוספה/מחיקה של קישור קבוע'; $lang['Add a tag'] = 'הוסף תגית'; $lang['Add a user'] = 'הוסף משתמש'; $lang['Add group'] = 'הוסף קבוצה'; $lang['Add'] = 'הוסף'; $lang['Allow user registration'] = 'אפשר רישום משתמשים'; -$lang['Apply to sub-albums'] = 'החל על קטגוריות משניות'; -$lang['Associated'] = 'שייך'; +$lang['Apply to sub-albums'] = 'החל על אלבומי משנה'; +$lang['Associated'] = 'משוייך'; $lang['Caddie management'] = 'ניהול סל'; $lang['Caddie'] = 'סל'; -$lang['Albums authorized thanks to group associations'] = 'הקטגוריה מאושרת אודות לקבוצת האסוציאציות'; -$lang['Album manual order was saved'] = 'סדר הקטגוריות נשמר'; -$lang['Check for upgrade failed for unknown reasons.'] = 'בדוק אם השדרוג נכשל מסיבות לא ידועות.'; -$lang['Check for upgrade'] = 'חפש עדכונים שדרוגים'; +$lang['Albums authorized thanks to group associations'] = 'האלבום אושר הודות לשיוכי הקבוצה'; +$lang['Album manual order was saved'] = 'סדר אלבומים ידני נשמר'; +$lang['Check for upgrade failed for unknown reasons.'] = 'חיפוש אחר שידרוג נכשל מסיבות לא ברורות.'; +$lang['Check for upgrade'] = 'חפש שדרוגים'; $lang['Comments for all'] = 'תגובות עבור כל'; $lang['Current name'] = 'השם הנוכחי'; $lang['Database'] = 'מסד נתונים'; -$lang['Deactivate'] = 'לא פעיל'; -$lang['Delete Representant'] = 'מחק הצגה'; -$lang['Delete selected tags'] = 'מחק את התגים שנבחרו'; +$lang['Deactivate'] = 'כבה'; +$lang['Delete Representant'] = 'מחק צלמית אלבום'; +$lang['Delete selected tags'] = 'מחק את התגיות שנבחרו'; $lang['Delete selected users'] = 'מחק את המשתמשים שנבחרו'; $lang['Deletions'] = 'מחיקות'; -$lang['Deny selected groups'] = 'אסור קבוצות שנבחרו'; -$lang['Deny selected users'] = 'אסור משתמשים שנבחרו'; +$lang['Deny selected groups'] = 'מנע קבוצות שנבחרו'; +$lang['Deny selected users'] = 'מנע משתמשים שנבחרו'; $lang['Description'] = 'תיאור'; -$lang['Display options'] = 'הצגת אפשרויות'; +$lang['Display options'] = 'הצג אפשרויות'; $lang['Dissociated'] = 'מנותק'; -$lang['Does not represent'] = 'האם לא מייצג'; -$lang['Edit selected tags'] = 'ערוך את התגים הנבחרים'; +$lang['Does not represent'] = 'לא צלמית עבור'; +$lang['Edit selected tags'] = 'ערוך תגיות נבחרות'; $lang['Edit tags'] = 'ערוך תגיות'; -$lang['Email admins when a new user registers'] = 'שלח מייל למנהל כאשר נרשם משתמש חדש'; -$lang['Email admins when a valid comment is entered'] = 'שלח מייל למנהל כאשר נרשמת תגובה'; -$lang['Email admins when a comment requires validation'] = 'שלח מייל למנהל כאשר נדרש אימות לתגובה'; +$lang['Email admins when a new user registers'] = 'שלח מייל לאדמינים כאשר נרשם משתמש חדש'; +$lang['Email admins when a valid comment is entered'] = 'שלח מייל לאדמינים כאשר מתווספת תגובה'; +$lang['Email admins when a comment requires validation'] = 'שלח מייל לאדמינים כאשר נדרש אימות לתגובה'; $lang['Environment'] = 'סביבה'; $lang['Form'] = 'טופס'; $lang['Gallery title'] = 'כותרת הגלריה'; -$lang['Grant selected groups'] = 'להעניק לקבוצות שנבחרו'; -$lang['Grant selected users'] = 'להענית למשתמשים שנבחרו'; +$lang['Grant selected groups'] = 'אשר לקבוצות שנבחרו'; +$lang['Grant selected users'] = 'אשר למשתמשים שנבחרו'; $lang['Group name'] = 'שם הקבוצה'; $lang['Groups'] = 'קבוצות'; -$lang['Guests'] = 'האורחים'; +$lang['Guests'] = 'אורחים'; $lang['History'] = 'היסטוריה'; $lang['Informations'] = 'מידע'; $lang['Install'] = 'התקן'; -$lang['Link all album photos to a new album'] = 'קישור כל הפריטים בקטגוריה לקטגוריה חדשה'; -$lang['Link all album photos to some existing albums'] = 'קישור כל הפריטים בקטגוריה לקטגוריה קיימת'; -$lang['Linked albums'] = 'קטגוריות מקושרות'; -$lang['Lock gallery'] = 'גלריה נעולה'; +$lang['Link all album photos to a new album'] = 'קישור כל התמונות באלבום לאלבום חדש'; +$lang['Link all album photos to some existing albums'] = 'קישור כל התמונות באלבום לאלבומים קיימים'; +$lang['Linked albums'] = 'אלבומים מקושרים'; +$lang['Lock gallery'] = 'נעל גלריה'; $lang['Maintenance'] = 'תחזוקה'; -$lang['Edit album permissions'] = 'ניהול הרשאות עבור קטגוריה'; +$lang['Edit album permissions'] = 'ניהול הרשאות עבור אלבום'; $lang['Manage permissions for group "%s"'] = 'ניהול הרשאות עבור קבוצה "%s"'; $lang['Manage permissions for user "%s"'] = 'ניהול הרשאות עבור המשתמש "%s"'; -$lang['Manage tags'] = 'ניהול תגים'; +$lang['Manage tags'] = 'נהל תגיות'; $lang['Members'] = 'חברים'; -$lang['Metadata synchronized from file'] = 'סנכרון מידע מקובץ'; -$lang['Move albums'] = 'העבר הקטגוריות'; -$lang['Move'] = 'העבר'; +$lang['Metadata synchronized from file'] = 'Metadata סונכרן מקובץ'; +$lang['Move albums'] = 'הזז אלבומים'; +$lang['Move'] = 'הזז'; $lang['Name'] = 'שם'; $lang['New name'] = 'שם חדש'; -$lang['New parent album'] = 'קטגורית אם חדשה'; -$lang['New tag'] = 'תג חדש'; +$lang['New parent album'] = 'אלבום הורה חדש'; +$lang['New tag'] = 'תגית חדשה'; $lang['Number of comments per page'] = 'מספר תגובות בעמוד'; -$lang['Number of rates'] = 'מספר שיעורי'; -$lang['Only private albums are listed'] = 'קטגוריה פרטים לרשומים בלבד'; +$lang['Number of rates'] = 'מספר דירוגים'; +$lang['Only private albums are listed'] = 'רק אלבומים פרטיים מופיעים ברשימה'; $lang['Operating system'] = 'מערכת הפעלה'; $lang['Options'] = 'אפשרויות'; -$lang['Other private albums'] = 'קטגוריות פרטיות אחרות'; +$lang['Other private albums'] = 'אלבומים פרטיים אחרים'; $lang['Page banner'] = 'באנר הדף'; -$lang['Parent album'] = 'קטגורית אם'; -$lang['Path'] = 'נתיב'; -$lang['Permalink %s has been previously used by album %s. Delete from the permalink history first'] = 'השתמשו בעבר ב Permalink "%s" "זה עבור הקטגוריה "%s". מחק אותו ההסטוריה של permalink'; -$lang['The permalink name must be composed of a-z, A-Z, 0-9, "-", "_" or "/". It must not be numeric or start with number followed by "-"'] = 'השם Permalink חייב להיות מורכב a-z, A-Z, 0-9, "-", "_" או "/".הוא חייב לא להיות מספרי או להתחיל עם מספר "-"'; -$lang['Permalink %s is already used by album %s'] = 'Permalink "%s" "נמצא כבר בשימוש על ידי הקטגוריה "%s"'; -$lang['Permalink history'] = 'ההיסטוריה Permalinks'; -$lang['Permalinks'] = 'קישורים מפנים'; -$lang['Permission denied'] = 'ההרשאה נדחתה'; -$lang['Permission granted thanks to a group'] = 'ההרשאה ניתנה בזכות הקבוצה'; -$lang['Permission granted'] = 'ניתנה הרשאה'; -$lang['Photo informations updated'] = 'מידע עבור התמונות הועלה'; +$lang['Parent album'] = 'אלבום הורה'; +$lang['Path'] = 'מסלול'; +$lang['Permalink %s has been previously used by album %s. Delete from the permalink history first'] = 'השתמשו בעבר בקישור קבוע %s זה עבור אלבום %s. ראשית מחוק אותו מהיסטורית הקישורים הקבועים'; +$lang['The permalink name must be composed of a-z, A-Z, 0-9, "-", "_" or "/". It must not be numeric or start with number followed by "-"'] = 'שם הקישור הקבוע חייב להיות מורכב a-z, A-Z, 0-9, "-", "_" או "/".הוא חייב לא להיות מספרי או להתחיל עם מספר "-"'; +$lang['Permalink %s is already used by album %s'] = 'קישור קבוע %s נמצא כבר בשימוש על ידי אלבום %s'; +$lang['Permalink history'] = 'היסטורית קישורים קבועים'; +$lang['Permalinks'] = 'קישורים קבועים'; +$lang['Permission denied'] = 'הרשאה נדחתה'; +$lang['Permission granted thanks to a group'] = 'הרשאה ניתנה בזכות קבוצה'; +$lang['Permission granted'] = 'הרשאה ניתנה'; +$lang['Photo informations updated'] = 'מידע עבור התמונה עודכן'; $lang['Plugins'] = 'תוספים'; $lang['Position'] = 'מיקום'; $lang['Preferences'] = 'העדפות'; -$lang['Properties'] = 'נכסים'; +$lang['Properties'] = 'תכונות'; $lang['Random photo'] = 'תמונה אקראית'; $lang['Rate date'] = 'תאריך דירוג'; $lang['Rating by guests'] = 'דירוג על ידי אורחים'; $lang['Rating'] = 'דירוג'; $lang['Reject'] = 'דחה'; -$lang['Representant'] = 'נציג'; -$lang['Representation of albums'] = 'ייצוג קטגוריות'; -$lang['Representative'] = 'הנציג'; -$lang['Represents'] = 'מייצג'; +$lang['Representant'] = 'צלמית אלבום'; +$lang['Representation of albums'] = 'צלמית אלבום'; +$lang['Representative'] = 'צלמית אלבום'; +$lang['Represents'] = 'צלמית עבור'; $lang['Save order'] = 'שמור סדר'; -$lang['Save to permalink history'] = 'שמור להיסטורית Permalinks'; -$lang['Select at least one album'] = 'בחר לפחות בקטגוריה אחת'; +$lang['Save to permalink history'] = 'שמור להיסטורית קישורים קבועים'; +$lang['Select at least one album'] = 'בחר לפחות אלבום אחד'; $lang['Select at least one photo'] = 'בחר לפחות תמונה אחת'; $lang['Select at least one user'] = 'בחר לפחות משתמש אחד'; $lang['Show info'] = 'הצג מידע'; $lang['Site manager'] = 'מנהל אתר'; $lang['Status'] = 'סטטוס'; -$lang['Statistics'] = 'סטטיסטיקה'; -$lang['Storage album'] = 'מחסן קטגוריות'; -$lang['Sum of rates'] = 'סכום של דירוג'; -$lang['Tag "%s" already exists'] = 'התג "%s"" כבר קיים'; -$lang['Tag "%s" was added'] = 'התג "%s"" נוסף'; -$lang['Tag selection'] = 'בחירת תגית'; +$lang['Statistics'] = 'סטטיסטיקות'; +$lang['Storage album'] = 'אלבום אחסון'; +$lang['Sum of rates'] = 'סכום של דירוגים'; +$lang['Tag "%s" already exists'] = 'התגית "%s" כבר קיימת'; +$lang['Tag "%s" was added'] = 'התגית "%s" התווספה'; +$lang['Tag selection'] = 'בחירת תגיות'; $lang['The %d following tags were deleted'] = 'התגיות הבאות %d נמחקו'; -$lang['Unable to check for upgrade.'] = 'אין אפשרות לבדוק אם קיימים שדרוגים.'; -$lang['Uninstall'] = 'הסר'; -$lang['Use the default photo sort order'] = 'השתמש תמונת ברירת המחדל להרשמה קצרה'; -$lang['User comments validation'] = 'תגובות מאושרות של המשתמש'; +$lang['Unable to check for upgrade.'] = 'לא מצליח לבדוק אם קיימים שדרוגים.'; +$lang['Uninstall'] = 'הסר התקנה'; +$lang['Use the default photo sort order'] = 'השתמש בברירת המחדל למיון תמונות'; +$lang['User comments validation'] = 'אישור תגובות משתמש'; $lang['Users'] = 'משתמשים'; -$lang['Validate'] = 'אמת'; -$lang['Validation'] = 'אימות'; +$lang['Validate'] = 'אשר'; +$lang['Validation'] = 'אישור'; $lang['Version'] = 'גרסה'; -$lang['Virtual albums to move'] = 'הקטגוריות וירטואליות להעברה'; -$lang['Virtual album name'] = 'שם קטגוריה וירטואלית'; -$lang['Webmaster cannot be deleted'] = 'לא ניתן למחוק את מנהל האתר'; +$lang['Virtual albums to move'] = 'אלבומים וירטואלים להזזה'; +$lang['Virtual album name'] = 'שם אלבום וירטואלי'; +$lang['Webmaster cannot be deleted'] = 'לא ניתן למחוק מנהל אתר'; $lang['You are running on development sources, no check possible.'] = 'אתה פועל על מקורות בפיתוח, לא ניתן לבדוק.'; $lang['You cannot delete your account'] = 'אתה לא יכול למחוק את החשבון שלך'; -$lang['You cannot move an album in its own sub album'] = 'אתה לא יכול להעביר קטגוריה לתוך התת קטגוריה שלה'; -$lang['You need to confirm deletion'] = 'אתה חייב לאשר את המחיקה'; -$lang['Associate to album'] = 'לשייך לקטגוריה'; +$lang['You cannot move an album in its own sub album'] = 'אתה לא יכול להעביר אלבום לתוך אלבום המשנה שלו עצמו'; +$lang['You need to confirm deletion'] = 'אתה צריך לאשר את המחיקה'; +$lang['Associate to album'] = 'שייך לאבלום'; $lang['associate to group'] = 'לשייך לקבוצה'; $lang['Authorized'] = 'מורשה'; -$lang['Add a virtual album'] = 'הוספת קטגוריה וירטואלית'; -$lang['Authorize users to add comments on selected albums'] = 'הרשה למשתמשים להוסיף תגובות לקטגוריות שנבחרו'; -$lang['The name of an album must not be empty'] = 'השם של הקטגוריה לא יכול להיות ריק'; -$lang['Lock albums'] = 'נעל קטגוריות'; -$lang['Private'] = 'קטגוריה פרטית'; -$lang['Public'] = 'קטגוריה ציבורית'; -$lang['Find a new representant by random'] = 'מצא ייצוג אקראי חדש'; -$lang['Public / Private'] = 'ציבורי / פרטי'; -$lang['Manage authorizations for selected albums'] = 'נהל הרשאות עבור הקטגוריות שנבחרו'; -$lang['Virtual album added'] = 'קטגוריה וירטואלית נוספה'; -$lang['Virtual album deleted'] = 'קטגוריה וירטואלית נמחקה'; +$lang['Add a virtual album'] = 'הוסף אלבום וירטואלי'; +$lang['Authorize users to add comments on selected albums'] = 'הרשה למשתמשים להוסיף תגובות לאלבומים שנבחרו'; +$lang['The name of an album must not be empty'] = 'שם האלבום לא יכול להיות ריק'; +$lang['Lock albums'] = 'נעל אלבומים'; +$lang['Private'] = 'פרטי'; +$lang['Public'] = 'פומבי'; +$lang['Find a new representant by random'] = 'מצא צלמית אלבום אקראי חדש'; +$lang['Public / Private'] = 'פומבי / פרטי'; +$lang['Manage authorizations for selected albums'] = 'נהל הרשאות עבור האלבומים שנבחרו'; +$lang['Virtual album added'] = 'אלבום וירטואלי התווסף'; +$lang['Virtual album deleted'] = 'אלבום וירטואלי נמחק'; $lang['Access type'] = 'סוג גישה'; -$lang['Information data registered in database'] = 'מידע הנתונים רשום במאגר נתונים'; +$lang['Information data registered in database'] = 'נתוני המידע רשומים במסד הנתונים'; $lang['Default display'] = 'תצוגת ברירת המחדל'; -$lang['The gallery URL is not valid.'] = 'ה-URL בגלריה אינו חוקי.'; -$lang['The number of comments a page must be between 5 and 50 included.'] = 'מספר הערות בדף חייב להיות בין 5 ל 50 כולל.'; +$lang['The gallery URL is not valid.'] = 'URL הגלריה אינו חוקי.'; +$lang['The number of comments a page must be between 5 and 50 included.'] = 'מספר הערות בדף חייב להיות בין 5 ל-50 כולל.'; $lang['Configuration'] = 'תצורה'; -$lang['confirm'] = 'לאשר'; +$lang['confirm'] = 'אשר'; $lang['Date'] = 'תאריך'; -$lang['delete album'] = 'למחוק את הקטגוריה'; -$lang['Dissociate from album'] = 'נתק מהקטגוריה'; -$lang['dissociate from group'] = 'נתק מהקבוצה'; -$lang['Album updated successfully'] = 'מידע על הקטגוריה עודכן בהצלחה.'; -$lang['photos per page'] = 'פריטים בעמוד'; -$lang['High definition enabled'] = 'איכות גבוהה מופעלת'; +$lang['delete album'] = 'מחק אלבום'; +$lang['Dissociate from album'] = 'נתק מאלבום'; +$lang['dissociate from group'] = 'נתק מקבוצה'; +$lang['Album updated successfully'] = 'אלבום עודכן בהצלחה.'; +$lang['photos per page'] = 'תמונות בעמוד'; +$lang['High definition enabled'] = 'חדות גבוהה מופעלת'; $lang['File'] = 'קובץ'; -$lang['first photo added on %s'] = 'הפריט הראשון התווסף ב"%s "'; +$lang['first photo added on %s'] = 'תמונה ראשונה התווספה ל %s '; $lang['Forbidden'] = 'אסורה'; $lang['global mode'] = 'מצב גלובלי'; -$lang['group "%s" added'] = 'הקבוצה "%s"" נוספה'; -$lang['group "%s" deleted'] = 'הקבוצה "%s"" נמחקה'; -$lang['group "%s" updated'] = 'הקבוצה "%s"" הועלתה'; -$lang['The name of a group must not contain " or \' or be empty.'] = "שם של קבוצה לא יכול להכיל מרחאות או ' או להיות ריק"; +$lang['group "%s" added'] = 'הקבוצה "%s" התווספה'; +$lang['group "%s" deleted'] = 'הקבוצה "%s" נמחקה'; +$lang['group "%s" updated'] = 'הקבוצה "%s" עודכנה'; +$lang['The name of a group must not contain " or \' or be empty.'] = 'שם קבוצה לא יכול להכיל ״ או \' או להיות ריק'; $lang['This name is already used by another group.'] = 'שם זה נמצא כבר בשימוש על ידי קבוצה אחרת.'; -$lang['High definition'] = 'בחדות גבוהה'; -$lang['jump to album'] = 'לקפוץ לקטגוריה'; -$lang['jump to photo'] = 'קפיצה אל התמונה'; -$lang['leave'] = 'לעזוב'; +$lang['High definition'] = 'חדות גבוהה'; +$lang['jump to album'] = 'קפוץ לאלבום'; +$lang['jump to photo'] = 'קפוץ לתמונה'; +$lang['leave'] = 'עזוב'; $lang['Lock'] = 'נעל'; $lang['Locked'] = 'נעול'; -$lang['manage album photos'] = 'ניהול פריטים בקטגוריה'; -$lang['manage sub-albums'] = 'ניהול קטגוריות משנה'; -$lang['Manage'] = 'ניהול'; -$lang['Execution time is out, treatment must be continue [Estimated time: %d second].'] = 'זמן ביצוע יוצא, הטיפול חייב להיות המשך [זמן משוער:% השני ד].'; -$lang['Execution time is out, treatment must be continue [Estimated time: %d seconds].'] = 'זמן ביצוע חריגה, הטיפול חייב להמשיך [זמן משוער:% d שניות].'; -$lang['Prepared time for list of users to send mail is limited. Others users are not listed.'] = 'הגיע הזמן להכין את רשימת המשתמשים אשר יישלח בדואר מוגבל למשתמשים אחרים אינם מפורטים..'; -$lang['Time to send mail is limited. Others mails are skipped.'] = 'הזמן כדי לשלוח דואר אלקטרוני מוגבל אחרים כבר דילג..'; -$lang['To send ?'] = 'כדי לשלוח?'; -$lang['Last send'] = 'לאחרונה שלחה'; +$lang['manage album photos'] = 'ניהול תמונות באלבום'; +$lang['manage sub-albums'] = 'ניהול אלבומי משנה'; +$lang['Manage'] = 'נהל'; +$lang['Execution time is out, treatment must be continue [Estimated time: %d second].'] = 'הסתיים זמן ריצה, הטיפול חייב להמשך [זמן מוערך: %d שניות]'; +$lang['Execution time is out, treatment must be continue [Estimated time: %d seconds].'] = 'חריגה מזמן ריצה, הטיפול חייב להמשך [זמן מוערך: %d שניות]'; +$lang['Prepared time for list of users to send mail is limited. Others users are not listed.'] = 'הזמן להכין את רשימת המשתמשים אליהם יישלח דואר מוגבל. משתמשים אחרים אינם מפורטים.'; +$lang['Time to send mail is limited. Others mails are skipped.'] = 'הזמן לשליחת דואר מוגבל. מדלגים על דואר לאחרים.'; +$lang['To send ?'] = 'לשלוח?'; +$lang['Last send'] = 'נשלח לאחרונה'; $lang['User'] = 'משתמש'; -$lang['See you soon,'] = 'נתראה בקרוב'; -$lang['Go to'] = 'עבור'; +$lang['See you soon,'] = 'נתראה בקרוב,'; +$lang['Go to'] = 'עבור אל'; $lang['Hello'] = 'שלום'; -$lang['New photos were added'] = 'אלמנטים חדשים נוספו'; -$lang['on'] = 'על Piwigo'; +$lang['New photos were added'] = 'תמונות חדשות התווספו'; +$lang['on'] = 'על'; $lang['between'] = 'בין'; $lang['and'] = 'ו'; -$lang['The webmaster has subscribed you to receiving notifications by mail.'] = 'שמנהל האתר רשום לך לקבל הודעות בדואר.'; -$lang['You have subscribed to receiving notifications by mail.'] = 'יש לך מנוי כדי לקבל הודעות בדואר.'; -$lang['To subscribe'] = 'כדי להירשם'; -$lang['If you encounter problems or have any question, please send a message to'] = 'אם אתה נתקל בבעיות או יש לך שאלה, שילחו הודעה ל'; +$lang['The webmaster has subscribed you to receiving notifications by mail.'] = 'מנהל האתר רשם אותך לקבלת הודעות בדואר.'; +$lang['You have subscribed to receiving notifications by mail.'] = 'נרשמת לקבלת התראות בדואר.'; +$lang['To subscribe'] = 'להירשם'; +$lang['If you encounter problems or have any question, please send a message to'] = 'אם אתה נתקל בבעיות או יש לך שאלה, אנא שלח הודעה אל'; $lang['[NBM] Problems or questions'] = '[NBM] בעיות או שאלות'; -$lang['The webmaster has unsubscribed you from receiving notifications by mail.'] = 'שמנהל האתר הרשמתך ממך לקבל הודעות בדואר.'; -$lang['You have unsubscribed from receiving notifications by mail.'] = 'ביטלת את המנוי מלהיות הודעה בדואר.'; +$lang['The webmaster has unsubscribed you from receiving notifications by mail.'] = 'מנהל האתר ביטל את הרשמתך לקבלת הודעות בדואר.'; +$lang['You have unsubscribed from receiving notifications by mail.'] = 'ביטלת את ההרשמה לקבלת התראות בדואר.'; $lang[', click on'] = ', לחץ על'; -$lang['To unsubscribe'] = 'כדי לבטל את המינוי'; -$lang['With blank value, gallery title will be used'] = 'אם ריק, הכותרת בגלריה ישמש'; -$lang['Notification'] = 'עידכוני RSS'; -$lang['Error when sending email to %s [%s].'] = 'שגיאה בעת שליחת דוא"ל אל""%s" "["%s"].'; -$lang['Mail sent to %s [%s].'] = 'דואר שנשלח""%s" "["%s"].'; -$lang['%d mail was sent.'] = 'ד הדואר% נשלחה.'; -$lang['%d mails were sent.'] = 'ד אלקטרוני% נשלחו.'; -$lang['%d mail was not sent.'] = 'ד הדואר% לא נשלחה.'; -$lang['%d mails were not sent.'] = 'ד אלקטרוני% לא נשלחו.'; -$lang['No mail to send.'] = 'דואר לא יישלחו.'; -$lang['There is no available subscribers to mail.'] = 'אין נרשמים כדי לקבל הודעה בדואר.'; -$lang['Subscribers could be listed (available) only if there is new elements to notify.'] = 'המנויים יכולים להיות רשומים (כניסה) רק אם יש אלמנטים חדשים כדי להודיע.'; -$lang['Anyway only webmasters can see this tab and never administrators.'] = 'מנהלי אתרים רק בכל אופן ניתן לראות את הכרטיסייה, לא מנהלים.'; -$lang['No user to send notifications by mail.'] = 'המשתמש לא כדי לקבל הודעה בדואר.'; -$lang['New photos added'] = 'אלמנטים חדשים שנוספו'; -$lang['Subscribe to notification by mail'] = 'מודלים הודעה בדואר'; -$lang['Unsubscribe from notification by mail'] = 'הסרה מרשימת הודעה בדואר'; +$lang['To unsubscribe'] = 'לבטל הרשמה'; +$lang['With blank value, gallery title will be used'] = 'אם ריק, הכותרת בגלריה תהיה בשימוש'; +$lang['Notification'] = 'עדכון'; +$lang['Error when sending email to %s [%s].'] = 'שגיאה בעת שליחת דואל אל %s [%s].'; +$lang['Mail sent to %s [%s].'] = 'דואר נשלח אל %s [%s].'; +$lang['%d mail was sent.'] = '%d דואר נשלח.'; +$lang['%d mails were sent.'] = '%d דואר נשלח.'; +$lang['%d mail was not sent.'] = '%d דואר לא נשלח.'; +$lang['%d mails were not sent.'] = '%d דואר לא נשלח.'; +$lang['No mail to send.'] = 'אין דואר לשליחה.'; +$lang['There is no available subscribers to mail.'] = 'אין נרשמים לקבלת הודעה בדואר.'; +$lang['Subscribers could be listed (available) only if there is new elements to notify.'] = 'המנויים יכולים להיות רשומים (זמינים) רק אם יש אלמנטים חדשים כדי להודיע.'; +$lang['Anyway only webmasters can see this tab and never administrators.'] = 'רק מנהלי אתרים יכולים לראות את כרטיסיה זו, לא אדמינים.'; +$lang['No user to send notifications by mail.'] = 'אין אף משתמש לעדכון בדואר.'; +$lang['New photos added'] = 'תמונות חדשות התווספו'; +$lang['Subscribe to notification by mail'] = 'הרשם להתראות בדואר'; +$lang['Unsubscribe from notification by mail'] = 'בטל הרשמה לקבלת התראות בדואר'; $lang['Parameter'] = 'הגדרות'; -$lang['Operation in progress'] = 'הטיפול מתבצעת.'; +$lang['Operation in progress'] = 'הטיפול בתהליך.'; $lang['Continue processing treatment'] = 'המשך הטיפול השוטף'; -$lang['Complementary mail content'] = 'דואר תוכן משלימים'; -$lang['Add detailed content'] = 'מוסיפים קצת תוכן מפורט'; +$lang['Complementary mail content'] = 'תוכן דואר משני'; +$lang['Add detailed content'] = 'הוסף קצת תוכן מפורט'; $lang['Send mail as'] = 'שלח דואר כ'; $lang['Send mail to users'] = 'שלח דואר למשתמשים'; $lang['Send'] = 'שלח'; $lang['Options'] = 'אפשרויות'; -$lang['Subscribed'] = 'מנויים'; +$lang['Subscribed'] = 'רשום'; $lang['Subscribe'] = 'הרשם'; $lang['Parameters'] = 'פרמטרים'; -$lang['Select recipients'] = 'בחירת נמענים'; -$lang['Subscribe/unsubscribe users'] = 'להירשם / לבטל את המנוי משתמשים'; -$lang['Unsubscribed'] = 'המינוי'; -$lang['%d parameter was updated.'] = 'ד פרמטר% המעודכן.'; -$lang['%d parameters were updated.'] = 'ד הפרמטרים% המעודכן.'; -$lang['%d user was not updated.'] = 'המשתמש% d לא מעודכן.'; -$lang['%d users were not updated.'] = 'ד למשתמשים% לא מעודכן.'; -$lang['User %s [%s] was removed from the subscription list.'] = 'המשתמש""%s" "["%s"] מרשימת המנויים.'; -$lang['User %s [%s] was added to the subscription list.'] = 'המשתמש""%s" "["%s"] לרשימת המנויים.'; -$lang['%d user was updated.'] = 'ד המשתמש% המעודכן.'; -$lang['%d users were updated.'] = 'ד למשתמשים% המעודכן.'; -$lang['User %s [%s] was not removed from the subscription list.'] = 'המשתמש""%s" "["%s"] לא יוסר מרשימת המנויים.'; -$lang['User %s [%s] was not added to the subscription list.'] = 'המשתמש""%s" "["%s"] לא הוסיף לרשימה המנוי.'; -$lang['User %s [%s] added.'] = 'המשתמש""%s" "["%s"] הוסיף.'; -$lang['Warning: subscribing or unsubscribing will send mails to users'] = 'אזהרה: מנוי או ביטול המנוי תשלח מיילים למשתמשים'; +$lang['Select recipients'] = 'בחר נמענים'; +$lang['Subscribe/unsubscribe users'] = 'להירשם/לבטל את המנוי של המשתמשים'; +$lang['Unsubscribed'] = 'בוטלה הרשמה'; +$lang['%d parameter was updated.'] = '%d פרמטר עודכן.'; +$lang['%d parameters were updated.'] = '%d פרמטרים עודכנו.'; +$lang['%d user was not updated.'] = '%d משתמש לא עודכן.'; +$lang['%d users were not updated.'] = '%d משתמשים לא עודכנו.'; +$lang['User %s [%s] was removed from the subscription list.'] = 'משתמש %s [%s] הוסר מרשימת המנויים'; +$lang['User %s [%s] was added to the subscription list.'] = 'משתמש %s [%s] התווסף לרשימת המנויים.'; +$lang['%d user was updated.'] = '%d משתמש עודכן.'; +$lang['%d users were updated.'] = '%d משתמשים עודכנו.'; +$lang['User %s [%s] was not removed from the subscription list.'] = 'משתמש %s [%s] לא הוסר מרשימת המנויים'; +$lang['User %s [%s] was not added to the subscription list.'] = 'משתמש %s [%s] לא התווסף לרשימת המנויים'; +$lang['User %s [%s] added.'] = 'משתמש %s [%s] התווסף.'; +$lang['Warning: subscribing or unsubscribing will send mails to users'] = 'אזהרה: מנוי או ביטול המנוי יגרמו לשליחת מיילים למשתמשים'; $lang['Send mail on HTML format'] = 'שלח דואר בתבנית HTML'; -$lang['Include display of recent photos grouped by dates'] = 'להציג כלול התמונות האחרונות מקובצים לפי תאריכים'; -$lang['Available only with HTML format'] = 'ניתן להשיג רק עם פורמט HTML'; -$lang['no write access'] = 'אין גישה לכתוב'; +$lang['Include display of recent photos grouped by dates'] = 'כלול תצוגה של התמונות האחרונות מאוגדות לפי תאריכים'; +$lang['Available only with HTML format'] = 'זמין רק בפורמט HTML'; +$lang['no write access'] = 'אין גישה לכתיבה'; $lang['Permissions'] = 'הרשאות'; -$lang['private'] = 'פרטית'; -$lang['public'] = 'הציבור'; -$lang['Purge never used notification feeds'] = 'הטיהור מעולם ההודעה בשימוש הזנות'; -$lang['Purge sessions'] = 'מפגשים הטיהור'; -$lang['randomly represented'] = 'נציג אקראי'; +$lang['private'] = 'פרטי'; +$lang['public'] = 'פומבי'; +$lang['Purge never used notification feeds'] = 'נקה פידים של התראות ללא שימוש'; +$lang['Purge sessions'] = 'נקה סשנים'; +$lang['randomly represented'] = 'צלמית אלבום אקראית'; $lang['registration date'] = 'תאריך רישום'; -$lang['clean'] = 'לנקות'; +$lang['clean'] = 'ניקוי'; $lang['Create this site'] = 'צור את האתר הזה'; -$lang['test'] = 'מבחן'; -$lang['test this remote site'] = 'מבחן זה באתר מרוחק'; -$lang['remove tags'] = 'להסיר את תגי'; -$lang['Repair and optimize database'] = 'תיקון מסד אופטימיזציה'; -$lang['selection'] = 'הבחירה'; -$lang['set to'] = 'מוגדר'; -$lang['singly represented'] = 'נציג קבוע'; +$lang['test'] = 'בדיקה'; +$lang['test this remote site'] = 'בדוק אתר מרוחק זה'; +$lang['remove tags'] = 'הסר תגיות'; +$lang['Repair and optimize database'] = 'תקן ובצע אופטימיזצית מסד נתונים'; +$lang['selection'] = 'בחירה'; +$lang['set to'] = 'שנה ל'; +$lang['singly represented'] = 'צלמית אלבום קבועה'; $lang['This site already exists'] = 'אתר זה כבר קיים'; -$lang['created'] = 'יצר'; -$lang['delete'] = 'למחוק'; -$lang['delete this site and all its attached elements'] = 'למחוק את האתר הזה ואת כל המידע בנושא'; +$lang['created'] = 'נוצר'; +$lang['delete'] = 'מחק'; +$lang['delete this site and all its attached elements'] = 'מחק אתר הזה ואת כל המידע הקשור אליו'; $lang['an error happened'] = 'אירעה שגיאה'; -$lang['Local'] = 'מקומית'; -$lang['Remote'] = 'מרחוק'; -$lang['update the database from files'] = 'לעדכן את מסד הנתונים עם קבצים'; +$lang['Local'] = 'מקומי'; +$lang['Remote'] = 'מרוחק'; +$lang['update the database from files'] = 'עדכן את מסד הנתונים עם קבצים'; $lang['status'] = 'מעמד'; -$lang['Directory'] = 'מדריך'; -$lang['sub-albums'] = 'קטגוריות משנה'; -$lang['Synchronize metadata'] = 'לסנכרן מטה'; -$lang['target'] = 'המטרה'; +$lang['Directory'] = 'ספריה'; +$lang['sub-albums'] = 'אלבומי משנה'; +$lang['Synchronize metadata'] = 'לסנכרן metadata'; +$lang['target'] = 'מטרה'; $lang['Title'] = 'כותרת'; -$lang['Album list management'] = 'ניהול קטגוריות'; -$lang['Piwigo configuration'] = 'תצורה Piwigo'; -$lang['Edit album'] = 'ערוך קטגוריה'; +$lang['Album list management'] = 'ניהול רשימת אלבומים'; +$lang['Piwigo configuration'] = 'תצורת Piwigo'; +$lang['Edit album'] = 'ערוך אלבום'; $lang['Group management'] = 'ניהול קבוצות'; $lang['User list'] = 'רשימת משתמשים'; -$lang['Database synchronization with files'] = 'מסד נתונים לסינכרון עם קבצים'; +$lang['Database synchronization with files'] = 'סינכרון מסד הנתונים עם קבצים'; $lang['all'] = 'כל'; -$lang['height must be a number superior to'] = 'גובה חייב להיות מספר גדול יותר'; -$lang['width must be a number superior to'] = 'רוחב חייב להיות מספר גדול יותר'; +$lang['height must be a number superior to'] = 'גובה חייב להיות מספר גבוה יותר מאשר'; +$lang['width must be a number superior to'] = 'רוחב חייב להיות מספר גבוה יותר מאשר'; $lang['for the file format'] = 'עבור פורמט קובץ'; -$lang['Photo unreachable or no support'] = 'תמונה בפורמט נגיש או נתמך'; -$lang['GD version'] = 'גרסת ה '; -$lang['General statistics'] = 'סטטיסטיקה'; -$lang['average time'] = 'הזמן הממוצע'; -$lang['total time'] = 'זמן מסך'; +$lang['Photo unreachable or no support'] = 'תמונה לא נגישה או בפורמט לא נתמך'; +$lang['GD version'] = 'גרסת GD '; +$lang['General statistics'] = 'סטטיסטיקה כללית'; +$lang['average time'] = 'זמן ממוצע'; +$lang['total time'] = 'זמן כולל'; $lang['for this file format'] = 'עבור פורמט קובץ זה'; $lang['unit mode'] = 'מצב יחיד'; -$lang['Unlocked'] = 'נעולים'; -$lang['unset'] = 'Unset'; -$lang['Update albums informations'] = 'עדכון פרטים הקטגוריות'; -$lang['Update photos information'] = 'עדכון פרטים תמונות'; +$lang['Unlocked'] = 'לא נעולים'; +$lang['unset'] = 'לא מופעל'; +$lang['Update albums informations'] = 'עדכן פרטי אלבומים'; +$lang['Update photos information'] = 'עדכון פרטי תמונות'; $lang['Synchronize'] = 'סנכרן'; -$lang['reduce to single existing albums'] = 'כדי לצמצם את הקטגוריות הקיימות יחיד'; +$lang['reduce to single existing albums'] = 'צמצם אלבומים קיימים לאחד'; $lang['Choose an option'] = 'בחר באפשרות'; -$lang['display maximum informations (added albums and photos, deleted albums and photos)'] = 'מקסימום מידע לתצוגה (קטגוריות הוסיף אלמנטים, קטגוריות שנמחקו אלמנטים)'; +$lang['display maximum informations (added albums and photos, deleted albums and photos)'] = 'הצג מידע מירבי (אלבומים ותמונות שהתווספו, אלבומים ותמונות שנמחקו)'; $lang['Error list'] = 'רשימת שגיאות'; -$lang['Errors caption'] = 'שגיאות אגדות'; -$lang['Detailed informations'] = 'ידיעות מפורט'; -$lang['File/directory read error'] = 'קובץ / ספרייה לקרוא שגיאה'; -$lang['The file or directory cannot be accessed (either it does not exist or the access is denied)'] = 'הקובץ או הספרייה לא ניתן לגשת (או שזה לא קיים או הגישה נדחתה)'; -$lang['albums deleted in the database'] = 'קטגוריות שנמחקו באתר'; -$lang['photos deleted from the database'] = 'אלמנטים שנמחקו באתר'; -$lang['photos candidates for metadata synchronization'] = 'תמונות המועמדים לסינכרון מטה'; -$lang['photos informations synchronized with files metadata'] = 'אלמנטים ידיעות מסונכרן עם metadata קבצים'; -$lang['errors during synchronization'] = 'טעויות במהלך הסנכרון'; -$lang['albums added in the database'] = 'הקטגוריות הוסיף באתר'; -$lang['photos added in the database'] = 'רכיבים נוספים באתר'; -$lang['photos updated in the database'] = 'אלמנטים עודכן באתר'; -$lang['Search for new images in the directories'] = 'מחפש תמונות חדשות של ספריות'; -$lang['added'] = 'מוסף'; +$lang['Errors caption'] = 'מקראי שגיאות'; +$lang['Detailed informations'] = 'מידע מפורט'; +$lang['File/directory read error'] = 'שגיאה בקריאת קובץ/ספריה'; +$lang['The file or directory cannot be accessed (either it does not exist or the access is denied)'] = 'לא ניתן לגשת לקובץ או לספריה (אינם קיימים או שהגישה נדחתה)'; +$lang['albums deleted in the database'] = 'אלבומים נמחקו ממסד הנתונים'; +$lang['photos deleted from the database'] = 'תמונות נמחקו ממסד הנתונים'; +$lang['photos candidates for metadata synchronization'] = 'תמונות המועמדות לסינכרון metadata'; +$lang['photos informations synchronized with files metadata'] = ' מידע תמונות מסונכרן עם metadata של קבצים'; +$lang['errors during synchronization'] = 'שגיאות במהלך הסנכרון'; +$lang['albums added in the database'] = 'אלבומים התווספו למסד הנתונים'; +$lang['photos added in the database'] = 'תמונות התווספו למסד הנתונים'; +$lang['photos updated in the database'] = 'תמונות עודכנו במסד הנתונים'; +$lang['Search for new images in the directories'] = 'חיפוש אחר תמונות חדשות בספריות'; +$lang['added'] = 'התווסף'; $lang['deleted'] = 'נמחק'; -$lang['Metadata synchronization results'] = 'Metadata תוצאות סינכרון'; -$lang['only perform a simulation (no change in database will be made)'] = 'רק לבצע סימולציה (דבר יהיה שונה במסד הנתונים)'; -$lang['Simulation'] = 'הדמיה'; -$lang['directories + files'] = 'תמונות + תקיות'; -$lang['only directories'] = 'תקיות בלבד'; -$lang['synchronize files structure with database'] = 'לסנכרן מבנה קבצים עם מסד נתונים'; -$lang['synchronize files metadata with database photos informations'] = 'לסנכרן אלמנטים מסד נתונים עם metadata קבצים'; -$lang['even already synchronized photos'] = 'אפילו פריטים שסונכרנו כבר'; +$lang['Metadata synchronization results'] = 'תוצאות סינכרון Metadata'; +$lang['only perform a simulation (no change in database will be made)'] = 'רק בצע סימולציה (דבר לא ישתנה במסד הנתונים)'; +$lang['Simulation'] = 'סימולציה'; +$lang['directories + files'] = 'קבצים + ספריות'; +$lang['only directories'] = 'ספריות בלבד'; +$lang['synchronize files structure with database'] = 'סנכרן מבנה קבצים עם מסד הנתונים'; +$lang['synchronize files metadata with database photos informations'] = 'סנכרן תמונות ממסד נתונים עם metadata קבצים'; +$lang['even already synchronized photos'] = 'אפילו תמונות שסונכרנו כבר'; $lang['Used metadata'] = 'Metadata בשימוש'; -$lang['The name of directories and files must be composed of letters, numbers, "-", "_" or "."'] = 'השם של תיקיות וקבצים חייב לכלול רק אותיות, מספרים, " - ", " _ "או " "'; +$lang['The name of directories and files must be composed of letters, numbers, "-", "_" or "."'] = 'השם של תיקיות וקבצים חייב לכלול רק אותיות, מספרים, "-", ״_" או ״.״'; $lang['wrong filename'] = 'שם קובץ שגוי'; -$lang['Upload'] = 'העלה'; -$lang['user "%s" added'] = 'המשתמש "%s" נוסף'; +$lang['Upload'] = 'טעינה'; +$lang['user "%s" added'] = 'המשתמש "%s" התווסף'; $lang['User status'] = 'מצב משתמש'; -$lang['user_status_admin'] = 'מחובר כמשתמש כמנהל'; -$lang['user_status_generic'] = 'מחובר כמשתמש כללי'; -$lang['user_status_guest'] = 'מחובר כמשתמש אורח'; -$lang['user_status_normal'] = 'מחובר כמשתמש רגיל'; -$lang['user_status_webmaster'] = 'מחובר כמשתמש מנהל האתר'; -$lang['Virtual album'] = 'הקטגוריה וירטואלית'; +$lang['user_status_admin'] = 'אדמין'; +$lang['user_status_generic'] = 'כללי'; +$lang['user_status_guest'] = 'אורח'; +$lang['user_status_normal'] = 'משתמש'; +$lang['user_status_webmaster'] = 'מנהל האתר'; +$lang['Virtual album'] = 'אלבום וירטואלי'; $lang['Waiting'] = 'בהמתנה'; -$lang['default'] = 'ברירת המחדל'; -$lang['Toggle \'default group\' property'] = "תייג 'קבוצת ברירת מחדל' ערך"; +$lang['default'] = 'ברירת מחדל'; +$lang['Toggle \'default group\' property'] = 'הפוך תכונת \'קבוצת ברירת מחדל׳'; $lang['Advanced features'] = 'תכונות מתקדמות'; -$lang['Overall'] = 'מבט'; +$lang['Overall'] = 'סקירה'; $lang['Year'] = 'שנה'; $lang['Month'] = 'חודש'; $lang['Day'] = 'יום'; $lang['Pages seen'] = 'דפים שניצפו'; $lang['Time'] = 'זמן'; -$lang['IP'] = 'אי פי'; +$lang['IP'] = 'IP'; $lang['Element'] = 'מרכיב'; -$lang['Section'] = 'סעיף'; -$lang['An information email was sent to group "%s"'] = 'דואר אלקטרוני נשלח לקבוצה "%s"'; -$lang['Send an information email to group members'] = 'שלח הודעת דואר אלקטרוני מידע על חברי הקבוצה'; -$lang['Group'] = 'הקבוצה'; -$lang['%s value is not correct file because exif are not supported'] = '%s התמונה לא הועלתה כיוון שהאתר לא תומך בפורמט תמונה זה'; +$lang['Section'] = 'קטע'; +$lang['An information email was sent to group "%s"'] = 'דואל מידע נשלח לקבוצה "%s"'; +$lang['Send an information email to group members'] = 'שלח מידעון דואר לחברי הקבוצה'; +$lang['Group'] = 'קבוצה'; +$lang['%s value is not correct file because exif are not supported'] = '%s value is incorrect because exif are not supported'; $lang['Hello,'] = 'שלום,'; $lang['See you soon.'] = 'נתראה בקרוב.'; -$lang['Discover album:'] = 'גלה את הקטגוריה:'; -$lang['Mail content'] = 'דואר תוכן'; -$lang['none'] = 'אף אחד'; -$lang['high'] = 'גבוהה'; -$lang['other'] = 'אחרים'; +$lang['Discover album:'] = 'גלה אלבום:'; +$lang['Mail content'] = 'תוכן דואר'; +$lang['none'] = 'כלום'; +$lang['high'] = 'גבוה'; +$lang['other'] = 'אחר'; $lang['Element type'] = 'סוג מרכיב'; $lang['Image id'] = 'מזהה תמונה'; $lang['Summary'] = 'סיכום'; -$lang['%d line filtered'] = '%d שורה מסומנת'; -$lang['%d lines filtered'] = '%d שורות מסומנות'; +$lang['%d line filtered'] = '%d שורה מסוננת'; +$lang['%d lines filtered'] = '%d שורות מסוננות'; $lang['%d guest'] = '%d אורח'; $lang['%d guests'] = '%d אורחים'; $lang['Hour'] = 'שעה'; -$lang['guest'] = 'האורח'; +$lang['guest'] = 'אורח'; $lang['default values'] = 'ערכי ברירת המחדל'; -$lang['Guest cannot be deleted'] = 'חוות דעת לא ניתן למחוק'; -$lang['Default user cannot be deleted'] = 'המשתמש ברירת מחדל ולא ניתן למחוק'; -$lang['Purge history detail'] = 'ההיסטוריה פרטים הטיהור'; -$lang['Purge history summary'] = 'ההיסטוריה סיכום הטיהור'; -$lang['Check integrity'] = 'בדיקת תקינות'; +$lang['Guest cannot be deleted'] = 'לא ניתן למחוק אורח'; +$lang['Default user cannot be deleted'] = 'לא ניתן למחוק את משתמש ברירת המחדל'; +$lang['Purge history detail'] = 'נקה פרטי הסטוריה'; +$lang['Purge history summary'] = 'נקה סיכום הסטוריה'; +$lang['Check integrity'] = 'בדיקת תקינות.'; $lang['Anomaly'] = 'אנומליה'; $lang['Correction'] = 'תיקון'; $lang['Automatic correction'] = 'תיקון אוטומטי'; -$lang['Impossible automatic correction'] = 'אוטומטיים impossibl תיקון'; -$lang['Correction applied with success'] = 'תיקון מיושם בהצלחה'; -$lang['Correction applied with error'] = 'תיקון להחיל עם שגיאה'; +$lang['Impossible automatic correction'] = 'תיקון אוטומטי בלתי אפשרי'; +$lang['Correction applied with success'] = 'תיקון הוחל בהצלחה'; +$lang['Correction applied with error'] = 'תיקון הוחל עם שגיאה'; $lang['%d anomaly has been detected.'] = '%d חריגה זוהתה.'; $lang['%d anomalies have been detected.'] = '%d חריגות זוהו.'; $lang['%d anomaly has been corrected.'] = '%d חריגה תוקנה.'; -$lang['%d anomalies have been detected corrected.'] = '%d חריגות תוקנו.'; -$lang['%d anomaly has not been corrected.'] = '%d תריגה לא תוקנה.'; +$lang['%d anomalies have been detected corrected.'] = '%d חריגות זוהו ותוקנו.'; +$lang['%d anomaly has not been corrected.'] = '%d חריגה לא תוקנה.'; $lang['%d anomalies have not been corrected.'] = '%d חריגות לא תוקנו.'; -$lang['[%s] Visit album %s'] = 'עבור אל "%s" או "%s" למידע'; +$lang['[%s] Visit album %s'] = '[%s] בקר אלבום %s'; $lang['the forum'] = 'הפורום'; -$lang['the wiki'] = 'המילון'; -$lang['Go to %s or %s for more informations'] = 'הערך "%s" חייב להיות מדוייק כיוון שלא ניתן להשתמש ב exif'; -$lang['%s must be to set to false in your local/config/config.inc.php file'] = '"%s" "חייב להיות מוגדר שווא בקובץ המקומי שלך / / config config.inc.php'; -$lang['Main "guest" user does not exist'] = 'המשתמש "אורח" לא קיים'; -$lang['Main "guest" user status is incorrect'] = 'הסטטוס של ה"אורח" לא נכון'; -$lang['Default user does not exist'] = 'המשתמש של ברירת המחדל אינה קיימת'; -$lang['Main "webmaster" user does not exist'] = 'המשתמש "מנהל האתר" לא קיים'; -$lang['Main "webmaster" user status is incorrect'] = 'המשתמש "מנהל האתר" לא נכון'; -$lang['User "%s" created with "%s" like password'] = 'המשתמש "%s" נוצר עם "%s" ואותה סיסמה'; +$lang['the wiki'] = 'הוויקי'; +$lang['Go to %s or %s for more informations'] = 'עבור אל %s או %s לעוד מידע'; +$lang['%s must be to set to false in your local/config/config.inc.php file'] = '%s must be set to false in your local/config/config.inc.php file'; +$lang['Main "guest" user does not exist'] = 'משתמש "אורח" הראשי לא קיים'; +$lang['Main "guest" user status is incorrect'] = 'הסטטוס של משתמש "אורח" הראשי לא נכון'; +$lang['Default user does not exist'] = 'משתמש ברירת המחדל לא קיים'; +$lang['Main "webmaster" user does not exist'] = 'משתמש "מנהל האתר" הראשי לא קיים'; +$lang['Main "webmaster" user status is incorrect'] = 'משתמש "מנהל האתר" הראשי לא נכון'; +$lang['User "%s" created with "%s" like password'] = 'משתמש "%s" נוצר עם "%s" כסיסמה'; $lang['Status of user "%s" updated'] = 'הסטטוס של המשתמש "%s" עודכן'; -$lang['add new photos to caddie'] = 'הוסף פריט חדש לסל'; -$lang['No display'] = 'לא להציג'; +$lang['add new photos to caddie'] = 'הוסף תמונות חדשות לסל'; +$lang['No display'] = 'ללא תצוגה'; $lang['Classic display'] = 'תצוגה קלאסית'; -$lang['Hoverbox display'] = 'להציג Hoverbox'; -$lang['Minimum privacy level'] = 'מינימום רמת הפרטיות'; -$lang['Privacy level'] = 'פרטיות ברמה'; +$lang['Hoverbox display'] = 'תצוגת Hoverbox'; +$lang['Minimum privacy level'] = 'רמת פרטיות מינימלית'; +$lang['Privacy level'] = 'רמת פרטיות'; $lang['Level 0'] = '---'; $lang['Level 1'] = 'אנשי קשר'; -$lang['Level 2'] = 'החברים'; +$lang['Level 2'] = 'חברים'; $lang['Level 4'] = 'משפחה'; -$lang['Level 8'] = 'מנהלים'; -$lang['Reinitialize check integrity'] = 'Reinitialize בדיקת תקינות'; -$lang['Check all'] = 'בדוק את כל'; -$lang['Uncheck all'] = 'בטל את כל'; +$lang['Level 8'] = 'אדמינים'; +$lang['Reinitialize check integrity'] = 'אתחל מחדש בדיקת תקינות'; +$lang['Check all'] = 'בדוק הכל'; +$lang['Uncheck all'] = 'בטל את כל הסימונים'; $lang['Check automatic corrections'] = 'בדוק תיקונים אוטומטיים'; -$lang['Apply selected corrections'] = 'תיקונים שנבחר החל'; -$lang['Ignore selected anomalies'] = 'התעלם אנומליות נבחר'; -$lang['Refresh'] = 'רענון'; -$lang['The anomaly will be ignored until next application version'] = 'האנומליה תתעלם עד לגרסה הבאה הבקשה'; +$lang['Apply selected corrections'] = 'החל תיקונים שנבחרו'; +$lang['Ignore selected anomalies'] = 'התעלם מאנומליות שנבחרו'; +$lang['Refresh'] = 'רענן'; +$lang['The anomaly will be ignored until next application version'] = 'נתעלם מהאנומליה עד לגרסה הבאה של היישום'; $lang["Correction the anomaly will cancel the fact that it's ignored"] = 'תיקן האנומליה לא יהיה עוד להתעלם ממנו'; -$lang['%d anomaly has been ignored.'] = '%d חריגה שהתעלמתה ממנה.'; -$lang['%d anomalies have been ignored.'] = '%d חריגות שהתעלמה מהן.'; -$lang['Plugins which need upgrade'] = 'תוספים שיש לעדכן'; +$lang['%d anomaly has been ignored.'] = '%d חריגה שהתעלמו ממנה.'; +$lang['%d anomalies have been ignored.'] = '%d חריגות שהתעלמו מהם.'; +$lang['Plugins which need upgrade'] = 'תוספים לשדרוג'; $lang['Plugin list'] = 'רשימת תוספים'; -$lang['Check for updates'] = 'בדוק עדכונים'; -$lang['Other plugins'] = 'תוספים נוספים זמינים'; -$lang['Last revisions'] = 'התיקונים האחרונים'; +$lang['Check for updates'] = 'חפש עדכונים'; +$lang['Other plugins'] = 'תוספים אחרים זמינים'; +$lang['Last revisions'] = 'גירסאות אחרונות'; $lang['Are you sure you want to delete this plugin?'] = 'האם אתה בטוח שאתה רוצה למחוק את התוסף הזה?'; $lang['Are you sure you want to install this plugin?'] = 'האם אתה בטוח שאתה רוצה להתקין את התוסף הזה?'; -$lang['Are you sure to install this upgrade? You must verify if this version does not need uninstallation.'] = 'האם אתה בטוח שאתה רוצה להתקין את השדרוג, עליך לוודא אם הגרסה הזאת לא צריך ההסרה לפני?.'; -$lang['Plugin has been successfully copied'] = 'תוסף הועתקה בהצלחה'; +$lang['Are you sure to install this upgrade? You must verify if this version does not need uninstallation.'] = 'האם אתה בטוח שאתה רוצה להתקין את השדרוג? עליך לוודא אם הגרסה הזאת לא צריכה הסרה לפני הפעולה.'; +$lang['Plugin has been successfully copied'] = 'התוסף הועתק בהצלחה'; $lang["Can't create temporary file."] = 'קובץ זמני אינו יכול להיווצר.'; $lang["Can't download archive."] = 'ארכיון לא ניתן להוריד.'; $lang["Can't read or extract archive."] = 'ארכיון לא ניתן לקרוא או חילוץ.'; -$lang['An error occured during extraction (%s).'] = 'אירעה שגיאה במהלך קבצים ("%s") החילוץ.'; -$lang['Please check "plugins" folder and sub-folders permissions (CHMOD).'] = 'בבקשה בדוק את ההרשאות לתיקיה "plugins" ולתת תיקיות שלה (CHMOD)'; +$lang['An error occured during extraction (%s).'] = 'אירעה שגיאה במהלך ייצוא קבצים ("%s").'; +$lang['Please check "plugins" folder and sub-folders permissions (CHMOD).'] = 'אנא בדוק את ההרשאות לתיקית "plugins" ולתת התיקיות שלה (CHMOD)'; $lang["Can't connect to server."] = 'החיבור לשרת בלתי אפשרי.'; -$lang['Purge compiled templates'] = 'הידור הטיהור תבניות'; +$lang['Purge compiled templates'] = 'נקה תבניות מקומפלות'; $lang['ACCESS_0'] = 'גישה חופשית'; -$lang['ACCESS_1'] = 'גישה לכל'; +$lang['ACCESS_1'] = 'גישה לכולם'; $lang['ACCESS_2'] = 'גישה למשתמשים רשומים'; -$lang['ACCESS_3'] = 'גישה למנהלים'; -$lang['ACCESS_4'] = 'גישה למנהל האתר'; +$lang['ACCESS_3'] = 'גישה לאדמינים'; +$lang['ACCESS_4'] = 'גישה למנהלי האתר'; $lang['ACCESS_5'] = 'אין גישה'; $lang['Support'] = 'תמיכה'; $lang['Documentation'] = 'תיעוד'; -$lang['A new version of Piwigo is available.'] = 'הגרסה החדשה של Piwigo זמין.'; -$lang['Piwigo Administration'] = 'המינהל Piwigo'; -$lang['Piwigo version'] = 'הגרסה Piwigo'; -$lang['You are running the latest version of Piwigo.'] = 'אתה מפעיל את הגירסה העדכנית Piwigo.'; +$lang['A new version of Piwigo is available.'] = 'גרסה חדשה של Piwigo זמינה.'; +$lang['Piwigo Administration'] = 'ניהול Piwigo'; +$lang['Piwigo version'] = 'גרסת Piwigo'; +$lang['You are running the latest version of Piwigo.'] = 'אתה מריץ את הגירסה העדכנית ביותר של Piwigo.'; $lang['The version of %s [%s] installed is not compatible with the version required [%s]'] = 'הגרסה של""%s" "["%s"] התקנת אינו תואם לגרסה הנדרש ["%s"]'; -$lang['You need to upgrade your system to take full advantage of the application else the application will not work correctly, or not at all'] = 'אתה צריך לשדרג את המערכת שלך כדי לנצל את מלוא היתרונות של הבקשה, אחרת הבקשה יכול לעבוד כראוי, או בכלל לא'; +$lang['You need to upgrade your system to take full advantage of the application else the application will not work correctly, or not at all'] = 'אתה צריך לשדרג את המערכת שלך כדי לנצל את מלוא היכולות של היישום, אחרת היישום יכול לעבוד לא כראוי, או בכלל לא'; $lang['Deleted on'] = 'נמחק על'; -$lang['Last hit'] = 'מכה אחרונה'; -$lang['GD library is missing'] = 'ספריית GD חסר'; +$lang['Last hit'] = 'פגיעה אחרונה'; +$lang['GD library is missing'] = 'ספריית GD חסרה'; $lang['Templates'] = 'תבניות'; $lang['Extend for templates'] = 'הרחב תבניות'; -$lang['Replacement of original templates by customized templates from template-extension subfolder'] = 'החלפת המקורי תבניות ידי אישית תבניות מ-תיקיית משנה סיומת התבנית'; -$lang['Replacers (customized templates)'] = 'ותחליפיו (אישית תבניות)'; -$lang['Original templates'] = 'מקורי תבניות'; -$lang['Optional URL keyword'] = 'מילת המפתח תכנית אופציונלית'; -$lang['Templates configuration has been recorded.'] = 'תצורה תבניות נרשמה.'; -$lang['All optimizations have been successfully completed.'] = 'אופטימיזציות כל הושלמו בהצלחה.'; -$lang['Optimizations have been completed with some errors.'] = 'אופטימיזציות הושלמו עם שגיאות כמה.'; -$lang['Modify information'] = 'שינוי פרטים'; +$lang['Replacement of original templates by customized templates from template-extension subfolder'] = 'החלפת תבניות מקוריות בתבניות מותאמות אישית מתת-תיקיית הרחבות התבניות'; +$lang['Replacers (customized templates)'] = 'תחליפים (תבניות מותאמות אישית)'; +$lang['Original templates'] = 'תבניות מקוריות'; +$lang['Optional URL keyword'] = 'מילת מפתח של URL אופציונלית'; +$lang['Templates configuration has been recorded.'] = 'תועדה תצורת התבניות.'; +$lang['All optimizations have been successfully completed.'] = 'כל האופטימיזציות הושלמו בהצלחה.'; +$lang['Optimizations have been completed with some errors.'] = 'האופטימיזציות הסתיימו עם מספר שגיאות.'; +$lang['Modify information'] = 'עדכן מידע'; $lang['nothing'] = 'שום דבר'; -$lang['overrides existing values with empty ones'] = 'מלא ערכים קיימים עם ערכים ריקים'; -$lang['Manage photo ranks'] = 'נהל את דירוג התמונות'; +$lang['overrides existing values with empty ones'] = 'דרוס ערכים קיימים עם ערכים ריקים'; +$lang['Manage photo ranks'] = 'סדר מיון תמונות'; $lang['Edit ranks'] = 'ערוך דירוג'; -$lang['No photo in this album'] = 'אין פריט בקטגוריה זו'; -$lang['Images manual order was saved'] = 'סדר התמונות נשמה'; +$lang['No photo in this album'] = 'אין תמונה באלבום זה'; +$lang['Images manual order was saved'] = 'סדר תמונות ידני נשמר'; $lang['ranks'] = 'דירוגים'; $lang['By rank'] = 'לפי דירוג'; $lang['Manual order'] = 'סדר ידני '; $lang['Drag to re-order'] = 'גרור כדי לסדר מחדש'; $lang['Quick Local Synchronization'] = 'סנכרון מקומי מהיר'; -$lang['No photo can be deleted'] = 'לא ניתן למחוק את התמונה'; -$lang['Delete selected photos'] = 'מחק רת בתמונות שנבחרו'; +$lang['No photo can be deleted'] = 'לא ניתן למחוק אף תמונה'; +$lang['Delete selected photos'] = 'מחק את התמונות שנבחרו'; $lang['%d photo was deleted'] = '%d תמונה נמחקה'; $lang['%d photos were deleted'] = '%d תמונות נמחקו'; $lang['Downloads'] = 'הורדות'; -$lang['Released on'] = 'יצא'; +$lang['Released on'] = 'שוחרר ב'; $lang['Number of downloads'] = 'מספר הורדות'; $lang['Piwigo Announcements Newsletter'] = 'עלון Piwigo'; $lang["Keep in touch with Piwigo project, subscribe to Piwigo Announcement Newsletter. You will receive emails when a new release is available (sometimes including a security bug fix, it's important to know and upgrade) and when major events happen to the project. Only a few emails a year."] = 'שמור על קשר עם פרויקט Piwigo, ההירשם לעלון של Piwigo. תישלח אליך הודעות דוא"ל כאשר מהדורה חדשה תיהיה זמינה (לפעמים כולל תיקון באג אבטחה, חשוב לדעת ולשדרג) וכאשר ישנם אירועים מרכזיים הפרויקט. רק כמה הודעות דוא"ל בשנה '; -$lang['Subscribe %s'] = 'הירשם "%s"'; -$lang['Subscribe %s to Piwigo Announcements Newsletter'] = 'הרשם""%s" "כדי Piwigo עלון הכרזות'; +$lang['Subscribe %s'] = 'הירשם %s'; +$lang['Subscribe %s to Piwigo Announcements Newsletter'] = 'הרשם %s למידעון הכרזות של Piwigo'; $lang['Purge search history'] = 'נקה את היסטורית החיפוש'; $lang['Hide'] = 'הסתר'; -$lang['Password is missing. Please enter the password.'] = 'סיסמה חסרה, נה להזין סיסמה..'; -$lang['Password confirmation is missing. Please confirm the chosen password.'] = 'אישור סיסמה חסר, נה להזיר אישור סיסמה..'; -$lang['Allow users to edit their own comments'] = 'אפשר למשתמשים לערוך הערות משלהם'; +$lang['Password is missing. Please enter the password.'] = 'סיסמא חסרה, נא להזין סיסמא.'; +$lang['Password confirmation is missing. Please confirm the chosen password.'] = 'אישור סיסמא חסר, נא לאשר את הסיסמא שנבחרה.'; +$lang['Allow users to edit their own comments'] = 'אפשר למשתמשים לערוך את ההערות שלהם'; $lang['Allow users to delete their own comments'] = 'אפשר למשתמשים למחוק את התגובות שלהם'; -$lang['Email administrators when a comment is modified'] = 'שלח מייל למנהלים כאשר תגובה שונתה'; -$lang['Email administrators when a comment is deleted'] = 'שלח מייל למנהלים כאשר תגובה נמחקה'; -$lang['Cannot delete the old permalink !'] = 'אל תמחק את הPermalink הישן'; -$lang['Hit'] = 'לחיצה'; +$lang['Email administrators when a comment is modified'] = 'שלח מייל לאדמינים כאשר תגובה שונתה'; +$lang['Email administrators when a comment is deleted'] = 'שלח מייל לאדמינים כאשר תגובה נמחקה'; +$lang['Cannot delete the old permalink !'] = 'לא ניתן למחוק את הקישור הקבוע הישן!'; +$lang['Hit'] = 'פגיעה'; $lang['Tools'] = 'כלים'; $lang['Photos'] = 'תמונות'; $lang['Themes'] = 'ערכות נושא'; $lang['Instructions to use Piwigo'] = 'הוראות שימוש Piwigo'; $lang['Installed Themes'] = 'ערכות נושא מותקנות'; -$lang['Add New Theme'] = 'הוסף נושא חדש'; -$lang['Forbid this theme to users'] = 'לאסור על הנושא הזה למשתמשים'; -$lang['Set as default theme for unregistered and new users'] = 'Set as הנושא ברירת המחדל עבור משתמשים רשומים ו החדש'; +$lang['Add New Theme'] = 'הוסף ערכת נושא חדשה'; +$lang['Forbid this theme to users'] = 'אסור על ערכת נושא זו למשתמשים'; +$lang['Set as default theme for unregistered and new users'] = 'הגדר כערכת נושא ברירת מחדל עבור משתמשים לא רשומים וחדשים'; $lang['unknown'] = 'לא ידוע'; -$lang['Upload Photos'] = 'העלאת תמונות'; -$lang['Drop into album'] = 'צניחה לתוך הקטגוריה'; -$lang['+ Add an upload box'] = '+ הוספת להעלות תיבת '; -$lang['Create the "%s" directory at the root of your Piwigo installation'] = 'יצירת"%s "ספרייה בשורש של ההתקנה שלך Piwigo '; -$lang['Give write access (chmod 777) to "%s" directory at the root of your Piwigo installation'] = 'תן הרשאות (chmod 777) ל"%s" בתקיית שורש איפה שההתקנה שלך נמצאת'; -$lang['existing album'] = 'הקטגוריה הקיימת'; -$lang['create a new album'] = 'ליצור קטגוריה חדשה '; -$lang['Album name'] = 'שם קטגוריה '; -$lang['Album "%s" has been added'] = 'הקטגוריה "%s" נוספה'; -$lang['Uploaded Photos'] = 'התמונות העלאה '; -$lang['%d photos uploaded'] = '%d תמונות הועלו'; +$lang['Upload Photos'] = 'טען תמונות'; +$lang['Drop into album'] = 'בחר אלבום'; +$lang['+ Add an upload box'] = '+ הוסף תיבת טעינה'; +$lang['Create the "%s" directory at the root of your Piwigo installation'] = 'צור ספריית ״%s״ בספריה הראשית של התקנת ה-Piwigo שלך'; +$lang['Give write access (chmod 777) to "%s" directory at the root of your Piwigo installation'] = 'תן הרשאות כתיבה (chmod 777) לספריית "%s" בראש התקנת Piwigo שלך'; +$lang['existing album'] = 'אלבום קיים'; +$lang['create a new album'] = 'צור אלבום חדש'; +$lang['Album name'] = 'שם אלבום '; +$lang['Album "%s" has been added'] = 'אלבום "%s" התווסף'; +$lang['Uploaded Photos'] = 'התמונות נטענו '; +$lang['%d photos uploaded'] = '%d תמונות נטענו'; $lang['Privacy level set to "%s"'] = 'רמת פרטיות מוגדרת ל "%s"'; -$lang['Album "%s" now contains %d photos'] = 'הקטגוריה "%s" מכילה כעט %d תמונות'; +$lang['Album "%s" now contains %d photos'] = 'אלבום "%s" מכיל כעת %d תמונות'; $lang['Manage this set of %d photos'] = 'נהל את קבוצת התמונות הזאת (%d תמונות)'; $lang['Select files'] = 'בחר קבצים'; $lang['Everybody'] = 'כולם'; -$lang['Who can see these photos?'] = 'מי יכול לראות את התמונות?'; -$lang['Who can see this photo?'] = 'מי יכול לראות את התמונה?'; +$lang['Who can see these photos?'] = 'מי יכול לראות את תמונות אלה?'; +$lang['Who can see this photo?'] = 'מי יכול לראות את התמונה הזו?'; $lang['Settings'] = 'הגדרות'; -$lang['Resize'] = 'גודל'; +$lang['Resize'] = 'שנה גודל'; $lang['Maximum width'] = 'רוחב מרבי'; $lang['pixels'] = 'פיקסלים'; $lang['Maximum height'] = 'גובה מרבי'; $lang['Image Quality'] = 'איכות תמונה'; -$lang['Thumbnail'] = 'תמונה'; +$lang['Thumbnail'] = 'צלמית'; $lang['Save Settings'] = 'שמור הגדרות'; $lang['Your configuration settings are saved'] = 'הגדרות התצורה שלך נשמרות '; -$lang['Active Themes'] = 'רקעים פעילים '; -$lang['Add write access to the "%s" directory'] = 'הוסף הרשאת כתיבה לתיקית "%s"'; -$lang['Administration Home'] = 'ממשק ניהול'; +$lang['Active Themes'] = 'ערכות נושא פעילות '; +$lang['Add write access to the "%s" directory'] = 'הוסף הרשאת כתיבה לתיקיית "%s"'; +$lang['Administration Home'] = 'ממשק ניהול אדמינים'; $lang['Change Admin Colors'] = 'שנה צבעים לתפריט הניהול'; -$lang['Delete this theme'] = 'מחק את הנושא הזה'; -$lang['Directory does not exist'] = 'הספרייה לא קיימת'; +$lang['Delete this theme'] = 'מחק את ערכת הנושא הזאת'; +$lang['Directory does not exist'] = 'הספריה לא קיימת'; $lang['Download,'] = 'הורדה,'; $lang['FTP + Synchronization'] = 'סנכרון + FTP'; $lang['Get Support on Piwigo Forum'] = 'קבל תמיכה בפורום Piwigo '; $lang['Help Me'] = 'עזור לי'; -$lang['Impossible to activate this theme, the parent theme is missing: %s'] = 'נושא זה לא יכול להיות מופעל, כפי הנושא הורה חסר:"%s" "'; -$lang['Impossible to delete this theme. Other themes depends on it: %s'] = 'נושא זה לא ניתן למחוק, כי נושאים אחרים תלוי בו:"%s" "'; -$lang['Inactive Themes'] = 'נושאים פעילים'; -$lang['Install on your computer,'] = 'להתקין במחשב שלך,'; -$lang['Make this theme available to users'] = 'הפוך את הנושא הזה לזמין למשתמשים'; +$lang['Impossible to activate this theme, the parent theme is missing: %s'] = 'לא ניתן להפעיל ערכת נושא זו מכיוון שערכת הנושא שמעליה חסרה: %s'; +$lang['Impossible to delete this theme. Other themes depends on it: %s'] = 'לא ניתן למחוק ערכת נושא זו כי ערכות נושא אחרות תלויות בה: %s'; +$lang['Inactive Themes'] = 'ערכות נושא לא פעילות'; +$lang['Install on your computer,'] = 'התקן במחשב שלך,'; +$lang['Make this theme available to users'] = 'הפוך את ערכת הנושא הזו לזמינה למשתמשים'; $lang['Page end'] = 'סוף עמוד '; -$lang['Piwigo Uploader'] = 'מעלה Piwigo'; +$lang['Piwigo Uploader'] = 'טוען Piwigo'; $lang['Operation in progress'] = 'הטיפול עיבוד.'; $lang['Please wait...'] = 'אנא המתן ...'; $lang['Read Piwigo Documentation'] = 'קרא את התיעוד של Piwigo'; $lang['Start pLoader and add your photos.'] = 'התחל להוסיף תמונות שלך.'; $lang['Switch to clear or dark colors for administration'] = 'מעבר צבעים בהיר או כהה עבור ממשק ניהול'; -$lang['Theme has been successfully installed'] = 'נושאים הותקן בהצלחה '; -$lang['Visit Gallery'] = 'לבקר בגלריה'; -$lang['Visit Piwigo project website'] = 'בקר באתר Piwigo פרוייקט'; +$lang['Theme has been successfully installed'] = 'ערכת הנושא הותקנה בהצלחה.'; +$lang['Visit Gallery'] = 'בקר בגלריה'; +$lang['Visit Piwigo project website'] = 'בקר באתר פרוייקט Piwigo'; $lang['pLoader stands for Piwigo Uploader. From your computer, pLoader prepares your photos and transfer them to your Piwigo photo gallery.'] = 'PLoader יטען Piwigo Uploader . מהמחשב שלך, pLoader יכין את התמונות שלך ןיעביר אותם אל גלרית ה Piwigo שלך'; $lang['Guest Settings'] = 'הגדרות אורחים'; $lang['Main Page'] = 'דף ראשי'; -$lang['Photo Page'] = 'מקור תמונה'; -$lang['Activate Navigation Bar'] = 'להפעיל את סרגל הניווט'; -$lang['Activate Navigation Thumbnails'] = 'הפעל ממוזערות ניווט'; -$lang['Activate icon "%s"'] = 'להפעיל את סמל"%s "'; +$lang['Photo Page'] = 'דף תמונה'; +$lang['Activate Navigation Bar'] = 'הפעל סרגל ניווט'; +$lang['Activate Navigation Thumbnails'] = 'הפעל צלמיות ניווט'; +$lang['Activate icon "%s"'] = 'הפעל סמליל ״%s״'; $lang['Photo Properties'] = 'מאפייני תמונה'; -$lang['Allow user customization'] = 'לאפשר התאמה אישית למשתמש'; +$lang['Allow user customization'] = 'אפשר התאמה אישית למשתמש'; $lang['Languages'] = 'שפות'; -$lang['Installed Languages'] = 'מהשפות המותקנות'; -$lang['Add New Language'] = 'הוספת שפה חדשה'; -$lang['Language has been successfully installed'] = 'שפה הותקן בהצלחה'; +$lang['Installed Languages'] = 'שפות מותקנות'; +$lang['Add New Language'] = 'הוסף שפה חדשה'; +$lang['Language has been successfully installed'] = 'שפה הותקנה בהצלחה'; $lang['Select:'] = 'בחר:'; -$lang['None'] = 'אף אחד'; -$lang['Invert'] = 'מרחב'; -$lang['Impossible to deactivate this theme, you need at least one theme.'] = 'אי אפשר לנטרל את הנושא הזה, אתה צריך לפחות נושא אחד.'; -$lang['Webmaster status is required.'] = 'מצב Webmaster נדרשת.'; -$lang['Bound Theme'] = 'נושאים Bound'; +$lang['None'] = 'כלום'; +$lang['Invert'] = 'היפוך'; +$lang['Impossible to deactivate this theme, you need at least one theme.'] = 'אי אפשר לכבות ערכת נושא זו, יש צורך לפחות בערכת נושא אחת.'; +$lang['Webmaster status is required.'] = 'נדרש סטטוס מנהל האתר.'; +$lang['Bound Theme'] = 'ערכת נושא Bound'; $lang['Allow rating'] = 'אפשר דירוג'; -$lang['Select at least one comment'] = 'בחר אחת לפחות להגיב'; +$lang['Select at least one comment'] = 'בחר לפחות תגובה אחת'; $lang['Active Plugins'] = 'תוספים פעילים'; -$lang['Inactive Plugins'] = 'תוספים פעילים'; +$lang['Inactive Plugins'] = 'תוספים לא פעילים'; $lang['Missing Plugins'] = 'תוספים חסרים'; -$lang['Uninstalled Plugins'] = 'תוספים הוסר'; -$lang['By %s'] = 'הועלה ע"י "%s"'; -$lang['Visit plugin site'] = 'בקר תוסף האתר'; -$lang['Active Languages'] = 'שפות פעילים'; +$lang['Uninstalled Plugins'] = 'תוספים הוסרו'; +$lang['By %s'] = 'על-ידי %s'; +$lang['Visit plugin site'] = 'בקר באתר התוסף'; +$lang['Active Languages'] = 'שפות פעילות'; $lang['Delete this language'] = 'מחק את השפה הזאת'; -$lang['Forbid this language to users'] = 'לאסור על השפה הזו למשתמשים'; -$lang['Impossible to deactivate this language, first set another language as default.'] = 'אי אפשר לבטל את השפה הזו, הראשון להגדיר שפה אחרת כברירת המחדל.'; -$lang['Impossible to deactivate this language, you need at least one language.'] = 'אי אפשר לבטל את השפה הזאת, אתה צריך לפחות שפה אחת.'; -$lang['Inactive Languages'] = 'שפות לא פעילה'; -$lang['Make this language available to users'] = 'הפוך את השפה הזו זמינה למשתמשים'; -$lang['Set as default language for unregistered and new users'] = 'הפוך שפת ברירת מחדל עבור משתמשים רשומים ו החדש'; -$lang['Add Photos'] = 'הוספת תמונות'; -$lang['The following tag was deleted'] = 'התווית הבאה נמחקה'; +$lang['Forbid this language to users'] = 'אסור על שפה זו למשתמשים'; +$lang['Impossible to deactivate this language, first set another language as default.'] = 'לא ניתן לכבות שפה זו, ראשית הגדר שפה אחרת כברירת המחדל.'; +$lang['Impossible to deactivate this language, you need at least one language.'] = 'לא ניתן לכבות שפה זו, יש צורך לפחות בשפה אחת.'; +$lang['Inactive Languages'] = 'שפות לא פעילות'; +$lang['Make this language available to users'] = 'הפוך את השפה הזו לזמינה למשתמשים'; +$lang['Set as default language for unregistered and new users'] = 'הגדר כשפת ברירת מחדל עבור משתמשים לא רשומים וחדשים'; +$lang['Add Photos'] = 'הוסף תמונות'; +$lang['The following tag was deleted'] = 'התגית הבאה נמחקה'; $lang['Miscellaneous'] = 'שונות'; -$lang['Virtual Links'] = 'קישורים וירטואלית'; +$lang['Virtual Links'] = 'קישורים וירטואלים'; $lang['There is no other language available.'] = 'אין שפה אחרת זמינה.'; $lang['There is no other plugin available.'] = 'אין שום תוספים אחרים זמינים.'; -$lang['There is no other theme available.'] = 'אין שום נושא אחר זמין.'; -$lang['Add another set of photos'] = 'הוספת קבוצה נוספת של אוהדים'; -$lang['Order of menubar items has been updated successfully.'] = 'סדר הפריטים Menubar עודכנו בהצלחה.'; -$lang['This theme was not designed to be directly activated'] = 'הנושא הזה לא נועד להיות מופעל באופן ישיר'; -$lang['Pending Comments'] = 'תגובות בהמתנה'; -$lang['In your php.ini file, the upload_max_filesize (%sB) is bigger than post_max_size (%sB), you should change this setting'] = 'בקובץ php.ini שלך, upload_max_filesize (SB%) הוא גדול יותר post_max_size (SB%), עליך לשנות הגדרה זו'; -$lang['Exif extension not available, admin should disable exif use'] = 'סיומת Exif לא נתמכת, פנה למנהל על מנת שיאשר שימוש בסיומת Exif'; +$lang['There is no other theme available.'] = 'אין שום ערכת נושא אחרת זמינה.'; +$lang['Add another set of photos'] = 'הוסף מקבץ אחר של תמונות'; +$lang['Order of menubar items has been updated successfully.'] = 'סדר פריטי שורת התפריטים עודכן בהצלחה.'; +$lang['This theme was not designed to be directly activated'] = 'ערכת נושא זו לא נועדה להיות מופעלת באופן ישיר'; +$lang['Pending Comments'] = 'תגובות ממתינות'; +$lang['In your php.ini file, the upload_max_filesize (%sB) is bigger than post_max_size (%sB), you should change this setting'] = 'In your php.ini file, the upload_max_filesize (%sB) is bigger than post_max_size (%sB), you should change this setting'; +$lang['Exif extension not available, admin should disable exif use'] = 'סיומת Exif לא קיימת, פנה לאדמין על מנת שיבטל שימוש בסיומת Exif'; $lang['The uploaded file exceeds the upload_max_filesize directive in php.ini: %sB'] = 'The uploaded file exceeds the upload_max_filesize directive in php.ini: "%s "B'; $lang['The uploaded files exceed the post_max_size directive in php.ini: %sB'] = 'The uploaded files exceed the post_max_size directive in php.ini: "%s "B'; -$lang['The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form'] = 'הקובץ שבועלה חורג מה MAX_FILE_SIZE האפשרי שצויין בקובץ html'; -$lang['The uploaded file was only partially uploaded'] = 'הקובץ הועלה חלקית'; -$lang['No file was uploaded'] = 'לא הועלה קובץ'; -$lang['Missing a temporary folder'] = 'חסר תיקיה זמנית'; -$lang['Failed to write file to disk'] = 'נכשל בכתיבת הקובץ בדיסק'; -$lang['File upload stopped by extension'] = 'העלאת קובץ נכשלה ובמשתמע'; -$lang['Unknown upload error'] = 'שגיאה בהעלאה לא ידועה'; +$lang['The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form'] = 'הקובץ שנטען חורג מה MAX_FILE_SIZE שצויין בטופס ה-html'; +$lang['The uploaded file was only partially uploaded'] = 'הקובץ נטען חלקית בלבד'; +$lang['No file was uploaded'] = 'לא נטען קובץ'; +$lang['Missing a temporary folder'] = 'חסרה תיקיה זמנית'; +$lang['Failed to write file to disk'] = 'נכשל בכתיבת הקובץ לדיסק'; +$lang['File upload stopped by extension'] = 'טעינת קובץ נעצרה בעקיפין'; +$lang['Unknown upload error'] = 'שגיאה לא ידועה בטעינה'; $lang['Error on file "%s" : %s'] = 'שגיאה בקובץ "%s" : %s'; -$lang['Menu Management'] = 'נהל תפריטים'; +$lang['Menu Management'] = 'תפריטים'; $lang['automatic order'] = 'סדר אוטומטי'; -$lang['manual order'] = 'סדר ידני'; -$lang['Albums automatically sorted'] = 'מיון אלבומים אוטומטי'; -$lang['Batch Manager'] = 'מנהל קבוצה'; -$lang['include child albums'] = 'כולל אלבום ילד'; -$lang['Selection'] = 'מבחר'; +$lang['manual order'] = 'סידור ידני'; +$lang['Albums automatically sorted'] = 'אלבומים מויינו אוטומטית'; +$lang['Batch Manager'] = 'מנהל אצווה'; +$lang['include child albums'] = 'כולל אלבומים ילדים'; +$lang['Selection'] = 'בחירה'; $lang['Action'] = 'פעולה'; -$lang['Set author'] = 'הגדר מחבר'; +$lang['Set author'] = 'הגדר יוצר'; $lang['Set title'] = 'הגדר כותרת'; $lang['Set creation date'] = 'הגדר תאריך יצירה'; $lang['Apply action'] = 'החל'; -$lang['on the %d selected photos'] = 'ב %d תמונות נבחרות'; +$lang['on the %d selected photos'] = 'על %d תמונות נבחרות'; $lang['%d of %d photos selected'] = '%d מ %d תמונות נבחרו'; $lang['No photo selected, %d photos in current set'] = 'לא נבחרו תמונות, %d תמונות בסט הנוכחי'; $lang['All %d photos are selected'] = 'כל %d התמונות נבחרו'; $lang['remove this filter'] = 'הסר מסנן זה'; $lang['Duplicates'] = 'כפילויות'; $lang['Add a filter'] = 'הוסף מסנן'; -$lang['Remove all filters'] = 'מחק את כל המסננים'; +$lang['Remove all filters'] = 'מחק את כל הסינונים'; $lang['Refresh photo set'] = 'רענן את סט התמונות'; $lang['The whole page'] = 'העמוד המלא'; $lang['The whole set'] = 'הסט המלא'; $lang['No photo in the current set.'] = 'אין תמונות בסט הנוכחי.'; -$lang['No photo selected, no action possible.'] = 'לא נבחרו תמונות, אין פעולות אפשריות.'; +$lang['No photo selected, no action possible.'] = 'אף תמונה לא נבחרה, אין פעולות אפשריות.'; $lang['Choose an action'] = 'בחר פעולה'; -$lang['remove author'] = 'הסר מחבר'; -$lang['Type here the author name'] = 'כתוב כאן את שם המחבר'; +$lang['remove author'] = 'הסר יוצר'; +$lang['Type here the author name'] = 'כתוב כאן את שם היוצר'; $lang['remove title'] = 'הסר כותרת'; $lang['Type here the title'] = 'כתוב כאן את הכותרת'; $lang['remove creation date'] = 'הסר את תאריך היצירה'; -$lang['Album photos associated to the following albums: %s'] = 'אלבום תמונות משוייך לאלבום הבא: %s'; -$lang['Delete orphan tags'] = 'מחק תגים יתומים'; +$lang['Album photos associated to the following albums: %s'] = 'תמונות האלבום משוייכות לאלבומים הבאים: %s'; +$lang['Delete orphan tags'] = 'מחק תגיות יתומות'; $lang['delete photo'] = 'מחק תמונה'; $lang['new'] = 'חדש'; $lang['No results'] = 'אין תוצאות'; -$lang['Orphan tags deleted'] = 'תגים יתומים נמחקו'; -$lang['Remove from caddie'] = 'הוסר מהנושא'; +$lang['Orphan tags deleted'] = 'תגיות יתומות נמחקו'; +$lang['Remove from caddie'] = 'הסר מהסל'; $lang['Searching...'] = 'מחפש...'; $lang['Type in a search term'] = 'הקלד את ערך החיפוש'; -$lang['Week starts on'] = 'שבוע מתחיל'; -$lang['You have %d orphan tags: %s.'] = 'יש לך %d תגים יתומים: %s.'; +$lang['Week starts on'] = 'שבוע מתחיל ביום'; +$lang['You have %d orphan tags: %s.'] = 'יש לך %d תגיות יתומות: %s.'; $lang['Themes which need upgrade'] = 'ערכות נושא שצריכות שידרוג'; -$lang['Languages which need upgrade'] = 'שפות שצריכות שידרוג'; -$lang['All themes are up to date.'] = 'כל ערכות הנושא מעודכנות'; +$lang['Languages which need upgrade'] = 'שפות הזקוקות לשידרוג'; +$lang['All themes are up to date.'] = 'כל ערכות הנושא מעודכנות.'; $lang['All plugins are up to date.'] = 'כל התוספים מעודכנים.'; $lang['All languages are up to date.'] = 'כל השפות מעודכנות.'; $lang['Visit theme site'] = 'בקר באתר ערכת הנושא'; $lang['Visit language site'] = 'בקר באתר השפה'; $lang['New Version'] = 'גרסה חדשה'; -$lang['Obsolete Plugins'] = 'תוסף מיושן'; -$lang['WARNING! This plugin does not seem to be compatible with this version of Piwigo.'] = 'אזהרה! נראה כי תוסף זה לא מתאים ל Piwigo.'; +$lang['Obsolete Plugins'] = 'תוספים מיושנים'; +$lang['WARNING! This plugin does not seem to be compatible with this version of Piwigo.'] = 'אזהרה! נראה כי תוסף זה לא מתאים לגירסא זו של Piwigo.'; $lang['Do you want to activate anyway?'] = 'אתה רוצה להפעיל בכל מיקרה?'; $lang['THIS PLUGIN IS NOW PART OF PIWIGO CORE! DELETE IT NOW.'] = 'תוסף זה הוא לא חלק מליבת PIWIGO ! הסר אותו מייד!'; -$lang['ERROR: THIS PLUGIN IS MISSING BUT IT IS INSTALLED! UNINSTALL IT NOW.'] = 'שגיאה: תוסף זה נראה חסר אבל מותקן! הסר אותו מייד.'; +$lang['ERROR: THIS PLUGIN IS MISSING BUT IT IS INSTALLED! UNINSTALL IT NOW.'] = '*שגיאה*: תוסף זה נראה חסר אבל מותקן! הסר אותו מייד.'; $lang['display'] = 'הצג'; $lang['You can update to Piwigo %s directly, without upgrading to Piwigo %s (recommended).'] = 'אתה יכול לעדכן ל Piwigo %s ישירות, מבלי לשדרג ל Piwigo %s (מומלץ).'; -$lang['Save Template Directory'] = 'שמור בספרייה תבנית'; -$lang['Dump Database'] = 'זרוק מסד נתונים'; -$lang['Include history data (Warning: server memory limit may be exceeded)'] = 'כלול נתוני היסטוריה אזהרה:עלולה להיות חריגת זיכרון השרת'; -$lang['Unable to dump database.'] = 'אין אפשרות לזרות מסד נתונים.'; -$lang['Some upgrades are available for extensions.'] = 'כמה שידרוגים זמינים להרחבות.'; +$lang['Save Template Directory'] = 'שמור ספריית תבנית'; +$lang['Dump Database'] = 'השלך מסד נתונים'; +$lang['Include history data (Warning: server memory limit may be exceeded)'] = 'כלול נתוני היסטוריה (אזהרה: עלולה להיות חריגה ממגבלת זיכרון השרת)'; +$lang['Unable to dump database.'] = 'אין אפשרות לזרוק מסד נתונים.'; +$lang['Some upgrades are available for extensions.'] = 'מספר שידרוגים זמינים להרחבות.'; $lang['Ignore All'] = 'התעלם מהכל'; -$lang['Crop'] = 'להניב'; +$lang['Crop'] = 'חיתוך'; $lang['Width'] = 'רוחב'; $lang['Height'] = 'גובה'; -$lang['Follow Orientation'] = 'עקוב אחר ההדרכה'; +$lang['Follow Orientation'] = 'עקוב אחר האוריינטציה'; $lang['Graphics Library'] = 'ספריית גרפיקה'; -$lang['Activate icon "new" next to albums and pictures'] = 'הפעל כפתו "חדש" ליד אלבומים'; -$lang['Deactivate all'] = 'בטל פעולה להכל'; -$lang['Default photos order'] = 'סדר ברירת מחדל לתמונות'; +$lang['Activate icon "new" next to albums and pictures'] = ' הפעל סמליל "חדש" ליד אלבומים ותמונות'; +$lang['Deactivate all'] = 'כבה הכל'; +$lang['Default photos order'] = 'ברירת מחדל של סדר התמונות'; $lang['Restore'] = 'שחזר'; -$lang['Restore default configuration. You will lose your plugin settings!'] = 'שחזר להגדרות ברירת מחדל. הגדרות ההתקן יאבדו!'; -$lang['Show menubar'] = 'הצג תפריט'; -$lang['Thumbnails generation in progress...'] = 'חידוש תמונות ממוזערות בתהליך...'; -$lang['Photos generation in progress...'] = 'חידוש תמונות בתהליך...'; -$lang['%s photos have been regenerated'] = '%s תמונות חודשו'; -$lang['%s photos can not be regenerated'] = '%s תמונות לא יכלו להתחדש'; +$lang['Restore default configuration. You will lose your plugin settings!'] = 'שחזר הגדרות ברירת מחדל. הגדרות התוסף יאבדו!'; +$lang['Show menubar'] = 'הצג שורת תפריט'; +$lang['Thumbnails generation in progress...'] = 'יצירת צלמיות בתהליך...'; +$lang['Photos generation in progress...'] = 'ייצור תמונות בתהליך...'; +$lang['%s photos have been regenerated'] = '%s תמונות נוצרו מחדש'; +$lang['%s photos can not be regenerated'] = '%s תמונות לא יכלו להיווצר מחדש'; $lang['Updates'] = 'עדכונים'; -$lang['Update in progress... Please wait.'] = 'עדכון בתהליך... המתן.'; +$lang['Update in progress... Please wait.'] = 'עדכון בתהליך... אנא המתן.'; $lang['Ignore this update'] = 'התעלם מעידכון זה'; $lang['Reset ignored updates'] = 'אפס התעלמות מעידכונים'; $lang['Update All'] = 'עדכן הכל'; -$lang['ERROR'] = 'שגיאה'; +$lang['ERROR'] = '*שגיאה*'; $lang['Update Complete'] = 'עידכון הושלם'; -$lang['Piwigo Update'] = 'Piwigo עדכון'; -$lang['Extensions Update'] = 'עדכון הרחבה'; +$lang['Piwigo Update'] = 'עדכון Piwigo'; +$lang['Extensions Update'] = 'עדכון נרחבות'; $lang['All extensions are up to date.'] = 'כל ההרחבות מעודכנות.'; -$lang['Following plugins may not be compatible with the new version of Piwigo:'] = 'יכול להיות שההתקן לא תואם לגירסה החדשה של Piwigo:'; -$lang['Following themes may not be compatible with the new version of Piwigo:'] = 'יכול להיות שהערכת הנושא לא תואמת לגירסה החדשה של Piwigo:'; -$lang['I decide to update anyway'] = 'החלתי לעדכן בכל מיקרה'; +$lang['Following plugins may not be compatible with the new version of Piwigo:'] = 'ההתקנים הבאים כנראה לא תואמים לגירסה החדשה של Piwigo:'; +$lang['Following themes may not be compatible with the new version of Piwigo:'] = 'ערכות הנושא כנראה לא תואמות לגירסה החדשה של Piwigo:'; +$lang['I decide to update anyway'] = 'אני מחליט לעדכן בכל מיקרה'; $lang['Update to Piwigo %s'] = 'עדכן ל Piwigo %s'; $lang['Two updates are available'] = 'שני עידכונים זמינים'; -$lang['This is a minor update, with only bug corrections.'] = 'זהו עידכון שולי, תיקון באגים שנמצאו.'; -$lang['This is a major update, with new exciting features.'] = 'עדכון חשוב, עם מאפיינים חדשים ומלהיבים.'; -$lang['Some themes and plugins may be not available yet.'] = 'יכול להיות שחלק מההתקנים וערכות הנושא לא זמינים עדיין .'; +$lang['This is a minor update, with only bug corrections.'] = 'זהו עידכון שולי, רק עם תיקוני באגים.'; +$lang['This is a major update, with new exciting features.'] = 'זה עדכון משמעותי, עם מאפיינים חדשים ומלהיבים.'; +$lang['Some themes and plugins may be not available yet.'] = 'יכול להיות שחלק מהתוספים וערכות הנושא לא זמינים עדיין.'; $lang['Learn more'] = 'למד עוד'; -$lang['Rate'] = "דרג"; +$lang['Rate'] = 'דירוג'; $lang['Average rate'] = "דירוג ממוצע"; -$lang['(this tag will be deleted)'] = ')התג הזה ימחק('; +$lang['(this tag will be deleted)'] = '(התגית הזאת תמחק)'; $lang['... or '] = 'או ...'; $lang['Add a criteria'] = 'הוסף קריטריון'; $lang['Allowed file types: %s.'] = 'סוגי קבצים מותרים:%s'; -$lang['Approximate maximum resolution: %dM pixels (that\'s %dx%d pixels).'] = 'רזולוציה מקסימלית: %dM פקסלים(שזה %dx%d פקסלים).'; +$lang['Approximate maximum resolution: %dM pixels (that\'s %dx%d pixels).'] = 'רזולוציה מקסימלית: %dM פיקסלים(שזה %dx%d פיקסלים).'; $lang['By default, Piwigo will create a new websize from the HD (high definition) version of your photo.'] = 'כברירת מחדל, Piwigo יצור גודל חדש לתמונות ה HD שלך.'; -$lang['Confirm merge'] = 'אשר איחוד'; +$lang['Confirm merge'] = 'אשר מיזוג'; $lang['Create'] = 'צור'; $lang['hide details'] = 'הסתר פרטים'; -$lang['Manage Permissions'] = 'ניהול הרשאות'; +$lang['Manage Permissions'] = 'נהל הרשאות'; $lang['Maximum file size: %sB.'] = 'גודל קובץ מקסימאלי: %sB.'; -$lang['Merge selected tags'] = 'אחד תגים מסומנים'; -$lang['Merge tags'] = 'איחוד תגים'; -$lang['No destination tag selected'] = 'לא ניבחרו תגי יעד'; -$lang['Photo %s of %s'] = 'תמונה %s מ %s'; +$lang['Merge selected tags'] = 'מזג את התגיות שנבחרו'; +$lang['Merge tags'] = 'מיזוג תגיות'; +$lang['No destination tag selected'] = 'לא ניבחרה תגית יעד'; +$lang['Photo %s of %s'] = 'תמונה %s מתוך %s'; $lang['Select an album'] = 'בחר אלבום'; -$lang['Select at least two tags for merging'] = 'בחר לפחות שני תגים לאיחוד'; -$lang['Select the destination tag'] = 'בחר תגים ביעד'; +$lang['Select at least two tags for merging'] = 'בחר לפחות שתי תגיות למיזוג'; +$lang['Select the destination tag'] = 'בחר את תגית היעד'; $lang['show details'] = 'הצג פרטים'; -$lang['Start Upload'] = 'התחל העלאה'; -$lang['Tags %s merged into tag %s'] = 'התג %s אוחד כעם תג %s'; -$lang['You are using the Browser uploader. Try the Flash uploader instead.'] = 'אתה משתמש בהעלאה מהדפדפן. נסה העלאת פלאש במקום.'; -$lang['You are using the Flash uploader. Problems? Try the Browser uploader instead.'] = 'אתה משתמש בהעלאת פלאש. ישנה בעיה? נסה העלאה מהדפדפן במקום.'; +$lang['Start Upload'] = 'התחל טעינה'; +$lang['Tags %s merged into tag %s'] = 'התגיות %s מוזגו לתוך תגית %s'; +$lang['You are using the Browser uploader. Try the Flash uploader instead.'] = 'אתה משתמש בטעינה מהדפדפן. נסה טעינת פלאש במקום.'; +$lang['You are using the Flash uploader. Problems? Try the Browser uploader instead.'] = 'אתה משתמש בטעינת פלאש. ישנה בעיה? נסה טעינה מהדפדפן במקום.'; $lang['You can\'t define a default photo order because you have a custom setting in your local configuration.'] = 'אין באפשרותך לקבוע סדר תמונות ברירת מחדל מכיוון שאתה משתמש בהגדרות מותאמות אישית'; $lang['Add to caddie'] = 'הוסף לסל'; -$lang['Permalink'] = 'קישורית'; +$lang['Permalink'] = 'קישור קבוע'; $lang[' and %d virtuals'] = 'ו %d וירטואלים'; $lang['%d day'] = '%d יום'; -$lang['%d days'] = '%d ימיםחודשים'; +$lang['%d days'] = '%d ימים'; $lang['%d hour'] = '%d שעה'; $lang['%d hours'] = '%d שעות'; $lang['%d minute'] = '%d דקה'; @@ -795,191 +795,194 @@ $lang['%d week'] = '%d שבוע'; $lang['%d weeks'] = '%d שבועות'; $lang['%d year'] = '%d שנה'; $lang['%d years'] = '%d שנים'; -$lang['%s has been successfully updated.'] = '%s הועלובהצלחה'; +$lang['%s has been successfully updated.'] = '%s עודכנו בהצלחה.'; $lang['%s in the future'] = '%s בעתיד'; -$lang['A locked gallery is only visible to administrators'] = 'גלריות נעולות זמינות רק למנהלים'; -$lang['Activate comments'] = 'הפעל תגובה'; -$lang['Add tags'] = 'הוסף תיוג'; -$lang['Added by %s'] = 'הוסף על ידי %s'; -$lang['An error has occured during extract. Please check files permissions of your piwigo installation.
    Click here to show log error.'] = 'ארעה שגיאה במהלך היצוא. בדוק את הרשאות קבצי התקנת piwigo.
    לחץ כאן לראות את יומן השגיאות.'; -$lang['An error has occured during upgrade.'] = 'ארעה שגיאה במהלך העלאה'; +$lang['A locked gallery is only visible to administrators'] = 'גלריה נעולה נראית רק על ידי האדמינים'; +$lang['Activate comments'] = 'הפעל תגובות'; +$lang['Add tags'] = 'הוסף תגיות'; +$lang['Added by %s'] = 'התווסף על-ידי %s'; +$lang['An error has occured during extract. Please check files permissions of your piwigo installation.
    Click here to show log error.'] = 'ארעה שגיאה במהלך הייצוא. בדוק את הרשאות קבצי התקנת piwigo.
    לחץ כאן לראות את לוג השגיאות.'; +$lang['An error has occured during upgrade.'] = 'ארעה שגיאה במהלך שידרוג.'; $lang['Aperture is a powerful tool to refine images and manage massive libraries on Mac.'] = 'Aperture הוא כלי רב עוצמה לחדד תמונות ולנהל סיפריות ענק ב-mac'; $lang['Aperture is designed for professional photographers with iPhoto simplicity.'] = 'Aperture עוצב עבור גרפיקאים מקצועיים עם הפשטות של iphoto'; -$lang['Applications'] = 'אפליקציות'; -$lang['Apply watermark if height is bigger than'] = 'החל חותמת מים(watermark) אם הגובה גדול מ'; -$lang['Apply watermark if width is bigger than'] = 'החל חותמת מים(watermark) אם הרוחב גדול מ'; -$lang['Automatic sort order'] = 'סדר אוטומטי'; -$lang['Available on'] = 'זמין ב'; -$lang['Available versions for'] = 'גרסאות זמינות ל'; -$lang['%d physicals'] = ' %d פיזית'; +$lang['Applications'] = 'יישומים'; +$lang['Apply watermark if height is bigger than'] = 'הוסף חותמת מים(watermark) אם הגובה גדול מ'; +$lang['Apply watermark if width is bigger than'] = 'הוסף חותמת מים(watermark) אם הרוחב גדול מ'; +$lang['Automatic sort order'] = 'מיון אוטומטי'; +$lang['Available on'] = 'זמין על'; +$lang['Available versions for'] = 'גרסאות זמינות עבור'; +$lang['%d physicals'] = '%d פיזי'; $lang['Piwigo for Android'] = 'piwigo לאנדרואיד'; $lang['Piwigo for iOS (iPhone, iPad, iPod Touch)'] = 'piwigo לios (איפון, איפד, איפוד ואיפוד טאצ)'; $lang['Posted %s on %s'] = 'פורסם %s ב %s'; -$lang['Resize after upload'] = 'שנה גודל אחרי העלאה'; +$lang['Resize after upload'] = 'שנה גודל אחרי טעינה'; $lang['Save manual order'] = 'שמור סדר ידני'; -$lang['Save visits in history for'] = 'שמור מבקרים בהיסטוריה ל'; +$lang['Save visits in history for'] = 'שמור ביקורים בהיסטוריה עבור'; $lang['Select a file'] = 'בחר קובץ'; -$lang['Select a zone with your mouse to define a new center of interest.'] = 'בחר איזור עם העכבר כדי להגדיר את מרכז העניין בתמונה'; +$lang['Select a zone with your mouse to define a new center of interest.'] = 'בחר איזור עם העכבר כדי להגדיר מוקד עניין חדש.'; $lang['Select groups...'] = 'בחר קבוצות...'; $lang['Select users...'] = 'בחר משתמשים...'; -$lang['Send connection settings by email'] = 'שלח פרטי התחברות באימייל'; -$lang['Source tag'] = 'מקור תג'; +$lang['Send connection settings by email'] = 'שלח פרטי התחברות בדואר'; +$lang['Source tag'] = 'תגית מקור'; $lang['There is no group in this gallery.'] = 'אין קבוצות בגלריה הזו'; $lang['This album contains %d photos, added between %s and %s.'] = 'האלבום הזה מכיל %s תמונות, שנוספו בין ה %s ל %s'; $lang['This album contains %d photos, added on %s.'] = 'האלבום הזה מכיל %s תמונות, נוספו ב %s'; -$lang['This album contains no photo.'] = 'האלבום הזה לא מכיל תמונות'; -$lang['Unlock gallery'] = 'גלריה פתוחה'; -$lang['Visited %d times'] = 'בוקר %d פעמים'; +$lang['This album contains no photo.'] = 'האלבום הזה לא מכיל תמונות.'; +$lang['Unlock gallery'] = 'בטל נעילת גלריה'; +$lang['Visited %d times'] = 'ביקרו בו %d פעמים'; $lang['Watermark'] = 'סימן מים'; $lang['With no album'] = 'ללא אלבום'; -$lang['middle'] = 'באמצע'; -$lang['modified'] = 'שינוי'; +$lang['middle'] = 'אמצעי'; +$lang['modified'] = 'עודכן'; $lang['registered users'] = 'משתמשים רשומים'; -$lang['top left corner'] = 'בפינה השמאלית העליונה'; -$lang['top right corner'] = 'בפינה הימנית העליונה'; -$lang['visitors need to login and have the appropriate permissions to see this album'] = 'מבקרים צריכים להתחבר ולהיות בעלי הרשאות מסויימות כדי לראות את האלבום הזה'; -$lang['With no tag'] = 'ללא תגים'; +$lang['top left corner'] = 'פינה שמאלית עליונה'; +$lang['top right corner'] = 'פינה ימנית עליונה'; +$lang['visitors need to login and have the appropriate permissions to see this album'] = 'מבקרים צריכים להתחבר ולהיות בעלי הרשאות מתאימות כדי לראות את האלבום הזה'; +$lang['With no tag'] = 'ללא תגית'; $lang['With no virtual album'] = 'ללא אלבום ורטואלי'; -$lang['X Position'] = 'x מיקום'; -$lang['X Repeat'] = 'x חזרות'; -$lang['Y Position'] = 'y מיקום'; +$lang['X Position'] = 'X מיקום'; +$lang['X Repeat'] = 'X חזרות'; +$lang['Y Position'] = 'Y מיקום'; $lang['Zoom'] = 'זום'; -$lang['add a new watermark'] = 'הוסף קו מים חדש'; -$lang['administrators'] = 'מנהל ראשי'; -$lang['any visitor can see this album'] = 'כל מבקר יכול לראות את אלבום זה'; -$lang['apply automatic sort order'] = 'החל סדר אוטומטי'; -$lang['bottom left corner'] = 'בפינה השמאלית התחתונה'; -$lang['bottom right corner'] = 'בפינה הימנית התחתונה'; -$lang['cancel manual order'] = 'ביטול סדר ידני'; +$lang['add a new watermark'] = 'הוסף סימן מים חדש'; +$lang['administrators'] = 'אדמינים'; +$lang['any visitor can see this album'] = 'כל מבקר יכול לראות את האלבום הזה'; +$lang['apply automatic sort order'] = 'החל סדר מיון אוטומטי'; +$lang['bottom left corner'] = 'פינה שמאלית תחתונה'; +$lang['bottom right corner'] = 'פינה ימנית תחתונה'; +$lang['cancel manual order'] = 'בטל סידור ידני'; $lang['create a new site'] = 'צור אתר חדש'; $lang['custom'] = 'מותאם אישית'; $lang['Photo name'] = 'שם התמונה'; -$lang['Move to album'] = 'העבר לאלבום'; +$lang['Move to album'] = 'הזז לאלבום'; $lang['Multiple Size'] = 'מספר גדלים'; -$lang['Name of the duplicate'] = 'שם של שכפול'; +$lang['Name of the duplicate'] = 'שם של השכפול'; $lang['No group is permitted to see this private album'] = 'לאף קבוצה אין הרשאה לראות את האלבום הפרטי הזה'; $lang['Original Size'] = 'גודל מקורי'; $lang['Cancel'] = 'ביטול'; -$lang['Center of interest'] = 'מרכז העניין'; -$lang['Default comments order'] = 'סדר תגובות ברירת מחדל'; -$lang['Duplicate selected tags'] = 'שכפל תגים מסומנים'; +$lang['Center of interest'] = 'מוקד העניין'; +$lang['Default comments order'] = 'ברירת מחדל של סדר התגובות'; +$lang['Duplicate selected tags'] = 'שכפל תגיות מסומנות'; $lang['Edit photo'] = 'ערוך תמונה'; -$lang['Gallery unlocked'] = 'גלריה פתוחה'; +$lang['Gallery unlocked'] = 'גלריה ללא נעילה'; $lang['Groups and users'] = 'קבוצות ומשתמשים'; -$lang['Last import'] = 'יבוא אחרון'; +$lang['Last import'] = 'ייבוא אחרון'; $lang['List'] = 'רשימה'; -$lang['%s ago'] = '%s לפני'; -$lang['%u users have automatic permission because they belong to a granted group.'] = '%u משתמשים יש הרשאות אוטומטית בגלל שהם שייכים לקבוצה מאושרת'; -$lang['digiKam is designed for photographers who want to view, manage, edit, enhance, organize, tag, and share photographs.'] = ' -digiKam מיועד לצלמים שרוצים להציג, לנהל, לערוך, לשפר, לארגן, לתייג, ולשתף תצלומים.'; +$lang['%s ago'] = 'לפני %s'; +$lang['%u users have automatic permission because they belong to a granted group.'] = '%u משתמשים יש הרשאה אוטומטית בגלל שהם שייכים לקבוצה מאושרת.'; +$lang['digiKam is designed for photographers who want to view, manage, edit, enhance, organize, tag, and share photographs.'] = 'digiKam מיועד לצלמים שרוצים להציג, לנהל, לערוך, לשפר, לארגן, לתייג, ולשתף תצלומים.'; $lang['iPhoto is the default photo manager on MacOSX. The Piwigo export plugin let you create new albums and export your photos directly from iPhoto to your Piwigo photo gallery.'] = 'iPhoto הוא מנהל התמונת הברירת המחדל בMacOSX.תוסף יצוא Piwigo מאפשר לך ליצור אלבומים חדשים ולייצא את תמונות ישירות מ-iPhoto לגלריית תמונות Piwigo.'; $lang['digiKam is an advanced digital photo management free software for Linux, Windows, and MacOSX.'] = 'digiKam היא תוכנה מתקדמת לניהול תמונות דיגיטלית חופשיה עבור לינוקס, Windows ו MacOSX.'; -$lang['To export your photos from digiKam to Piwigo, simply install digiKam and the Kipi-plugins.'] = ' -כדי לייצא את התמונות שלך מ-digiKam ל-Piwigo, פשוט התקן digiKam ו-kipi-plugins'; -$lang['Web Form'] = 'טופס אינטרנט'; +$lang['To export your photos from digiKam to Piwigo, simply install digiKam and the Kipi-plugins.'] = 'כדי לייצא את התמונות שלך מ-digiKam ל-Piwigo, פשוט התקן digiKam ו-kipi-plugins'; +$lang['Web Form'] = 'טופס רשת'; $lang['Piwigo Publish plugin for Lightroom'] = 'תוסף פירסום Piwigo עבור Lightroom'; $lang['Piwigo export plugin for Aperture'] = 'תוסף יצוא Piwigo עבור Aperture'; $lang['Piwigo export plugin for iPhoto'] = 'תוסף יצוא Piwigo עבור iPhoto'; $lang['Piwigo publish plugin for Shotwell'] = 'תוסף פירסום Piwigo עבור Shotwell'; $lang['Piwigo publish plugin for digiKam'] = 'תוסף פירסום Piwigo עבור digiKam'; $lang['Predefined filter'] = 'מסנן מוגדר מראש'; -$lang['Sharpen'] = 'חידוד'; -$lang['Portrait'] = 'דיוקן'; -$lang['Rated %d times, score : %.2f'] = 'דורג %d פעמים, ציון : %.2f'; -$lang['Ratio'] = 'דירוג'; +$lang['Sharpen'] = 'חדד'; +$lang['Portrait'] = 'אנכי'; +$lang['Rated %d times, score : %.2f'] = 'דורג %d פעמים, ציון: %.2f'; +$lang['Ratio'] = 'יחס'; $lang['View in gallery'] = 'צפה בגלריה'; $lang['You can activate only one mobile theme.'] = 'אתה יכול להפעיל רק ערכת נושא אחת לסלולרי'; $lang['between %.2f and %.2f'] = 'בין %.2f ו %.2f'; $lang['between %d and %d pixels'] = 'בין %d ו %d פיקסלים'; $lang['include photos with lower privacy level'] = 'כולל תמונות עם רמת פרטיות נמוכה'; -$lang['pending validation'] = 'ממתין לאימות'; +$lang['pending validation'] = 'ממתין לאישור'; $lang['simple visitors'] = 'מבקרים פשוטים'; $lang['Photo sizes with crop'] = 'גדלי תמונות עם חיתוך'; -$lang['Landscape'] = 'תמונת נוף'; +$lang['Landscape'] = 'אופקי'; $lang['Not cropped correctly?'] = 'לא נחתך בצורה נכונה?'; -$lang['Original file : %s'] = 'קובץ מקורי : %'; +$lang['Original file : %s'] = 'קובץ מקורי: %s'; $lang['Panorama'] = 'פנורמה'; -$lang['Permission granted for groups'] = 'ליצור הרשאות לקבוצות'; -$lang['Permission granted for users'] = 'ליצור הרשאות למשתמשים'; +$lang['Permission granted for groups'] = 'הרשאה ניתנה לקבוצות'; +$lang['Permission granted for users'] = 'הרשה ניתנה למשתמשים'; $lang['Permission management'] = 'ניהול הרשאות'; $lang['Delete multiple size images'] = 'מחק גדלים מרובים של תמונות'; $lang['Generate multiple size images'] = 'צור גדלים מרובים לתמונות'; -$lang['No order field selected'] = 'לא נבחר סדר'; -$lang['Manage photos'] = 'ניהול תמונות'; +$lang['No order field selected'] = 'לא נבחר שדה סדר'; +$lang['Manage photos'] = 'נהל תמונות'; $lang['Minimum height'] = 'גובה מינימלי'; $lang['Minimum width'] = 'רוחב מינימלי'; $lang['Number of albums per page'] = 'מספר אלבומים בעמוד'; $lang['Opacity'] = 'אטימות'; $lang['Rename'] = 'שנה שם'; -$lang['Duplicate'] = 'כפילות'; +$lang['Duplicate'] = 'שכפל'; $lang['Manage the members'] = 'נהל את החברים'; $lang['Merge selected groups'] = 'מזג את הקבוצות שנבחרו'; -$lang['No group selected, no action possible.'] = 'אף קבוצה לא נבחרה,אף שינוי לא בוצע.'; +$lang['No group selected, no action possible.'] = 'אף קבוצה לא נבחרה, אין פעולות אפשריות.'; $lang['No members to manage'] = 'אין חברים לנהל'; -$lang['Notify administrators when a comment is'] = 'עדכן מנהלים כאשר נכתבת תגובה'; -$lang['Piwigo cannot retrieve upgrade file from server'] = 'Piwigo לא יכולה להוציא את קבצי העדכון מהשרת'; -$lang['You have specified $conf[\'order_by\'] in your local configuration file, this parameter in deprecated, please remove it or rename it into $conf[\'order_by_custom\'] !'] = 'הגדרת $conf[\'order_by\'] בקובץ ההגדרות המקומי. הפרמטר הזה פגום. אנא הסר אותו או שנה את שמו ל- $conf[\'order_by_custom\'] !'; -$lang['This group will be set to default'] = 'יעשה שימוש בקבוצה זו כברירת מחדל'; +$lang['Notify administrators when a comment is'] = 'עדכן אדמינים כאשר תגובה היא'; +$lang['Piwigo cannot retrieve upgrade file from server'] = 'Piwigo לא יכולה לטעון את קבצי השדרוג מהשרת'; +$lang['You have specified $conf[\'order_by\'] in your local configuration file, this parameter in deprecated, please remove it or rename it into $conf[\'order_by_custom\'] !'] = 'You have specified $conf[\'order_by\'] in your local configuration file, this parameter in deprecated, please remove it or rename it into $conf[\'order_by_custom\'] !'; +$lang['This group will be set to default'] = 'קבוצה זו תשמש כברירת מחדל'; $lang['This group will be unset to default'] = 'קבוצה זו לא תשמש יותר כברירת מחדל'; -$lang['Type here the name of the new group'] = 'הקלד את שם הקבוצה החדשה כאן'; +$lang['Type here the name of the new group'] = 'כתוב את שם הקבוצה החדשה כאן'; $lang['Update user'] = 'עדכן משתמש'; -$lang['User %s added'] = 'משתמש %s נוסף'; -$lang['User %s updated'] = 'משתמש %s עודכן'; -$lang['on the %d selected users'] = 'על %d משתמשים נבחרו'; -$lang['The original maximum height must be a number between %d and %d'] = 'הגובה המקסימאלי המקורי צריך להיות מספר בין %d ו- %d '; -$lang['The original maximum width must be a number between %d and %d'] = 'הרוחב המקסימאלי המקורי צריך להיות מספר בין %d ו- %d '; -$lang['The picture dimensions will be reduced to %dx%d pixels.'] = 'מימדי התמונה יוקטנו ל- %dx%d פיקסלים'; -$lang['The center of interest is the most meaningful zone in the photo.'] = 'מרכז העניין הוא האזור המשמעותי ביותר של התמונה '; -$lang['The original image quality must be a number between %d and %d'] = 'האיכות המקורית של התמונה צריכה להיות מספר בין %d ו- %d '; +$lang['User %s added'] = 'משתמש %s התווסף'; +$lang['User %s updated'] = 'משתמש %s עודכן'; +$lang['on the %d selected users'] = 'על %d המשתמשים שנבחרו'; +$lang['The original maximum height must be a number between %d and %d'] = 'הגובה המקסימאלי המקורי צריך להיות מספר בין %d ו-%d '; +$lang['The original maximum width must be a number between %d and %d'] = 'הרוחב המקסימאלי המקורי צריך להיות מספר בין %d ו-%d '; +$lang['The picture dimensions will be reduced to %dx%d pixels.'] = 'מימדי התמונה יוקטנו ל-%dx%d פיקסלים.'; +$lang['The center of interest is the most meaningful zone in the photo.'] = 'מוקד העניין הוא האזור המשמעותי ביותר של התמונה.'; +$lang['The original image quality must be a number between %d and %d'] = 'האיכות המקורית של התמונה צריכה להיות מספר בין %d ו-%d '; $lang['The Piwigo publish Plug-in allows you to export and synchronize photos from Lightroom directly to your Piwigo photo gallery.'] = 'פלאגין הפרסום של Piwigo מאפשר לייצא ולבצע סינכרון של תמונות מתוך אדובי לייטרום ישירות לגלריית התמונות של Piwigo'; -$lang['The Piwigo export plugin allows you to create albums and export photos.'] = 'פלאגין היצוא של Piwigo מאפשר ליצור אלבומים ולייצא תמונות'; +$lang['The Piwigo export plugin allows you to create albums and export photos.'] = 'פלאגין הייצוא של Piwigo מאפשר ליצור אלבומים ולייצא תמונות.'; $lang['Users modified'] = 'משתמשים עודכנו'; $lang['close'] = 'סגור'; -$lang['Tag "%s" is now a duplicate of "%s"'] = 'התוית "%s" היא כעת שכפול של "%s"'; +$lang['Tag "%s" is now a duplicate of "%s"'] = 'התגית "%s" היא כעת שכפול של "%s"'; $lang['Showing %s to %s of %s users'] = 'מציג %s עד %s מתוך %s משתמשים'; $lang['Show %s users'] = 'הצג %s משתמשים'; $lang['Shotwell is an open source digital photo organizer that runs on Linux. It is the default photo manager in Ubuntu and Fedora.'] = 'Shotwell הוא מנהל תמונות קוד פתוח שרץ על לינוקס. הוא ברירת המחדל של מנהל התמונות ב- Ubuntu וב- Fedora'; -$lang['Select at least one tag'] = 'בחר לפחות תוית אחת'; +$lang['Select at least one tag'] = 'בחר לפחות תגית אחת'; $lang['Resize after upload disabled due to the use of GD as graphic library'] = 'שינוי גודל אחרי העלאת תמונה נוטרל עקב שימוש ב- GD כספריית גרפיקה'; $lang['Registered on %s, %s.'] = 'נרשם ב- %s, %s'; $lang['ReGalAndroid (RemoteGallery client for Android) is an open source (GPL v3) Piwigo client for the Android platform.'] = 'ReGalAndroid (RemoteGallery client for Android) זהו קליינט קוד פתוח (GPL v3) של Piwigo עבור פלטפורמת אנדרואיד'; -$lang['Purge user cache'] = 'נקה את ה- cache של המשתמש'; +$lang['Purge user cache'] = 'נקה את המטמון של המשתמש'; $lang['Please select at least two groups'] = 'אנא בחר לפחות שתי קבוצות'; -$lang['Password updated'] = 'ססמה עודכנה'; +$lang['Password updated'] = 'סיסמא עודכנה'; $lang['Open user details'] = 'פתח פרטי משתמש'; -$lang['Numeric identifier : %d'] = 'מזהה מספרי: %d'; +$lang['Numeric identifier : %d'] = 'מזהה מספרי: %d'; $lang['On your Linux, simply install Shotwell with your package manager and the activate Piwigo publishing option.'] = 'במערכת הלינוקס שלך, פשוט התקן Shotwell עם מנהל החבילות ואז את הפעל את אפשרות הפרסום של Piwigo.'; $lang['No user selected of %d users'] = 'לא נבחר משתמש מתוך %d משתמשים'; -$lang['No user selected, no action possible.'] = 'לא נבחר משתמש, אין אפשרות לבצע פעולה.'; +$lang['No user selected, no action possible.'] = 'לא נבחר משתמש, אין אפשרות לבצע אף פעולה.'; $lang['Piwigo for Android application empowers you to connect your Android phone or table to your Piwigo gallery, create some albums and upload several photos at once.'] = ' אפליקציית Piwigo עבור אנדרואיד מאפשרת לך להתחבר מטלפון האנדרואיד או הטאבלט שלך לגלריית Piwigo, ליצור אלבומים ולהעלות מספר תמונות בו זמנית '; $lang['Last visit on %s, %s.'] = 'ביקור אחרון ב- %s, %s.'; -$lang['Mail theme'] = 'נושא מייל'; -$lang['No matching user found'] = 'לא נמצאו משתמשים מתאימים'; +$lang['Mail theme'] = 'ערכת נושא דואר'; +$lang['No matching user found'] = 'לא נמצא משתמש מתאים'; $lang['Loading...'] = 'טוען...'; $lang['If no HD is available and if the current websize is bigger than resize dimensions, Piwigo will move it as HD and create a downsized websize photo from it.'] = 'אם אין גודל HD ואם הגודל הנוכחי גדול ממימדי השינוי, Piwigo יזיז זאת כ-HD ויצור תמונה מוקטנת '; $lang['General'] = 'כללי'; -$lang['For photo sizes with crop, such as "Square", Piwigo will do its best to include the center of interest.'] = 'עבור גדלי תמונה עם חיתוך, כמו "ריבוע", Piwigo יעשה כמידת יכולתו לכלול את מרכז העניין'; +$lang['For photo sizes with crop, such as "Square", Piwigo will do its best to include the center of interest.'] = 'עבור גדלי תמונה עם חיתוך, כמו "ריבוע", Piwigo יעשה כמיטב יכולתו לכלול את מוקד העניין'; $lang['Features include gallery browsing, album creation and photo upload.'] = 'התכונות כוללות עיון בגלרייה, יצירת אלבום והעלאת תמונה'; $lang['Close user details'] = 'סגור פרטי משתמש'; $lang['Change username'] = 'שנה שם משתמש'; $lang['Change password'] = 'שנה ססמה'; $lang['By default, the center of interest is placed in the middle of the photo.'] = 'כברירת מחדל, מרכז העניין ממוקם במרכז התמונה'; $lang['Basic settings'] = 'הגדרות בסיסיות'; -$lang['All %d users are selected'] = 'כל %d המשתמשים נבחרו'; -$lang['Adobe Photoshop Lightroom is a photography software designed to manage large quantities of digital images and doing post production work.'] = 'אדובי פוטושופ לייטרום היא תכנת עיבוד צילום המתוכננת לנהל כמויות גדולות של צילומים ולבצע עבודת עיבוד '; -$lang['Activate it now'] = 'הפעל כעת'; -$lang['Piwigo for iOS application empowers you to connect to your Piwigo gallery from your iPhone, iPad or iPod Touch, create some albums and upload several photos at once.'] = ' אפליקציית Piwigo עבור iOS מאפשרת לך להתחבר ממכשירי iPhone, iPad או Ipod Touch שלך לגלריית Piwigo, ליצור אלבומים ולהעלות מספר תמונות בו זמנית '; -$lang['(filtered from %s total users)'] = 'מסונן מתוך %s סך הכל משתמשים'; -$lang['%d of %d users selected'] = '%d מתוך %d מתשמשים נבחרו'; +$lang['All %d users are selected'] = 'כל %d המשתמשים נבחרו'; +$lang['Adobe Photoshop Lightroom is a photography software designed to manage large quantities of digital images and doing post production work.'] = 'אדובי פוטושופ לייטרום היא תכנת עיבוד צילום המתוכננת לנהל כמויות גדולות של צילומים ולבצע עבודת עיבוד פוסט '; +$lang['Activate it now'] = 'הפעל זאת כעת'; +$lang['Piwigo for iOS application empowers you to connect to your Piwigo gallery from your iPhone, iPad or iPod Touch, create some albums and upload several photos at once.'] = ' אפליקציית Piwigo עבור iOS מאפשרת לך להתחבר ממכשירי iPhone, iPad או Ipod Touch שלך לגלריית Piwigo, ליצור אלבומים ולהעלות מספר תמונות בו זמנית.'; +$lang['(filtered from %s total users)'] = '(מסונן מתוך %s סך הכל משתמשים)'; +$lang['%d of %d users selected'] = '%d מתוך %d משתמשים נבחרו'; $lang['Allow users to add a link to their website'] = 'אפשר למשתמשים להוסיף קישור לאתר שלהם'; -$lang['Empty caddie'] = 'עגלה ריקה'; -$lang['Impossible to deactivate the default theme.'] = 'אין אפשרות לבטל הפעלת תבנית ברירת מחדל'; -$lang['Mail address is mandatory for registration'] = 'כתובת מייל היא חובה על מנת להירשם'; -$lang['No and unlock sub-albums'] = 'לא ואפשר תת-אלבומים'; -$lang['The settings for the guest are from the %s user'] = 'ההגדרות עבור אורח הם מ %s משתמש'; +$lang['Empty caddie'] = 'סל ריק'; +$lang['Impossible to deactivate the default theme.'] = 'לא ניתן לכבות את ערכת נושא ברירת המחדל.'; +$lang['Mail address is mandatory for registration'] = 'חובה להזין כתובת דואר כדי להירשם'; +$lang['No and unlock sub-albums'] = 'לא ובטל נעילת אלבומי משנה'; +$lang['The settings for the guest are from the %s user'] = 'ההגדרות עבור האורח הם ממשתמש %s'; $lang['based on'] = 'מבוסס על'; -$lang['between %s and %s MB'] = 'בין %s עד %s מב'; +$lang['between %s and %s MB'] = 'בין %s ו %s MB'; $lang['date & time'] = 'תאריך ושעה'; $lang['file name'] = 'שם קובץ'; $lang['width & height'] = 'רוחב וגובה'; -$lang['Upload in progress'] = 'העלאה בתהליך'; \ No newline at end of file +$lang['Upload in progress'] = 'טעינה בתהליך'; +$lang['Correction the anomaly will cancel the fact that it\'s ignored'] = 'לא תהיה התעלמות יותר מהאנומליה המתוקנת'; +$lang['Can\'t connect to server.'] = 'לא ניתן להתחבר לשרת.'; +$lang['Can\'t create temporary file.'] = 'לא ניתן ליצור קובץ זמני.'; +$lang['Can\'t download archive.'] = 'לא ניתן להוריד את הארכיון.'; +$lang['Can\'t read or extract archive.'] = 'לא ניתן לקרוא או לחלץ את הארכיון.'; \ No newline at end of file diff --git a/sources/language/he_IL/common.lang.php b/sources/language/he_IL/common.lang.php index 107449d..908b370 100644 --- a/sources/language/he_IL/common.lang.php +++ b/sources/language/he_IL/common.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -22,7 +22,7 @@ // +-----------------------------------------------------------------------+ /* Language Name: עברית [IL] -Version: 2.7.0 +Version: 2.8.2 Language URI: http://piwigo.org/ext/extension_view.php?eid=457 Author: Piwigo team Author URI: http://piwigo.org @@ -34,41 +34,41 @@ $lang_info['direction'] = "rtl"; $lang_info['code'] = "he"; $lang_info['zero_plural'] = true; -$lang['%d Kb'] = '%d קילובייט'; -$lang['%d album updated'] = "%d קטגוריה מעודכנת"; -$lang['%d albums updated'] = "%d קטגוריות מעודכנות"; -$lang['%d comment to validate'] = "%d תגובה לאמת"; -$lang['%d comments to validate'] = "%d תגובות לאמת"; +$lang['%d Kb'] = '%d KB'; +$lang['%d album updated'] = '%d אלבום עודכן'; +$lang['%d albums updated'] = '%d אלבומים עודכנו'; +$lang['%d comment to validate'] = '%d תגובה לאישור'; +$lang['%d comments to validate'] = '%d תגובות לאישור'; $lang['%d new comment'] = "%d תגובה חדשה"; $lang['%d new comments'] = "%d תגובות חדשות"; $lang['%d comment'] = "%d תגובה"; $lang['%d comments'] = "%d תגובות"; -$lang['%d hit'] = "%d לחיצה"; -$lang['%d hits'] = "%d לחיצות"; +$lang['%d hit'] = '%d פגיעה'; +$lang['%d hits'] = '%d פגיעות'; $lang['%d new photo'] = "%d תמונה חדשה"; $lang['%d new photos'] = "%d תמונות חדשות"; $lang['%d new user'] = "%d משתמש חדש"; $lang['%d new users'] = "%d משתמשים חדשים"; -$lang['About'] = "על"; -$lang['All tags'] = "כל התוויות"; -$lang['Any tag'] = "כל תווית"; -$lang['At least one listed rule must be satisfied.'] = "חייב להיות לפחות קריטריון אחד ברשימה ."; -$lang['Author'] = "מחבר"; -$lang['Albums'] = "קטגוריות"; -$lang['Album'] = "קטגוריה"; +$lang['About'] = 'אודות'; +$lang['All tags'] = 'כל התגיות'; +$lang['Any tag'] = 'תגית כלשהי'; +$lang['At least one listed rule must be satisfied.'] = 'לפחות קריטריון אחד מצויין פה חייב להתקיים.'; +$lang['Author'] = 'יוצר'; +$lang['Albums'] = 'אלבומים'; +$lang['Album'] = 'אלבום'; $lang['Close this window'] = "סגור חלון זה"; -$lang['Complete RSS feed (photos, comments)'] = "עדכון RSS (תמונות, הערות)"; -$lang['Confirm Password'] = "אשר סיסמה"; +$lang['Complete RSS feed (photos, comments)'] = 'עדכון RSS מלא (תמונות, הערות)'; +$lang['Confirm Password'] = 'אשר סיסמא'; $lang['Connection settings'] = "הגדרות חיבור"; $lang['Login'] = "התחברות"; $lang['Contact webmaster'] = "צור קשר עם מנהל האתר"; $lang['Create a new account'] = "צור חשבון חדש"; $lang['Created on'] = 'נוצר ב'; $lang['Creation date'] = "תאריך יצירה"; -$lang['Current password is wrong'] = "הסיסמה שגויה"; +$lang['Current password is wrong'] = 'סיסמא שגויה'; $lang['Dimensions'] = "מימדים"; -$lang['Display'] = "להציג"; -$lang['Each listed rule must be satisfied.'] = "כל רשימת קריטריונים חייבת להיות שלמה."; +$lang['Display'] = 'תצוגה'; +$lang['Each listed rule must be satisfied.'] = 'כל קריטריון ברשימה חייב להתמלא.'; $lang['Email address'] = "כתובת דואר אלקטרוני"; $lang['Enter your personnal informations'] = "הזן את הנתונים האישיים שלך"; $lang['Error sending email'] = "שגיאה בעת שליחת דואר אלקטרוני"; @@ -77,75 +77,75 @@ $lang['File'] = "קובץ"; $lang['Filesize'] = "גודל הקובץ"; $lang['Filter and display'] = "סנן והצג"; $lang['Filter'] = "מסנן"; -$lang['Forgot your password?'] = "שכחת את הסיסמה?"; +$lang['Forgot your password?'] = 'שכחת את הסיסמא?'; $lang['Go through the gallery as a visitor'] = "נווט בגלריה כמבקר"; $lang['Help'] = "עזרה"; -$lang['Identification'] = "הזדהות"; +$lang['Identification'] = 'זיהוי'; $lang['Photos only RSS feed'] = "תמונות בלבד RSS "; -$lang['Keyword'] = "מילות מפתח"; +$lang['Keyword'] = 'מילת מפתח'; $lang['Links'] = "קישורים"; -$lang['N/A'] = "N/A לא ידוע"; +$lang['N/A'] = 'N/A'; $lang['New on %s'] = "חדש ב %s"; $lang['Notification'] = "הודעה"; $lang['Number of items'] = "מספר הפריטים"; $lang['Original dimensions'] = "מידות מקוריות"; -$lang['Password forgotten'] = "שכחתי את הסיסמה"; -$lang['Password'] = "סיסמה"; +$lang['Password forgotten'] = 'שכחתי את הסיסמא'; +$lang['Password'] = 'סיסמא'; $lang['Post date'] = "תאריך פרסום"; $lang['Posted on'] = "פורסם ב"; $lang['Profile'] = "פרופיל"; -$lang['Quick connect'] = "גישה מהירה"; +$lang['Quick connect'] = 'חיבור מהיר'; $lang['RSS feed'] = 'הזנות (RSS)'; $lang['Register'] = "הירשם"; $lang['Registration'] = "הרשמה"; -$lang['Related tags'] = "תוויות קשורות"; -$lang['Reset'] = "איפוס"; -$lang['Retrieve password'] = "לאחזר את הסיסמה"; -$lang['Search rules'] = "חיפוש קריטריונים"; -$lang['Search tags'] = "חיפוש תוויות"; +$lang['Related tags'] = 'תגיות קשורות'; +$lang['Reset'] = 'אפס'; +$lang['Retrieve password'] = 'שחזר את הסיסמא'; +$lang['Search rules'] = 'קריטריוני חיפוש'; +$lang['Search tags'] = 'חפש תגיות'; $lang['Search'] = "חיפוש"; -$lang['display available tags'] = "ראה תוויות אפשריות"; -$lang['Since'] = "מ"; +$lang['display available tags'] = 'הצג תגיות קיימות'; +$lang['Since'] = 'מאז'; $lang['Sort by'] = "מיין לפי"; -$lang['Sort order'] = "לפי הסדר"; -$lang['Tag'] = "תווית"; -$lang['Tags'] = "תוויות"; +$lang['Sort order'] = 'סדר מיון'; +$lang['Tag'] = 'תגית'; +$lang['Tags'] = 'תגיות'; $lang['The RSS notification feed provides notification on news from this website : new photos, updated albums, new comments. Use a RSS feed reader.'] = "ה-RSS מספק התראה על אירועים חדשים מאתר זה: תמונות חדשות, קטגוריות מעודכן, הערות חדשות. כדי להשתמש עם קורא RSS."; $lang['Unknown feed identifier'] = 'מזהה לא ידוע'; $lang['User comments'] = 'תגובות משתמש'; $lang['Username'] = 'שם משתמש'; -$lang['Visits'] = 'מבקר'; +$lang['Visits'] = 'ביקורים'; $lang['Webmaster'] = 'מנהל אתר'; $lang['Week %d'] = 'שבוע %d'; $lang['About Piwigo'] = 'אודות Piwigo'; $lang['You are not authorized to access the requested page'] = 'אינך מורשה לגשת לדף זה'; $lang['add this photo to your favorites'] = 'הוסף תמונה זאת למועדפים שלך'; -$lang['Administration'] = 'מנהל ראשי'; +$lang['Administration'] = 'ניהול אדמינים'; $lang['all'] = 'הכול'; $lang['ascending'] = 'עולה'; -$lang['author(s) : %s'] = 'מחבר/ים : %'; -$lang['Expand all albums'] = 'הרחב את כל הקטגוריות'; +$lang['author(s) : %s'] = 'יוצר/ים: %s'; +$lang['Expand all albums'] = 'הרחב את כל האלבומים'; $lang['posted after %s (%s)'] = 'פורסם אחרי %s (%s)'; $lang['posted before %s (%s)'] = 'פורסם לפני %s (%s)'; $lang['posted between %s (%s) and %s (%s)'] = 'פורסם בין %s (%s) ו %s (%s)'; $lang['posted on %s'] = 'פורסם ב %'; -$lang['Best rated'] = 'מדורג הכי גבוהה'; -$lang['display best rated photos'] = 'הצג את התמונה המדורגת הכי גבוהה'; +$lang['Best rated'] = 'מדורג במקום הגבוה ביותר'; +$lang['display best rated photos'] = 'הצג את התמונות בדירוגים הגבוהים ביותר'; $lang['Calendar'] = 'לוח שנה'; $lang['All'] = 'הכול'; -$lang['display each day with photos, month per month'] = 'הצג כל יום עם תמונה, חודש אחרי חודש'; +$lang['display each day with photos, month per month'] = 'הצג כל יום עם תמונות, חודש אחרי חודש'; $lang['View'] = 'צפה'; -$lang['chronology_monthly_calendar'] = 'חודשי לוח שנה'; -$lang['chronology_monthly_list'] = 'רשימת חודשים'; -$lang['chronology_weekly_list'] = 'רשימת שבועות'; +$lang['chronology_monthly_calendar'] = 'לוח שנה חודשי'; +$lang['chronology_monthly_list'] = 'רשימה חודשית'; +$lang['chronology_weekly_list'] = 'רשימה שבועית'; $lang['Click here if your browser does not automatically forward you'] = 'לחץ כאן אם הדפדפן לא העביר אותך אוטומטית'; $lang['comment date'] = 'תאריך תגובה'; $lang['Comment'] = 'תגובה'; $lang['Your comment has been registered'] = 'התגובה שלך נרשמה'; -$lang['Anti-flood system : please wait for a moment before trying to post another comment'] = 'מערכת למניעת קריסה : המתן מספר שניות בין תגובה לתגובה'; -$lang['Your comment has NOT been registered because it did not pass the validation rules'] = 'התגובה שלך לא נרשמה כיוון שלא עמדה באחד הכללים'; -$lang['An administrator must authorize your comment before it is visible.'] = 'המנהל הראשי חייב לאשר את התגובה שלך לפני שהיא תופיעה.'; -$lang['This login is already used by another user'] = 'אתה מחובר כבר על משתמש אחר'; +$lang['Anti-flood system : please wait for a moment before trying to post another comment'] = 'מערכת למניעת הצפה: אנא המתן רגע לפני שליחת התגובה הבאה'; +$lang['Your comment has NOT been registered because it did not pass the validation rules'] = 'התגובה שלך לא נרשמה כיוון שלא עמדה בכללי האישור'; +$lang['An administrator must authorize your comment before it is visible.'] = 'אדמין חייב לאשר את התגובה שלך לפני שהיא תופיע.'; +$lang['This login is already used by another user'] = 'חיבור זה בשימוש כבר על ידי משתמש אחר'; $lang['Comments'] = 'תגובות'; $lang['Add a comment'] = 'הוסף תגובה'; $lang['created after %s (%s)'] = 'נוצר אחרי %s (%s)'; @@ -153,7 +153,7 @@ $lang['created before %s (%s)'] = 'נוצר לפני %s (%s)'; $lang['created between %s (%s) and %s (%s)'] = 'נוצר בין %s (%s) ל %s (%s)'; $lang['created on %s'] = 'נוצר ב %s'; $lang['Customize'] = 'התאמה אישית'; -$lang['Your Gallery Customization'] = 'הגלריה האישית שלך'; +$lang['Your Gallery Customization'] = 'התאמה אישית של הגלריה שלך'; $lang['day'][0] = "יום ראשון"; $lang['day'][1] = "יום שני"; $lang['day'][2] = "יום שלישי"; @@ -162,42 +162,42 @@ $lang['day'][4] = "יום חמישי"; $lang['day'][5] = "יום שישי"; $lang['day'][6] = "יום שבת"; $lang['Default'] = 'ברירת מחדל'; -$lang['delete this photo from your favorites'] = 'מחק את התמונה מהמועדפים שלך'; +$lang['delete this photo from your favorites'] = 'מחק תמונה זו מהמועדפים שלך'; $lang['Delete'] = 'מחק'; $lang['descending'] = 'יורד'; $lang['Download'] = 'הורד'; $lang['Download this file'] = 'הורד את הקובץ'; $lang['edit'] = 'ערוך'; -$lang['wrong date'] = 'תאריך לא נכון'; -$lang['excluded'] = 'נשלל'; -$lang['Your favorites'] = 'המועדפים שלי'; +$lang['wrong date'] = 'תאריך שגוי'; +$lang['excluded'] = 'לא כולל'; +$lang['Your favorites'] = 'המועדפים שלך'; $lang['display your favorites photos'] = 'הצג את התמונות המועדפות שלך'; $lang['Favorites'] = 'מועדפים'; $lang['First'] = 'ראשון'; -$lang['The gallery is locked for maintenance. Please, come back later.'] = 'הגלריה סגורה לצורכי תחזוקה. בבקשהה, תחזור מאוחר יותר.'; +$lang['The gallery is locked for maintenance. Please, come back later.'] = 'הגלריה נעולה לצורכי תחזוקה. אנא חזור מאוחר יותר.'; $lang['Page generated in'] = 'הדף נוצר ב'; $lang['guest'] = 'אורח'; $lang['Hello'] = 'שלום'; -$lang['available for administrators only'] = 'זמין למנהל ראשי בלבד'; -$lang['display this album'] = 'הצג תמונות בשורש הקטגוריה'; -$lang['display last user comments'] = 'ראה את התגובות האחרונות של המשתמשים'; -$lang['customize the appareance of the gallery'] = 'התאם אישית את מראה הקטגוריה'; +$lang['available for administrators only'] = 'זמין לאדמינים בלבד'; +$lang['display this album'] = 'הצג אלבום זה'; +$lang['display last user comments'] = 'הצג את תגובות המשתמשים האחרונות'; +$lang['customize the appareance of the gallery'] = 'התאם אישית את מראה הגלריה'; $lang['search'] = 'חפש'; $lang['Home'] = 'בית'; $lang['Identification'] = "הזדהה"; -$lang['in this album'] = "בקטגוריה הזאת"; -$lang['in %d sub-album'] = "ב %d תת קטגוריה"; -$lang['in %d sub-albums'] = "ב %d תת קטגוריות"; +$lang['in this album'] = 'באלבום זה'; +$lang['in %d sub-album'] = 'ב %d אלבום משנה'; +$lang['in %d sub-albums'] = 'ב %d אלבומי משנה'; $lang['included'] = "כולל"; -$lang['Invalid password!'] = "סיסמה לא חוקית!"; +$lang['Invalid password!'] = 'סיסמא שגויה!'; $lang['Language'] = "שפה"; -$lang['last %d days'] = "ה %d ימים אחרונים"; +$lang['last %d days'] = '%d ימים אחרונים'; $lang['Last'] = "אחרון"; $lang['Logout'] = "התנתק"; -$lang['obligatory'] = "הכרחי"; +$lang['obligatory'] = 'חובה'; $lang['display a calendar by creation date'] = "הצג לוח שנה לפי תאריך יצירה"; -$lang['display all photos in all sub-albums'] = "הצג את כל הפריטים בכל הקטגוריות ובכל התת קטגוריות"; -$lang['return to normal view mode'] = "חזור לתצוגה רגילה"; +$lang['display all photos in all sub-albums'] = 'הצג את כל התמונות בכל אלבומי המשנה'; +$lang['return to normal view mode'] = 'חזור למצב תצוגה רגילה'; $lang['display a calendar by posted date'] = "הצג לוח שנה לפי תאריך פרסום"; $lang['month'][10] = "אוקטובר"; $lang['month'][11] = "נובמבר"; @@ -214,215 +214,222 @@ $lang['month'][9] = "ספטמבר"; $lang['Most visited'] = "הכי נצפה"; $lang['display most visited photos'] = "הצג את התמונות הנצפות ביותר"; $lang['Unknown identifier'] = 'מזהה לא ידוע'; -$lang['New password'] = "סיסמה חדשה"; +$lang['New password'] = 'סיסמא חדשה'; $lang['Rate this photo'] = "דרג תמונה זאת"; $lang['Next'] = "הבא"; -$lang['no rate'] = "לא דורג"; -$lang['Photos posted within the last %d day.'] = "פריטים שנוספו ב %d ימים האחרונים."; -$lang['Photos posted within the last %d days.'] = "פריטים שנוספו ב %d ימים האחרונים."; -$lang['password updated'] = "הסיסמה עודכנה"; -$lang['Recent period must be a positive integer value'] = 'התמונות האחרונות חייב להיות מספר שלם חיובי'; +$lang['no rate'] = 'ללא דירוג'; +$lang['Photos posted within the last %d day.'] = 'פריטים שנוספו ב %d הימים האחרונים.'; +$lang['Photos posted within the last %d days.'] = 'פריטים שנוספו ב %d הימים האחרונים.'; +$lang['password updated'] = 'הסיסמא עודכנה'; +$lang['Recent period must be a positive integer value'] = 'התקופה האחרונה חייבת להיות מספר שלם חיובי'; $lang['photo'] = "תמונה"; -$lang['Click on the photo to see it in high definition'] = "לחץ על הצמונה על מנת לראות אותה באיכות גבוהה"; +$lang['Click on the photo to see it in high definition'] = 'לחץ על התמונה על מנת לראות אותה באיכות גבוהה'; $lang['Show file metadata'] = "הראה את המידע על הקובץ"; -$lang['Powered by'] = "נוצר על ידי"; +$lang['Powered by'] = 'Powered by'; $lang['Preferences'] = "העדפות"; $lang['Previous'] = "קודם"; -$lang['Random photos'] = "תמונה אקראית"; +$lang['Random photos'] = 'תמונות אקראיות'; $lang['display a set of random photos'] = "הראה מספר תמונות אקראיות"; -$lang['Recent albums'] = "הקטגוריות האחרונות"; -$lang['display recently updated albums'] = "הראה את הקטגוריות שעודכנו לאחרונה"; -$lang['Recent period'] = "בתקופה האחרונה"; +$lang['Recent albums'] = 'אלבומים אחרונים'; +$lang['display recently updated albums'] = 'הצג אלבומים שעודכנו לאחרונה'; +$lang['Recent period'] = 'תקופה אחרונה'; $lang['Recent photos'] = "תמונות אחרונות"; -$lang['display most recent photos'] = "הראה את התמונות הכי חדשות"; -$lang['Redirection...'] = "מעביר..."; -$lang['Please, enter a login'] = "הכנס שם משתמש"; +$lang['display most recent photos'] = 'הצג את התמונות הכי חדשות'; +$lang['Redirection...'] = 'העברה...'; +$lang['Please, enter a login'] = 'אנא הזן שם משתמש'; $lang['login mustn\'t end with a space character'] = "שם משתמש לא יכול להיגמר ברווח"; $lang['login mustn\'t start with a space character'] = "שם משתמש לא יכול להתחיל עם רווח"; -$lang['this login is already used'] = "השם משתמש הזה קיים כבר"; -$lang['mail address must be like xxx@yyy.eee (example : jack@altern.org)'] = "דואר אלקטרוני חייב להיות כמו adir@biton.com (לדוגמה : adir@gmail.com)"; +$lang['this login is already used'] = 'שם המשתמש הזה כבר בשימוש'; +$lang['mail address must be like xxx@yyy.eee (example : jack@altern.org)'] = 'דואר אלקטרוני חייב להיות כמו xxx@yyyy.eeee (לדוגמה : gates@gmail.com)'; $lang['Auto login'] = "התחברות אוטומטית"; -$lang['remove this tag from the list'] = "מחק את התווית הזאת מהרשימה"; -$lang['representative'] = "נבחר"; -$lang['Search for Author'] = "חפש את המחבר"; -$lang['Search in albums'] = "חפש בקטגוריה"; +$lang['remove this tag from the list'] = 'הסר את התגית הזאת מהרשימה'; +$lang['representative'] = 'צלמית אלבום'; +$lang['Search for Author'] = 'חפש לפי יוצר'; +$lang['Search in albums'] = 'חפש באלבומים'; $lang['Search by date'] = "חפש לפי תאריך"; $lang['Date'] = "תאריך"; $lang['End-Date'] = "תאריך סיום"; $lang['Kind of date'] = "סוג של תאריך"; -$lang['Search for words'] = "חפש את המילה"; -$lang['Search for all terms'] = "חפש את כל התנאים"; -$lang['Search for any term'] = "חפש לפי כל תנאי"; +$lang['Search for words'] = 'חפש את המילים'; +$lang['Search for all terms'] = 'חפש לפי כל התנאים'; +$lang['Search for any term'] = 'חפש לפי תנאי כלשהו'; $lang['Empty query. No criteria has been entered.'] = "שאילתה ריקה. לא הוכנסו קריטריונים."; -$lang['Search results'] = "חפש תוצאות"; -$lang['Search in sub-albums'] = "חפש בתת קטגוריות"; -$lang['searched words : %s'] = "חפש מילה : %s"; +$lang['Search results'] = 'תוצאות חיפוש'; +$lang['Search in sub-albums'] = 'חפש באלבומי המשנה'; +$lang['searched words : %s'] = 'מילים לחיפוש : %s'; $lang['Contact'] = "צור קשר"; -$lang['set as album representative'] = "סמן כמייצג הקטגוריה"; +$lang['set as album representative'] = 'בחר כצלמית אלבום'; $lang['Show number of comments'] = "הראה מספר תגובות"; -$lang['Show number of hits'] = "הראה מספר לחיצות"; +$lang['Show number of hits'] = 'הראה מספר פגיעות'; $lang['slideshow'] = "מצגת"; $lang['stop the slideshow'] = "עצור את המצגת"; $lang['Specials'] = "מיוחדים"; $lang['SQL queries in'] = "שאילתות SQL"; -$lang['display only recently posted photos'] = "הראה רק תמונות שפורסמו לאחרונה"; +$lang['display only recently posted photos'] = 'הצג רק תמונות שפורסמו לאחרונה'; $lang['return to the display of all photos'] = "חזור להצגת כל התמונות"; $lang['the beginning'] = "ההתחלה"; -$lang['Thumbnails'] = "תמונות ממוזערות"; +$lang['Thumbnails'] = 'צלמיות'; $lang['Menu'] = "תפריט"; $lang['A comment on your site'] = "תגובה באתר שלך"; $lang['today'] = "היום"; $lang['Update your rating'] = "עדכן את הדירוג שלך"; -$lang['the username must be given'] = "דרוש שם משתמש"; -$lang['useful when password forgotten'] = "שימושי במקרה ששכחת את הסיסמה"; +$lang['the username must be given'] = 'שם משתמש חובה'; +$lang['useful when password forgotten'] = 'שימושי במקרה ששכחת את הסיסמא'; $lang['Quick search'] = "חיפוש מהיר"; $lang['Connected user: %s'] = "משתמש מחובר: %s"; -$lang['IP: %s'] = "אי פי: %s"; +$lang['IP: %s'] = 'IP: %s'; $lang['Browser: %s'] = "דפדפן: %s"; -$lang['Author: %s'] = "מחבר: %s"; +$lang['Author: %s'] = 'יוצר: %s'; $lang['Comment: %s'] = "תגובה: %s"; -$lang['Comment by %s'] = "התגובה נרשמה על ידי %s"; -$lang['User: %s'] = "שם משתמש: %s"; +$lang['Comment by %s'] = 'תגובה של %s'; +$lang['User: %s'] = 'משתמש: %s'; $lang['Email: %s'] = "דואר אלקטרוני: %s"; -$lang['Admin: %s'] = "מנהל: %s"; +$lang['Admin: %s'] = 'אדמין: %s'; $lang['Registration of %s'] = "רישום של %s"; -$lang['Album: %s'] = "קטגוריה: %s"; -$lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'מצב לא טוב עבור המשתמש "האורח", השתמש במצב ברירת מחדל. עדכן בבקשה את מנהל האתר.'; -$lang['this email address is already in use'] = "משתמש אחר כבר משתמש בדואר האלקטרוני הזה"; -$lang['Album results for'] = "תוצאות עבור הקטגוריה"; -$lang['Tag results for'] = "תוצאות עבור התוויות"; +$lang['Album: %s'] = 'אלבום: %s'; +$lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'מצב שגוי עבור משתמש "אורח", משתמש במצב ברירת מחדל. עדכן בבקשה את מנהל האתר.'; +$lang['this email address is already in use'] = 'הדואר האלקטרוני הזה כבר בשימוש'; +$lang['Album results for'] = 'תוצאות אלבום עבור'; +$lang['Tag results for'] = 'תוצאות עבור התגיות'; $lang['from %s to %s'] = "מ %s עד %s"; -$lang['Play of slideshow'] = "הפעל מצגת"; +$lang['Play of slideshow'] = 'נגן מצגת'; $lang['Pause of slideshow'] = "עצור מצגת"; -$lang['Repeat the slideshow'] = "חזור על אותם שקופיות"; +$lang['Repeat the slideshow'] = 'חזור על המצגת'; $lang['Not repeat the slideshow'] = "אל תחזור על אותם שקופיות"; -$lang['Reduce diaporama speed'] = "הורד את מהירות הצגת המצגת"; -$lang['Accelerate diaporama speed'] = "העלה את מהירות הצגת המצגת"; +$lang['Reduce diaporama speed'] = 'האט את המצגת'; +$lang['Accelerate diaporama speed'] = 'הגבר מהירות המצגת'; $lang['Submit'] = "שלח"; $lang['Yes'] = "כן"; $lang['No'] = "לא"; $lang['%d photo'] = "%d תמונה"; $lang['%d photos'] = "%d תמונות"; -$lang['%d photo is also linked to current tags'] = "%d התמונוה כבר מקושרת לתווית זאת"; -$lang['%d photos are also linked to current tags'] = "%d התמונה כבר מקושרת לתוויות אלה"; -$lang['display photos linked to this tag'] = "הראה תמונות המקושרות לתווית זאת בלבד"; +$lang['%d photo is also linked to current tags'] = '%d תמונה כבר מקושרת לתגית זו'; +$lang['%d photos are also linked to current tags'] = '%d תמונות מקושרות גם לתגיות אלה'; +$lang['display photos linked to this tag'] = 'הצג תמונות המקושרות לתגית זאת'; $lang['photos posted during the last %d days'] = "תמונות שפורסמו במשך %d ימים אחרונים"; $lang['Piwigo Help'] = "עזרת Piwigo"; $lang['Rank'] = "דירוג"; -$lang['group by letters'] = "קבוצה לפי אותיות"; +$lang['group by letters'] = 'קבץ לפי אותיות'; $lang['letters'] = "אותיות"; -$lang['show tag cloud'] = "הצג ענן תוויות"; +$lang['show tag cloud'] = 'הצג ענן תגיות'; $lang['cloud'] = "ענן"; -$lang['Reset to default values'] = "אפס לערך ברירת מחדל"; +$lang['Reset to default values'] = 'אפס לערכי ברירת מחדל'; $lang['delete all photos from your favorites'] = "מחק את כל התמונות מהמועדפים שלך"; $lang['Sent by'] = "נשלח על ידי"; -$lang['Cookies are blocked or not supported by your browser. You must enable cookies to connect.'] = "הדפדפן שלך חוסם קוקיז או לא תומך בהם. אתה חייב להפעיל את ה קוקיז בשביל להתחבר."; +$lang['Cookies are blocked or not supported by your browser. You must enable cookies to connect.'] = 'הדפדפן שלך חוסם קוקיז או לא תומך בהם. אתה חייב להפעיל את הקוקיז בשביל להתחבר.'; $lang['Edit a comment'] = "ערוך תגובה"; $lang['Are you sure?'] = "האם אתה בטוח?"; -$lang['(!) This comment requires validation'] = '(!) תגובה זאת דורשת אישור מנהל'; +$lang['(!) This comment requires validation'] = '(!) תגובה זאת דורשת אישור'; $lang['Welcome'] = 'ברוך הבא'; $lang['Welcome to your Piwigo photo gallery!'] = 'ברוך הבא לגלריית ה Piwigo שלך!'; -$lang['... or browse your empty gallery'] = '... או גלוש בגלריה הריקה שלך'; -$lang['... or please deactivate this message, I will find my way by myself'] = '... אן התעלם מהודעה זאת, אני ימצא את דרכי לבד'; +$lang['... or browse your empty gallery'] = '... או שוטט בגלריה הריקה שלך'; +$lang['... or please deactivate this message, I will find my way by myself'] = '... או בטל הודעה זאת, אני אמצא את דרכי לבד'; $lang['Hello %s, your Piwigo photo gallery is empty!'] = 'שלום %s, גלרית הPiwigo שלך ריקה!'; $lang['I want to add photos'] = 'אני רוצה להוסיף תמונות'; -$lang['Manage this user comment: %s'] = 'נהל את תגובות משתמש זה: %s'; -$lang['Email address is missing. Please specify an email address.'] = "חסר כתובת דואר אלקטרוני. הכנס בבקשה כתובת דואר אלקטרוני זמינה."; -$lang['This author modified following comment:'] = 'מחבר זה, ערך את התגובה שלו:'; -$lang['This author removed the comment with id %d'] = 'מחבר זה מחק את התגובה עם השם משתמש %d'; +$lang['Manage this user comment: %s'] = 'נהל את תגובת משתמש זה: %s'; +$lang['Email address is missing. Please specify an email address.'] = 'חסרה כתובת דואר אלקטרוני. הזן בבקשה כתובת דואר אלקטרוני.'; +$lang['This author modified following comment:'] = 'יוצר זה ערך את התגובה הבאה:'; +$lang['This author removed the comment with id %d'] = 'יוצר זה מחק את התגובה עם מספר זיהוי %d'; $lang['html tags are not allowed in login'] = 'לא ניתן להשתמש בתגי html בהתחברות'; -$lang['The number of photos per page must be a not null scalar'] = 'מספר התמונות בד חייב להיות גדול מאפס'; +$lang['The number of photos per page must be a not null scalar'] = 'מספר התמונות בדף חייב להיות גדול מאפס'; $lang['Number of photos per page'] = 'מספר תמונות בדף'; -$lang['Change my password'] = 'שנה את הסיסמה שלי'; +$lang['Change my password'] = 'שנה את הסיסמא שלי'; $lang['Check your email for the confirmation link'] = 'קישור אימות ממתין אצלך באימייל'; $lang['Desktop'] = 'שולחן העבודה'; $lang['Edit'] = 'ערוך'; -$lang['Enter your new password below.'] = 'הכנס את סיסמתך החדשה מתחת'; +$lang['Enter your new password below.'] = 'הזן את סיסמתך החדשה מתחת'; $lang['Hello %s,'] = 'שלום %s,'; -$lang['If this was a mistake, just ignore this email and nothing will happen.'] = 'אם זה טעות, התעלם ממייל זה ושום דבר לא יקרא'; +$lang['If this was a mistake, just ignore this email and nothing will happen.'] = 'אם זו היתה טעות, פשוט התעלם ממייל זה ודבר לא יקרה'; $lang['%d rate'] = '%d דירוג'; $lang['%d rates'] = '%d דירוגים'; $lang['2small'] = 'XXS - זעיר'; -$lang['Bad request'] = 'בקשה לא טובה'; -$lang['Date created, new → old'] = 'תאריך יצירה, חדש &rare; ישן'; -$lang['Date created, old → new'] = 'תאריך יצירה, ישן &rare; חדש'; -$lang['Date posted, new → old'] = 'תאריך פרסום, חדש &rare; ישן'; -$lang['Date posted, old → new'] = 'תאריך פרסום, ישן &rare; חדש'; -$lang['EXIF Metadata'] = 'מטה EXIF'; -$lang['File name, A → Z'] = 'שם הקובץ, א → ת'; -$lang['File name, Z → A'] = 'שם הקובץ, ת → א'; +$lang['Bad request'] = 'בקשה שגויה'; +$lang['Date created, new → old'] = 'תאריך יצירה, חדש ← ישן'; +$lang['Date created, old → new'] = 'תאריך יצירה, ישן ← חדש'; +$lang['Date posted, new → old'] = 'תאריך פרסום, חדש ← ישן'; +$lang['Date posted, old → new'] = 'תאריך פרסום, ישן ← חדש'; +$lang['EXIF Metadata'] = 'EXIF Metadata'; +$lang['File name, A → Z'] = 'שם הקובץ, א ← ת'; +$lang['File name, Z → A'] = 'שם הקובץ, ת ← א'; $lang['Forbidden'] = 'אסור'; -$lang['Here are your connection settings'] = 'כאן נמצאים הגדרות ההתחברות שלך'; -$lang['IPTC Metadata'] = 'מטה IPTC'; -$lang['If you think you\'ve received this email in error, please contact us at %s'] = 'אם אתה חושב שקיבלת את האימייל הזה בטעות, בבקשה צור קשר איתנו ב %s'; +$lang['Here are your connection settings'] = 'הנה הגדרות ההתחברות שלך'; +$lang['IPTC Metadata'] = 'IPTC Metadata'; +$lang['If you think you\'ve received this email in error, please contact us at %s'] = 'אם אתה חושב שקיבלת את האימייל הזה בטעות, אנא צור קשר איתנו ב %s'; $lang['Invalid key'] = 'מקש שגוי'; $lang['Invalid username or email'] = 'שם משתמש או אימייל שגויים'; $lang['Manual sort order'] = 'מיון ידני'; -$lang['Mobile'] = 'סלולרי'; -$lang['Numeric identifier, 1 → 9'] = 'מספרי זיהוי, 1 %rarr; 9'; -$lang['Numeric identifier, 9 → 1'] = 'מספרי זיהוי, 9 %rarr; 1'; +$lang['Mobile'] = 'מובייל'; +$lang['Numeric identifier, 1 → 9'] = 'מספרי זיהוי, 1 %larr; 9'; +$lang['Numeric identifier, 9 → 1'] = 'מספרי זיהוי, 9 %larr; 1'; $lang['Original'] = 'מקורי'; -$lang['Page not found'] = 'הדף לא נמצא'; -$lang['Password Reset'] = 'אפס סיסמה'; -$lang['Password reset is not allowed for this user'] = 'משתמש זה לא רשאי לאפס סיסמה'; -$lang['Password: %s'] = 'סיסמה: %s'; -$lang['Permalink for album not found'] = 'לא נמצא קישור לאלבום'; -$lang['Photo sizes'] = 'גודל התמונה'; -$lang['Photo title, A → Z'] = 'כותרת התמונה, א → ת'; -$lang['Photo title, Z → A'] = 'כותרת התמונה, א → ת'; -$lang['Piwigo encountered a non recoverable error'] = 'Piiwigo נתקל בשגיאה שלא נתנת לתיקון'; -$lang['Please enter your username or email address.'] = 'הכנס בבקשה את שם המשתמש או האימייל שלך'; -$lang['Rating score, high → low'] = 'ציון דירוג, גבוהה %rarr; נמוך'; -$lang['Rating score, low → high'] = 'ציון דירוג, נמוך %rarr; גבוהה'; +$lang['Page not found'] = 'דף לא נמצא'; +$lang['Password Reset'] = 'אפס סיסמא'; +$lang['Password reset is not allowed for this user'] = 'משתמש זה לא רשאי לאפס סיסמא'; +$lang['Password: %s'] = 'סיסמא: %s'; +$lang['Permalink for album not found'] = 'לא נמצא קישור קבוע לאלבום'; +$lang['Photo sizes'] = 'מידות התמונה'; +$lang['Photo title, A → Z'] = 'כותרת התמונה, א ← ת'; +$lang['Photo title, Z → A'] = 'כותרת התמונה, א ← ת'; +$lang['Piwigo encountered a non recoverable error'] = 'Piiwigo נתקל בשגיאה שלא ניתנת לתיקון'; +$lang['Please enter your username or email address.'] = 'הכנס בבקשה את שם המשתמש או האימייל שלך.'; +$lang['Rating score, high → low'] = 'ציון דירוג, גבוהה %larr; נמוך'; +$lang['Rating score, low → high'] = 'ציון דירוג, נמוך %larr; גבוהה'; $lang['Rating score'] = 'ציון דירוג'; $lang['Requested album does not exist'] = 'האלבום המבוקש לא קיים'; -$lang['Requested tag does not exist'] = 'תיוג מבוקש לא קיים'; +$lang['Requested tag does not exist'] = 'התגית המבוקשת לא קיימת'; $lang['Return to home page'] = 'חזור לדף הבית'; -$lang['Send my connection settings by email'] = 'שלח את פירטי ההתחברות שלי באימייל'; -$lang['Show latest comments first'] = 'הראה את התגובה החדשה בהתחלה'; -$lang['Show oldest comments first'] = 'הראה את התגובה הישנה בהתחלה'; -$lang['Someone requested that the password be reset for the following user account:'] = 'מישהו ביקש לאפס סיסמה למשתמש:'; -$lang['Successfully registered, you will soon receive an email with your connection settings. Welcome!'] = 'נרשמת בהצלחה, בקרוב תקבל אימייל עם פרטי ההתחברות שלך, ברוך הבא!'; +$lang['Send my connection settings by email'] = 'שלח את פרטי ההתחברות שלי באימייל'; +$lang['Show latest comments first'] = 'הראה את התגובות האחרונות בהתחלה'; +$lang['Show oldest comments first'] = 'הראה את התגובות הישנות ביותר בהתחלה'; +$lang['Someone requested that the password be reset for the following user account:'] = 'מישהו ביקש לאפס סיסמא לחשבון משתמש:'; +$lang['Successfully registered, you will soon receive an email with your connection settings. Welcome!'] = 'נרשמת בהצלחה, בקרוב תקבל אימייל עם פרטי ההתחברות שלך. ברוך הבא!'; $lang['Thank you for registering at %s!'] = 'תודה לך על רישומך אל %s!'; -$lang['The passwords do not match'] = 'הסיסמה לא תואמת'; -$lang['To reset your password, visit the following address:'] = 'כנס לכתובת הבאה, כדי לאפס את סיסמתך'; -$lang['User "%s" has no email address, password reset is not possible'] = 'למשתמש ״%s" אין כתובת אימייל, שיחזור סיסמה לא אפשרי'; +$lang['The passwords do not match'] = 'הסיסמאות לא תואמות'; +$lang['To reset your password, visit the following address:'] = 'לאיפוס הסיסמא, הכנס לכתובת הבאה'; +$lang['User "%s" has no email address, password reset is not possible'] = 'למשתמש ״%s" אין כתובת אימייל, לא ניתן לשחזר סיסמא.'; $lang['Username "%s" on gallery %s'] = 'שם משתמש ״%s" בגלריה %s'; $lang['Username modification'] = 'שינוי שם משתמש'; $lang['Username or email'] = 'שם משתמש או אימייל'; $lang['Username: %s'] = 'שם משתמש: %s'; $lang['View in'] = 'צפייה ב'; -$lang['Visits, high → low'] = 'מבקרים, גבוהה %rarr; נמוך'; -$lang['Visits, low → high'] = 'מבקרים, נמוך %rarr; גבוהה'; -$lang['You will receive a link to create a new password via email.'] = 'אתה תקבל לינק אל האימייל שלך כדי ליצור סיסמה חדשה'; -$lang['Your password has been reset'] = 'הסיסמה שלך אופסה'; -$lang['Your username has been successfully changed to : %s'] = 'שם המשתמש שלך שונה בהצלחה אל : %s'; +$lang['Visits, high → low'] = 'ביקורים, גבוה %larr; נמוך'; +$lang['Visits, low → high'] = 'ביקורים, נמוך %larr; גבוה'; +$lang['You will receive a link to create a new password via email.'] = 'אתה תקבל קישור אל האימייל שלך כדי ליצור סיסמא חדשה'; +$lang['Your password has been reset'] = 'הסיסמא שלך אופסה'; +$lang['Your username has been successfully changed to : %s'] = 'שם המשתמש שלך שונה בהצלחה ל: %s'; $lang['large'] = 'L - גדול'; $lang['medium'] = 'M - בינוני'; $lang['small'] = 'S - קטן'; $lang['square'] = 'מרובע'; -$lang['thumb'] = 'תמונה ממוזערת'; +$lang['thumb'] = 'צלמית'; $lang['xlarge'] = 'XL - גדול מאוד'; $lang['xsmall'] = 'XS - קטן מאוד'; $lang['xxlarge'] = 'XXL - ענק'; -$lang['Your website URL is invalid'] = 'כתובת האתר שלך לא טובה'; +$lang['Your website URL is invalid'] = 'כתובת האתר שלך לא תקינה'; $lang['Email address is mandatory'] = 'שדה דואר אלקטרוני חובה'; -$lang['Username is mandatory'] = 'שדה שם משתמש חובה'; +$lang['Username is mandatory'] = 'שם משתמש חובה'; $lang['Website'] = 'אתר'; -$lang['mandatory'] = 'הכרחי'; -$lang['Password is missing. Please enter the password.'] = 'סיסמה חסרה, נה להזין סיסמה..'; -$lang['Password confirmation is missing. Please confirm the chosen password.'] = 'אישור סיסמה חסר, נה להזיר אישור סיסמה..'; +$lang['mandatory'] = 'חובה'; +$lang['Password is missing. Please enter the password.'] = 'סיסמא חסרה. אנא הזן את הסיסמא.'; +$lang['Password confirmation is missing. Please confirm the chosen password.'] = 'אישור סיסמא חסר. אנא אשר את הסיסמא.'; $lang['Last Page'] = 'עמוד אחרון'; -$lang['Theme'] = 'נושא'; +$lang['Theme'] = 'ערכת נושא'; $lang['Go back to the album'] = 'חזור לאלבום'; $lang['First Page'] = 'עמוד ראשון'; $lang['Email'] = 'אימייל'; -$lang['%d photos per page'] = '%d תמונות בעמוד'; +$lang['%d photos per page'] = '%d תמונות לעמוד'; $lang['No results for'] = 'לא נמצאו תוצאות עבור'; $lang['Album name, A → Z'] = 'שם אלבום, A → Z'; $lang['Album name, Z → A'] = 'שם אלבום, Z → A'; -$lang['Apply on properties'] = 'עדכן הגדרות'; +$lang['Apply on properties'] = 'עדכן תכונות'; $lang['Link: %s'] = 'קישור: %s'; $lang['Photo description'] = 'תיאור התמונה'; -$lang['Photo title'] = 'כותרת התמונה'; \ No newline at end of file +$lang['Photo title'] = 'כותרת התמונה'; +$lang['day']['0'] = 'ראשון'; +$lang['day']['1'] = 'שני'; +$lang['day']['2'] = 'שלישי'; +$lang['day']['3'] = 'רביעי'; +$lang['day']['4'] = 'חמישי'; +$lang['day']['5'] = 'שישי'; +$lang['day']['6'] = 'שבת'; \ No newline at end of file diff --git a/sources/language/he_IL/install.lang.php b/sources/language/he_IL/install.lang.php index 3d7de40..898a3a7 100644 --- a/sources/language/he_IL/install.lang.php +++ b/sources/language/he_IL/install.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -46,14 +46,14 @@ $lang['Password [confirm]'] = "סיסמה [אושרה]"; $lang['verification'] = "אימות"; $lang['Need help ? Ask your question on Piwigo message board.'] = "צריך עזרה? היעזר ב הפורום של Piwigo."; $lang['Visitors will be able to contact site administrator with this mail'] = "אורחים יוכלו להשתמש בדואר האלקטרוני הזה כדי ליצור קשר עם מנהל האתר"; -$lang['PHP 5 is required'] = "נדרש גירסת PHP 5"; +$lang['PHP 5 is required'] = 'נדרש גירסת PHP 5.2'; $lang['It appears your webhost is currently running PHP %s.'] = "שרת המארח שלך רץ על גירסת PHP %s."; -$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = "Piwigo תנסה להחליף את התצורה שלך ל PHP 5 על ידי יצירת או שינוי קובץ .htaccess"; +$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo תנסה להחליף את התצורה שלך ל PHP 5.2 על ידי יצירת או שינוי קובץ .htaccess'; $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = "אתה יכול לשנות את התצורה שלך לבד ולהריץ את Piwigo לאחר מכן."; -$lang['Try to configure PHP 5'] = "נסה להגדיר PHP 5"; +$lang['Try to configure PHP 5'] = 'נסה להגדיר PHP 5.2'; $lang['Sorry!'] = "סליחה!"; -$lang['Piwigo was not able to configure PHP 5.'] = "Piwigo לא יכולה להגדיר את PHP 5."; -$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = "אתה צריך לפנות לתמיכת השרת המאחר שלך ולראות איך אתה יכול להחליף ל PHP 5 לבד."; +$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo לא יכולה להגדיר את PHP 5.2'; +$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'אתה צריך לפנות לתמיכת השרת המאחר שלך ולראות איך אתה יכול להחליף ל PHP 5.2 לבד.'; $lang['Hope to see you back soon.'] = "מקווה לראות אותך שוב בקרוב."; $lang['Congratulations, Piwigo installation is completed'] = 'מזל טוב,התקנת Piwigo הושלמה'; $lang['An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning : database.inc.php must only contain what is in the textarea, no line return or space character)'] = 'הפתרון החלופי הוא להעתיק את הטקסט בתיבה מעל ולהדביק אותו בקובץ "local/config/database.inc.php" (אזהרה : database.inc.php חייב להחיל רק את התווים שבתיבת טקסט, לא לחזור על שורות או לעשות רווח)'; diff --git a/sources/language/he_IL/upgrade.lang.php b/sources/language/he_IL/upgrade.lang.php index d1777b9..5d629e8 100644 --- a/sources/language/he_IL/upgrade.lang.php +++ b/sources/language/he_IL/upgrade.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -23,19 +23,18 @@ $lang['Upgrade'] = "שדרג"; $lang['Upgrade from version %s to %s'] = "שדרג מגירסה %s ל %s"; -$lang['Statistics'] = "סטטיסטיקה"; +$lang['Statistics'] = 'סטטיסטיקות'; $lang['total upgrade time'] = "זמן שידרוג כולל"; -$lang['total SQL time'] = "זמןSQLכולל"; -$lang['SQL queries'] = "SQLשאילתות"; +$lang['total SQL time'] = 'זמן SQL כולל'; +$lang['SQL queries'] = 'שאילתות SQL'; $lang['Upgrade informations'] = "מידע לשידרוג"; $lang['User permissions and group permissions have been erased'] = 'הרשאות משתמשים וקבוצות נמחקו'; $lang['Only administrator can run upgrade: please sign in below.'] = 'רק מנהל יכול להריץ שדרוג : בבקשה התחבר למטה'; -$lang['You do not have access rights to run upgrade'] = 'אין לך גישה להפעיל שדרוג'; +$lang['You do not have access rights to run upgrade'] = 'אין לך הרשאות גישה לבצע שדרוג'; $lang['This page proposes to upgrade your database corresponding to your old version of Piwigo to the current version. The upgrade assistant thinks you are currently running a release %s (or equivalent).'] = 'דף זה מציע לשדרג את מסד הנתונים מגרסת Piwigo הישנה לגרסה החדשה. עוזר השדרוג חושב שאתה מפעיל כרגע שחרור %s.'; $lang['Only thumbnails prefix and webmaster mail address have been saved from previous configuration'] = 'רק תמונות ממוזערות, ודואר אלקטרוני של מנהל האתר נשמרו מהגירסה הקודמת'; $lang['Perform a maintenance check in [Administration>Tools>Maintenance] if you encounter any problem.'] = 'בצע בדיקת תחזוקה ב[ ניהול> כלים> תחזוקה] אם נתקלת בעיה כלשהי.'; $lang['As a precaution, following themes have been deactivated. You must check for themes upgrade before reactiving them:'] = 'כאמצעי זהירות הערכות הבאות בוטלו, בדוק עדכונם לפני הפעלתם המחודשת:'; $lang['In %s, before ?>, insert:'] = 'בתוך %s, לפני ?>, הכנס:'; $lang['All sub-albums of private albums become private'] = 'כל אלבומי משנה של אלבומים פרטיים יהפכו לפרטים'; -$lang['As a precaution, following plugins have been deactivated. You must check for plugins upgrade before reactiving them:'] = 'התוספים הבאים בוטלו כאמצעי זהירות, בדוק אפשרות לעדכונם טרם הפעלתם המחודשת:'; -?> \ No newline at end of file +$lang['As a precaution, following plugins have been deactivated. You must check for plugins upgrade before reactiving them:'] = 'התוספים הבאים בוטלו כאמצעי זהירות, בדוק אפשרות לעדכונם טרם הפעלתם המחודשת:'; \ No newline at end of file diff --git a/sources/language/hr_HR/admin.lang.php b/sources/language/hr_HR/admin.lang.php index a9df2cb..318cd89 100644 --- a/sources/language/hr_HR/admin.lang.php +++ b/sources/language/hr_HR/admin.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/language/hr_HR/common.lang.php b/sources/language/hr_HR/common.lang.php index a55ea92..9c01d43 100644 --- a/sources/language/hr_HR/common.lang.php +++ b/sources/language/hr_HR/common.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -22,7 +22,7 @@ // +-----------------------------------------------------------------------+ /* Language Name: Hrvatski [HR] -Version: 2.7.1 +Version: 2.8.2 Language URI: http://piwigo.org/ext/extension_view.php?eid=422 Author: Piwigo team Author URI: http://piwigo.org diff --git a/sources/language/hr_HR/help/index.php b/sources/language/hr_HR/help/index.php index c8de97f..0b96c3e 100644 --- a/sources/language/hr_HR/help/index.php +++ b/sources/language/hr_HR/help/index.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/language/hr_HR/index.php b/sources/language/hr_HR/index.php index c8de97f..0b96c3e 100644 --- a/sources/language/hr_HR/index.php +++ b/sources/language/hr_HR/index.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/language/hr_HR/install.lang.php b/sources/language/hr_HR/install.lang.php index e9f9436..e73c0ea 100644 --- a/sources/language/hr_HR/install.lang.php +++ b/sources/language/hr_HR/install.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -46,14 +46,14 @@ $lang['Password [confirm]'] = 'Zaporka [potvrdi]'; $lang['verification'] = 'ovjera'; $lang['Need help ? Ask your question on Piwigo message board.'] = 'Trebate pomoć? Pitajte na Piwigo message board.'; $lang['Visitors will be able to contact site administrator with this mail'] = 'Posjetitelji će moći pisati upravitelju galerije preko ove adrese'; -$lang['PHP 5 is required'] = 'PHP 5 je obvezan'; +$lang['PHP 5 is required'] = 'PHP 5.2 je obvezan'; $lang['It appears your webhost is currently running PHP %s.'] = 'Čini se da vaše web mjesto trenutno koristi PHP inačicu %s.'; -$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo će pokušati podesiti sustavne postavke na PHP 5 izradom ili prilagodbom .htaccess zapisa.'; +$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo će pokušati podesiti sustavne postavke na PHP 5.2 izradom ili prilagodbom .htaccess zapisa.'; $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'Ne zaboravite da možete i sami promijeniti postavke te potom ponovo pokrenuti Piwigo.'; -$lang['Try to configure PHP 5'] = 'Pokušaj podešavanja PHP 5'; +$lang['Try to configure PHP 5'] = 'Pokušaj podešavanja PHP 5.2'; $lang['Sorry!'] = 'Nažalost!'; -$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo nije u mogućnosti podesiti PHP 5.'; -$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Trebate se obratiti vašem davatelju usluge smještaja za upute na koji se način možete prebaciti na PHP 5 samostalno.'; +$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo nije u mogućnosti podesiti PHP 5.2'; +$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Trebate se obratiti vašem davatelju usluge smještaja za upute na koji se način možete prebaciti na PHP 5.2 samostalno.'; $lang['Hope to see you back soon.'] = 'Do skorog viđenja.'; $lang['Congratulations, Piwigo installation is completed'] = 'Čestitamo, Piwigo ugradnja je dovršena'; $lang['An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning : database.inc.php must only contain what is in the textarea, no line return or space character)'] = 'Druga mogućnost je da kopirate tekst u prostoru poviše i prebacite ga u zapis "local/config/database.inc.php" (Pozor :u database.inc.php smije se prebaciti samo tekst iz kućice bez znakova novog reda ili praznog prostora)'; @@ -63,5 +63,4 @@ $lang['You can download the config file and upload it to local/config directory $lang['Just another Piwigo gallery'] = 'Samo još jedna Piwigo galerija'; $lang['Welcome to my photo gallery'] = 'Dobrodošli u moju fotogaleriju'; $lang['Don\'t hesitate to consult our forums for any help : %s'] = 'Ukoliko trebate pomoć slobodno pitajte na forumu: %s'; -$lang['Welcome to your new installation of Piwigo!'] = 'Dobrodošli na vašu novu Piwigo instalaciju!'; -?> \ No newline at end of file +$lang['Welcome to your new installation of Piwigo!'] = 'Dobrodošli na vašu novu Piwigo instalaciju!'; \ No newline at end of file diff --git a/sources/language/hr_HR/upgrade.lang.php b/sources/language/hr_HR/upgrade.lang.php index 0f25b86..ae82e40 100644 --- a/sources/language/hr_HR/upgrade.lang.php +++ b/sources/language/hr_HR/upgrade.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/language/hu_HU/admin.lang.php b/sources/language/hu_HU/admin.lang.php index 37d9292..01a2a27 100644 --- a/sources/language/hu_HU/admin.lang.php +++ b/sources/language/hu_HU/admin.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -985,4 +985,13 @@ $lang['Empty caddie'] = 'Üres kosár'; $lang['The settings for the guest are from the %s user'] = 'A vendég beállításai a %s fekhasználótól'; $lang['Upload in progress'] = 'Feltöltés folyamatban'; $lang['based on'] = 'erre alapozva:'; -$lang['No and unlock sub-albums'] = 'Nem és al-albumok feloldása'; \ No newline at end of file +$lang['No and unlock sub-albums'] = 'Nem és al-albumok feloldása'; +$lang['Delete %d orphan photos'] = 'Az %d árva képek törlése'; +$lang['Each email sent will contain its own automatic authentication key on links, valid for %s.'] = 'Minden küldött e-mail tartalmazni fogja a saját automatikus érvényesítő kulcsát hivatkozásként. Eddig érvényes: %s.'; +$lang['Edit user'] = 'Felhasználó szerkesztése'; +$lang['For security reason, authentication keys do not work for administrators.'] = 'Biztonsági okok miatt az érvényesítő kulcsok nem működnek az adminisztrátoroknál.'; +$lang['No recipient selected'] = 'Nincs címzett kiválasztva'; +$lang['No user is permitted to see this private album'] = 'Nincs felhasználó, aki láthatná ezt a személyes albumot.'; +$lang['Orphans'] = 'Árvák'; +$lang['Recipients'] = 'Címzettek'; +$lang['Y Repeat'] = 'Y ismétlődés'; \ No newline at end of file diff --git a/sources/language/hu_HU/common.lang.php b/sources/language/hu_HU/common.lang.php index 386d5d1..fbfee9b 100644 --- a/sources/language/hu_HU/common.lang.php +++ b/sources/language/hu_HU/common.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -22,7 +22,7 @@ // +-----------------------------------------------------------------------+ /* Language Name: Magyar [HU] -Version: 2.7.1 +Version: 2.8.2 Language URI: http://piwigo.org/ext/extension_view.php?eid=423 Author: Piwigo team Author URI: http://piwigo.org @@ -429,4 +429,5 @@ $lang['Photo title'] = 'Kép címe'; $lang['Album name, A → Z'] = 'Album név, A → Z'; $lang['Album name, Z → A'] = 'Album név, Z → A'; $lang['No results for'] = 'Nincs eredmény'; -$lang['Link: %s'] = 'Hivatkozás: %s'; \ No newline at end of file +$lang['Link: %s'] = 'Hivatkozás: %s'; +$lang['Your authentication key is no longer valid.'] = 'A hitelesítési kulcsod már nem érvényes.'; \ No newline at end of file diff --git a/sources/language/hu_HU/help/index.php b/sources/language/hu_HU/help/index.php index c8de97f..0b96c3e 100644 --- a/sources/language/hu_HU/help/index.php +++ b/sources/language/hu_HU/help/index.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/language/hu_HU/help/photos_add_ftp.html b/sources/language/hu_HU/help/photos_add_ftp.html index 96bd6d2..95d60ed 100644 --- a/sources/language/hu_HU/help/photos_add_ftp.html +++ b/sources/language/hu_HU/help/photos_add_ftp.html @@ -27,39 +27,34 @@ Gratulálunk, ezzel létrehoztad az első album képtárat.

    A mappák és albumok listája a Piwigo "galeries" könyvtárban. Itt következik a könyvtárfa egy kis galériáról, (de számos funkcióval):

    -
    -.
-|-- admin
-|-- doc
-|-- galleries
-|   |-- category-1
-|   |   |-- category-1.1
-|   |   |   |-- category-1.1.1
-|   |   |   |   |-- category-1.1.1.1
-|   |   |   |   |   |-- pwg_high
-|   |   |   |   |   |   +-- wedding.jpg
-|   |   |   |   |   |-- thumbnail
-|   |   |   |   |   |   +-- TN-wedding.jpg
-|   |   |   |   |   +-- wedding.jpg
-|   |   |   |   +-- category-1.1.1.2
-|   |   |   +-- category-1.1.2
-|   |   |-- category-1.2
-|   |   |   |-- pookie.jpg
-|   |   |   +-- thumbnail
-|   |   |       +-- TN-pookie.jpg
-|   |   +-- category-1.3
-|   +-- category-2
-|       |-- piglet.gif
-|       |-- pwg_representative
-|       |   +-- video.jpg
-|       |-- thumbnail
-|       |   +-- TN-piglet.jpg
-|       +-- video.avi
-|-- include
-|-- install
-|-- language
-|-- template
-+-- tool
    + 
    +galleries
+|-- wedding
+|   |-- celebration
+|   |   |-- arrival
+|   |   |   |-- paul-alone.jpg
+|   |   |   +-- sarah-alone.jpg
+|   |   +-- departure
+|   |       +-- paul-and-sarah.jpg
+|   +-- party
+|       |-- dancers001.jpg
+|       |-- dancers002.jpg
+|       +-- dancers003.jpg
++-- honeymoon
+|   |-- hotel.png
+|   |-- video-from-plane.avi
+|   +-- pwg_representative
+|       +-- video-from-plane.jpg
++-- photoshoot
+    |-- img0001.jpg
+    |-- img0002.jpg
+    +-- pwg_format
+        |-- img0001.cr2
+        |-- img0001.cmyk.jpg
+        |-- img0001.zip
+        |-- img0002.cr2
+        +-- img0002.cmyk.jpg
+
    @@ -80,6 +75,8 @@ Gratulálunk, ezzel létrehoztad az első album képtárat. alapértelmezés szerint a fájl kiterjesztéséhez illeszkedő ikon jelenik meg. Az ilyen fájlokhoz hozzárendelhető egy bélyegkép fájl (lásd a fenti példában a video.avi fájlt). +
  • Multiple formats: a photo can be available in several formats. In this example, we have 3 additional formats for img0001.jpg. You can activate this feature with $conf['enable_formats'] = true; in your local configuration and define a list of formats, like $conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');
    • +
  • Figyelem: a könyvtárak és fájlok nevei csak betűket és számokat, valamint a következő karaktereket tartalmazhatják: "-", "_" vagy ".". Nem lehet üres hely és soremelés karakter.
    • diff --git a/sources/language/hu_HU/index.php b/sources/language/hu_HU/index.php index c8de97f..0b96c3e 100644 --- a/sources/language/hu_HU/index.php +++ b/sources/language/hu_HU/index.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/language/hu_HU/install.lang.php b/sources/language/hu_HU/install.lang.php index c153556..cb644ac 100644 --- a/sources/language/hu_HU/install.lang.php +++ b/sources/language/hu_HU/install.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -46,13 +46,13 @@ $lang['Password [confirm]'] = 'Jelszó [megerősítés]'; $lang['verification'] = 'jelszó egyezőségének ellenőrzése'; $lang['Need help ? Ask your question on Piwigo message board.'] = 'Segítségre van szüksége ? Kérdéseit itt teheti fel: Piwigo üzenőfal.'; $lang['Visitors will be able to contact site administrator with this mail'] = 'A látogatók ezen az e-mail címen tudják felvenni a kapcsolatot az adminisztrátorral'; -$lang['PHP 5 is required'] = 'PHP 5 szükséges'; +$lang['PHP 5 is required'] = 'PHP 5.2 szükséges'; $lang['It appears your webhost is currently running PHP %s.'] = 'Úgy tűnik, a tárhelyszolgáltatójánál jelenleg futó PHP %s.'; -$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo megpróbálhatja bekapcsolni a PHP 5-öt azáltal, hogy létrehoz vagy módosít egy .htaccess fájlt.'; +$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo megpróbálhatja bekapcsolni a PHP 5.2-öt azáltal, hogy létrehoz vagy módosít egy .htaccess fájlt.'; $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'Figyelem: Ha meg tudja változtatni a PHP konfigurációt, indítsa újra a Piwigot.'; -$lang['Try to configure PHP 5'] = 'Próbálja meg beállítani a PHP 5-öt'; +$lang['Try to configure PHP 5'] = 'Próbálja meg beállítani a PHP 5.2-öt'; $lang['Sorry!'] = 'Elnézést!'; -$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo nem tudta beállítani a PHP 5-öt.'; +$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo nem tudta beállítani a PHP 5.2-öt.'; $lang["You may referer to your hosting provider's support and see how you could switch to PHP 5 by yourself."] = "Lehet, hogy a tárhely szolgáltató támogatja a PHP 5-öt. A bekapcsoláshoz keresse meg őket."; $lang['Hope to see you back soon.'] = 'Remélem később viszontlátjuk.'; $lang['Congratulations, Piwigo installation is completed'] = 'Gratulálunk, a Piwigo telepítése sikeresen befejeződött'; @@ -65,4 +65,4 @@ $lang['Welcome to my photo gallery'] = 'Üdvözöljük a képgalériában'; $lang['Don\'t hesitate to consult our forums for any help : %s'] = 'Kérdése van? Keresse fel fórumunkat: %s'; $lang['Welcome to your new installation of Piwigo!'] = 'Köszönt a frissen telepített Piwigo galéria!'; $lang['localhost or other, supplied by your host provider'] = 'localhost vagy egyéb, a fogadó szolgáltató által megadott'; -?> \ No newline at end of file +$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Lehet, hogy a tárhely szolgáltató támogatja a PHP 5.2-öt. A bekapcsoláshoz keresse meg őket.'; \ No newline at end of file diff --git a/sources/language/hu_HU/upgrade.lang.php b/sources/language/hu_HU/upgrade.lang.php index b2dfd45..85928e7 100644 --- a/sources/language/hu_HU/upgrade.lang.php +++ b/sources/language/hu_HU/upgrade.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/language/id_ID/common.lang.php b/sources/language/id_ID/common.lang.php index 262d0bc..471277a 100644 --- a/sources/language/id_ID/common.lang.php +++ b/sources/language/id_ID/common.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -22,7 +22,7 @@ // +-----------------------------------------------------------------------+ /* Language Name: Bahasa Indonesia [ID] -Version: 2.7.0 +Version: 2.8.2 Language URI: http://piwigo.org/ext/extension_view.php?eid=707 Author: Piwigo team Author URI: http://piwigo.org @@ -416,4 +416,15 @@ $lang['About'] = 'Tentang'; $lang['About Piwigo'] = 'Tentang Piwigo'; $lang['Accelerate diaporama speed'] = 'Tingkatkan kecepatan guliran gambar '; $lang['Add a comment'] = 'Tambahkan sebuah komentar'; -?> \ No newline at end of file +$lang['%d photos per page'] = '%d foto per halaman'; +$lang['Album name, A → Z'] = 'Nama album, A &arr; Z'; +$lang['Album name, Z → A'] = 'Nama album, Z &arr; A'; +$lang['Apply on properties'] = 'Terapkan ke properti'; +$lang['Link: %s'] = 'Tautan: %s'; +$lang['No results for'] = 'Tidak ada hasil untuk'; +$lang['Password confirmation is missing. Please confirm the chosen password.'] = 'Konfirmasi kata sandi terlewatkan. Harap konfirmasi kata sandi yang dipilih.'; +$lang['Password is missing. Please enter the password.'] = 'Kata sandi terlewat. Harap masukkan kata sandi.'; +$lang['Photo description'] = 'Deskripsi Foto'; +$lang['Photo title'] = 'Judul foto'; +$lang['Theme'] = 'Tema'; +$lang['Your authentication key is no longer valid.'] = 'Kunci otentikasi tidak lagi berlaku.'; \ No newline at end of file diff --git a/sources/language/id_ID/index.php b/sources/language/id_ID/index.php index ece5850..0837249 100644 --- a/sources/language/id_ID/index.php +++ b/sources/language/id_ID/index.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/language/id_ID/install.lang.php b/sources/language/id_ID/install.lang.php new file mode 100644 index 0000000..d863ace --- /dev/null +++ b/sources/language/id_ID/install.lang.php @@ -0,0 +1,49 @@ +Piwigo message board.'] = 'Butuh bantuan? Ajukan pertannyaan anda ke Piwigo message board.'; +$lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'Catat bahwa anda dapat mengubah pengaturan anda sendiri kemudian mulai ulang Piwigo.'; +$lang['PHP 5 is required'] = 'PHP 5.2 diperlukan'; +$lang['Password ']['confirm'] = 'Kata sandi [konfirmasi]'; +$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo mungkin akan mencoba mengganti pengaturan anda ke PHP 5.2 dengan membuat atau mengubah sebuah berkan .httaccess'; +$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo tidak dapat mengatur PHP 5.2'; +$lang['Sorry!'] = 'Maaf!'; +$lang['Start Install'] = 'Mulai pemasangan'; +$lang['Try to configure PHP 5'] = 'Cobalah untuk mengatur PHP 5.2'; +$lang['User'] = 'Pengguna'; +$lang['Visitors will be able to contact site administrator with this mail'] = 'Pengunjung akan dapat menggunakan email ini untuk menghubungi administrator situs'; +$lang['Welcome to my photo gallery'] = 'Selamat datang ke foto galeriku'; +$lang['Welcome to your new installation of Piwigo!'] = 'Selamat datang ke instalasi baru dari Piwigo!'; +$lang['Admin configuration'] = 'Pengaturan administrasi'; +$lang['Basic configuration'] = 'Pengaturan dasar'; +$lang['Can\'t connect to server'] = 'Tidak dapat terhubung ke server'; +$lang['Congratulations, Piwigo installation is completed'] = 'Selamat, Instalasi piwigo telah selesai'; +$lang['Connection to server succeed, but it was impossible to connect to database'] = 'Koneksi ke server berhasil, tetapi koneksi ke database tidak memungkinkan.'; +$lang['Creation of config file local/config/database.inc.php failed.'] = 'Pembuatan berkas pengaturan local/config.database.inc.php gagal.'; +$lang['Database configuration'] = 'Pengaturan database'; +$lang['Database name'] = 'Nama database'; +$lang['Database table prefix'] = 'Prefiks tabel database'; +$lang['Don\'t hesitate to consult our forums for any help : %s'] = 'Jangan ragu untuk berkosultasi ke forum kami untuk bantuan apapun: %s'; +$lang['Download the config file'] = 'Unduh berkas pengaturan'; +$lang['Hope to see you back soon.'] = 'Berharap akan bertemu anda kembali.'; +$lang['Installation'] = 'Pemasangan'; \ No newline at end of file diff --git a/sources/language/index.php b/sources/language/index.php index c8de97f..0b96c3e 100644 --- a/sources/language/index.php +++ b/sources/language/index.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/language/is_IS/common.lang.php b/sources/language/is_IS/common.lang.php index 79b9c0f..3325d5c 100644 --- a/sources/language/is_IS/common.lang.php +++ b/sources/language/is_IS/common.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -22,7 +22,7 @@ // +-----------------------------------------------------------------------+ /* Language Name: Íslenska [IS] -Version: 2.7.0 +Version: 2.8.2 Language URI: http://piwigo.org/ext/extension_view.php?eid=518 Author: Piwigo team Author URI: http://piwigo.org diff --git a/sources/language/is_IS/index.php b/sources/language/is_IS/index.php index c8de97f..0b96c3e 100644 --- a/sources/language/is_IS/index.php +++ b/sources/language/is_IS/index.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/language/it_IT/admin.lang.php b/sources/language/it_IT/admin.lang.php index ea0bdde..990cf8c 100644 --- a/sources/language/it_IT/admin.lang.php +++ b/sources/language/it_IT/admin.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -982,4 +982,14 @@ $lang['file name'] = 'nome file'; $lang['date & time'] = 'data e ora'; $lang['width & height'] = 'larghezza e altezza'; $lang['No and unlock sub-albums'] = 'No e sbloccare sub-albums'; -$lang['Upload in progress'] = 'Trasferimento in corso...'; \ No newline at end of file +$lang['Upload in progress'] = 'Trasferimento in corso...'; +$lang['Delete %d orphan photos'] = 'Cancellazione di %d foto orfane'; +$lang['Each email sent will contain its own automatic authentication key on links, valid for %s.'] = 'Ogni Email inviata conterrà una propria chiave di autenticazione automatica, valida per %s.'; +$lang['Edit user'] = 'Modificare utente'; +$lang['For security reason, authentication keys do not work for administrators.'] = 'Per motivi di sicurezza, le chiavi di autenticazione non funzionano per gli amministratori.'; +$lang['No recipient selected'] = 'Nessun destinatario selezionato'; +$lang['No user is permitted to see this private album'] = 'Nessun utente è autorizzato a visualizzare questo album privato'; +$lang['Orphans'] = 'Orfane'; +$lang['Recipients'] = ' +Destinatari'; +$lang['Y Repeat'] = 'Y Ripeti'; \ No newline at end of file diff --git a/sources/language/it_IT/common.lang.php b/sources/language/it_IT/common.lang.php index e291d64..deb9c7e 100644 --- a/sources/language/it_IT/common.lang.php +++ b/sources/language/it_IT/common.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -22,7 +22,7 @@ // +-----------------------------------------------------------------------+ /* Language Name: Italiano [IT] -Version: 2.7.0 +Version: 2.8.2 Language URI: http://piwigo.org/ext/extension_view.php?eid=424 Author: Piwigo team Author URI: http://piwigo.org @@ -424,4 +424,5 @@ $lang['Photo description'] = 'Descrizione foto'; $lang['Photo title'] = 'Titolo foto'; $lang['Album name, A → Z'] = 'Nome album, A → Z'; $lang['Album name, Z → A'] = 'Nome album, Z → A'; -$lang['Link: %s'] = 'Link: %s'; \ No newline at end of file +$lang['Link: %s'] = 'Link: %s'; +$lang['Your authentication key is no longer valid.'] = 'La chiave di autenticazione non è più valida'; \ No newline at end of file diff --git a/sources/language/it_IT/help/index.php b/sources/language/it_IT/help/index.php index c8de97f..0b96c3e 100644 --- a/sources/language/it_IT/help/index.php +++ b/sources/language/it_IT/help/index.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/language/it_IT/help/photos_add_ftp.html b/sources/language/it_IT/help/photos_add_ftp.html index 8e5001f..3d2fb0e 100644 --- a/sources/language/it_IT/help/photos_add_ftp.html +++ b/sources/language/it_IT/help/photos_add_ftp.html @@ -43,11 +43,20 @@ galleries |-- video-decollo-aereo.avi +-- pwg_representative +-- video-decollo-aereo.jpg ++-- photoshoot + |-- img0001.jpg + |-- img0002.jpg + +-- pwg_format + |-- img0001.cr2 + |-- img0001.cmyk.jpg + |-- img0001.zip + |-- img0002.cr2 + +-- img0002.cmyk.jpg -
  • Ad eccezione di "pwg_representative", ogni directory inserita in "galleries" genera un album. Il numero di livelli (profondità) è illimitato.
    • +
  • Ad eccezione di "pwg_representative" and "pwg_format", ogni directory inserita in "galleries" genera un album. Il numero di livelli (profondità) è illimitato.
  • Una foto è invece rappresentata da un file. Un file può essere una foto di Piwigo se la sua estensione è presente tra le possibilità previste nel parametro di configuarzione file_ext (vedi file include/config.inc.php). Un file è considerato come una foto @@ -60,6 +69,8 @@ all'estensione del file. In modo opzionale, è possibile associare una miniatura ed un file rappresentativo (come per il file video-decollaggio-aereo.avi nell'esempio proposto).
    • +
  • Multiple formats: a photo can be available in several formats. In this example, we have 3 additional formats for img0001.jpg. You can activate this feature with $conf['enable_formats'] = true; in your local configuration and define a list of formats, like $conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');
    • +
  • Attenzione: il nome di una directory o di un file deve essere composto da lettere, numeri o simboli come "-", "_" o ".". Non utilizzate spazio e caratteri accentati.
    • diff --git a/sources/language/it_IT/index.php b/sources/language/it_IT/index.php index ece5850..0837249 100644 --- a/sources/language/it_IT/index.php +++ b/sources/language/it_IT/index.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/language/it_IT/install.lang.php b/sources/language/it_IT/install.lang.php index bdd31be..ec790e7 100644 --- a/sources/language/it_IT/install.lang.php +++ b/sources/language/it_IT/install.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -47,14 +47,14 @@ $lang['Password [confirm]'] = 'Password [confermare]'; $lang['verification'] = 'verifica'; $lang['Need help ? Ask your question on Piwigo message board.'] = 'Avete bisogno di aiuto? Visitate il forum di Piwigo.'; $lang['Visitors will be able to contact site administrator with this mail'] = 'I visitatori saranno in grado di contattarvi usando questa email'; -$lang['PHP 5 is required'] = 'E\' richiesto PHP 5'; +$lang['PHP 5 is required'] = 'E\' richiesto PHP 5.2'; $lang['It appears your webhost is currently running PHP %s.'] = 'Sembra che la versione PHP del vostro server sia %s.'; -$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo tenterà di cambiare la configurazione di PHP 5 creando o modificando il file .htaccess.'; +$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo tenterà di cambiare la configurazione di PHP 5.2 creando o modificando il file .htaccess.'; $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'Nota: potete cambiare manualmente la configurazione PHP e poi riavviare Piwigo.'; -$lang['Try to configure PHP 5'] = 'Provare a configurare PHP 5'; +$lang['Try to configure PHP 5'] = 'Provare a configurare PHP 5.2'; $lang['Sorry!'] = 'Spiacente!'; -$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo non è stato in grado di configurare PHP 5.'; -$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Si consiglia di fare riferimento al supporto del vostro provider di hosting e vedere come potete passare a PHP 5 da soli.'; +$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo non è stato in grado di configurare PHP 5.2'; +$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Si consiglia di fare riferimento al supporto del vostro provider di hosting e vedere come potete passare a PHP 5.2 da soli.'; $lang['Hope to see you back soon.'] = 'Speriamo di rivedervi presto.'; $lang['Congratulations, Piwigo installation is completed'] = 'Congratulazioni, l\'installazione di Piwigo è completata'; $lang['An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning : database.inc.php must only contain what is in the textarea, no line return or space character)'] = 'Una soluzione alternativa è quella di copiare il testo della casella sopra e incollarlo nel file "local/config/database.inc.php" (Attenzione: database.inc.php deve contenere solo quello che c\'è nel box sopra, senza nessun ritorno a capo o spazio)'; @@ -64,5 +64,4 @@ $lang['You can download the config file and upload it to local/config directory $lang['Just another Piwigo gallery'] = 'Una galleria Piwigo in più '; $lang['Welcome to my photo gallery'] = 'Benvenuti nella mia galleria fotografica'; $lang['Welcome to your new installation of Piwigo!'] = 'Benvenuti sulla vostra nuova installazione di Piwigo!'; -$lang['Don\'t hesitate to consult our forums for any help : %s'] = 'Non esitate a consultare i nostri forum se avete un qualunque problema: %s'; -?> \ No newline at end of file +$lang['Don\'t hesitate to consult our forums for any help : %s'] = 'Non esitate a consultare i nostri forum se avete un qualunque problema: %s'; \ No newline at end of file diff --git a/sources/language/it_IT/upgrade.lang.php b/sources/language/it_IT/upgrade.lang.php index fc18a60..5a22061 100644 --- a/sources/language/it_IT/upgrade.lang.php +++ b/sources/language/it_IT/upgrade.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/language/ja_JP/admin.lang.php b/sources/language/ja_JP/admin.lang.php index 60a3855..6a95fc0 100644 --- a/sources/language/ja_JP/admin.lang.php +++ b/sources/language/ja_JP/admin.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -67,10 +67,10 @@ $lang['Database'] = 'データベース'; $lang['Deactivate'] = '無効化'; $lang['Delete Representant'] = 'アルバムのサムネイルを削除する'; $lang['Delete selected tags'] = '選択したタグを削除する'; -$lang['Delete selected users'] = '選択したユーザを削除する'; +$lang['Delete selected users'] = '選択したユーザーを削除する'; $lang['Deletions'] = '削除'; $lang['Deny selected groups'] = '選択したグループを拒否する'; -$lang['Deny selected users'] = '選択したユーザを拒否する'; +$lang['Deny selected users'] = '選択したユーザーを拒否する'; $lang['Description'] = '説明'; $lang['Display options'] = '表示オプション'; $lang['Dissociated'] = '関連なし'; @@ -157,14 +157,14 @@ $lang['Tag selection'] = 'タグ選択'; $lang['The %d following tags were deleted'] = '次の %d 件のタグが削除されました。'; $lang['Uninstall'] = 'アンインストール'; $lang['Use the default photo sort order'] = 'デフォルトのイメージ並び順を使用する'; -$lang['User comments validation'] = 'ユーザコメント承認'; -$lang['Users'] = 'ユーザ'; +$lang['User comments validation'] = 'ユーザーコメント承認'; +$lang['Users'] = 'ユーザー'; $lang['Validate'] = '承認'; $lang['Validation'] = '承認'; $lang['Version'] = 'バージョン'; $lang['Virtual albums to move'] = '移動するバーチャルアルバム'; $lang['Virtual album name'] = 'バーチャルアルバム名'; -$lang['Webmaster cannot be deleted'] = 'ウェブマスタは削除できません。'; +$lang['Webmaster cannot be deleted'] = 'ウェブマスターは削除できません。'; $lang['You are running on development sources, no check possible.'] = 'あなたは開発版を使用しているため、チェックすることはできません。'; $lang['You cannot delete your account'] = "あなた自身のアカウントを削除できません。"; $lang['You cannot move an album in its own sub album'] = 'あなたは、アルバムをサブアルバムに移動できません。'; @@ -219,9 +219,9 @@ $lang['Execution time is out, treatment must be continue [Estimated time: %d sec $lang['Execution time is out, treatment must be continue [Estimated time: %d seconds].'] = '実行時間が終了しました。処理を継続します [予想時間: %d 秒].'; $lang['Prepared time for list of users to send mail is limited. Others users are not listed.'] = 'メール送信するユーザリストのユーザ数が制限されています。他のユーザは、リストに含まれていません。'; $lang['Time to send mail is limited. Others mails are skipped.'] = 'メール送信時間が制限されています。他のメールはスキップされます。'; -$lang['To send ?'] = '送信?'; +$lang['To send ?'] = '送信しますか?'; $lang['Last send'] = '最終送信'; -$lang['User'] = 'ユーザ'; +$lang['User'] = 'ユーザー'; $lang['See you soon,'] = 'それでは '; $lang['Go to'] = '移動 '; $lang['Hello'] = 'こんにちは '; @@ -267,23 +267,23 @@ $lang['Subscribe'] = '購読'; $lang['Parameters'] = 'パラメータ'; $lang['Select recipients'] = '受信者の選択'; $lang['Subscribe/unsubscribe users'] = 'ユーザの購読登録/購読解除'; -$lang['Unsubscribed'] = '購読なし'; +$lang['Unsubscribed'] = '購読解除'; $lang['%d parameter was updated.'] = '%d 件のパラメータが更新されました。'; $lang['%d parameters were updated.'] = '%d 件のパラメータが更新されました。'; $lang['%d user was not updated.'] = '%d 名のユーザが更新されませんでした。'; $lang['%d users were not updated.'] = '%d 名のユーザが更新されませんでした。'; -$lang['User %s [%s] was removed from the subscription list.'] = 'ユーザ %s [%s] は、購読リストから削除されました。'; -$lang['User %s [%s] was added to the subscription list.'] = 'ユーザ %s [%s] は、購読リストに追加されました。'; +$lang['User %s [%s] was removed from the subscription list.'] = 'ユーザー %s [%s] は、購読リストから削除されました。'; +$lang['User %s [%s] was added to the subscription list.'] = 'ユーザー %s [%s] は、購読リストに追加されました。'; $lang['%d user was updated.'] = '%d 名のユーザが更新されました。'; $lang['%d users were updated.'] = '%d 名のユーザが更新されました。'; -$lang['User %s [%s] was not removed from the subscription list.'] = 'ユーザ %s [%s] は、購読リストから削除されませんでした。'; -$lang['User %s [%s] was not added to the subscription list.'] = 'ユーザ %s [%s] は、購読リストに追加されませんでした。'; -$lang['User %s [%s] added.'] = 'ユーザ %s [%s] が追加されました。'; -$lang['Warning: subscribing or unsubscribing will send mails to users'] = '注意: 購読登録または購読解除の設定は、ユーザ宛にメール通知されます。'; -$lang['Send mail on HTML format'] = 'HTMLフォーマットでメールを送信する'; +$lang['User %s [%s] was not removed from the subscription list.'] = 'ユーザー %s [%s] は、購読リストから削除されませんでした。'; +$lang['User %s [%s] was not added to the subscription list.'] = 'ユーザー %s [%s] は、購読リストに追加されませんでした。'; +$lang['User %s [%s] added.'] = 'ユーザー %s [%s] が追加されました。'; +$lang['Warning: subscribing or unsubscribing will send mails to users'] = '注意: 購読登録または購読解除の設定は、ユーザー宛にメール通知されます。'; +$lang['Send mail on HTML format'] = 'HTML形式でメールを送信する'; $lang['Include display of recent photos grouped by dates'] = '最近の写真グループの日付ごとの表示を含む'; $lang['Available only with HTML format'] = 'HTMLフォーマットのみ利用可'; -$lang['no write access'] = 'アクセス権なし'; +$lang['no write access'] = '書き込み権限なし'; $lang['Permissions'] = 'パーミッション'; $lang['private'] = 'プライベート'; $lang['public'] = 'パブリック'; @@ -320,7 +320,7 @@ $lang['Album list management'] = 'アルバム管理'; $lang['Piwigo configuration'] = 'Piwigo設定'; $lang['Edit album'] = 'アルバムを編集する'; $lang['Group management'] = 'グループ管理'; -$lang['User list'] = 'ユーザリスト'; +$lang['User list'] = 'ユーザーリスト'; $lang['Database synchronization with files'] = 'ファイルおよびデータベースの同期化'; $lang['all'] = 'すべて'; $lang['height must be a number superior to'] = '高さは、次の値より大きくしてください:'; @@ -361,7 +361,7 @@ $lang['Metadata synchronization results'] = 'メタデータ同期結果'; $lang['only perform a simulation (no change in database will be made)'] = 'シミュレーションのみ実行する (データベースは更新されません)'; $lang['Simulation'] = 'シミュレーション'; $lang['directories + files'] = 'ディレクトリ + ファイル'; -$lang['only directories'] = 'ディレクトリのみ'; +$lang['only directories'] = 'ディレクトリーのみ'; $lang['synchronize files structure with database'] = 'ファイル構造とデータベースを同期化する'; $lang['synchronize files metadata with database photos informations'] = 'ファイルメタデータとデータベースエレメント情報を同期化する'; $lang['even already synchronized photos'] = 'すでに同期化されているエレメントも同期化する'; @@ -370,7 +370,7 @@ $lang['The name of directories and files must be composed of letters, numbers, " $lang['wrong filename'] = 'ファイル名が正しくありません。'; $lang['Upload'] = 'アップロード'; $lang['user "%s" added'] = 'ユーザ "%s" が追加されました。'; -$lang['User status'] = 'ユーザステータス'; +$lang['User status'] = 'ユーザーステータス'; $lang['user_status_admin'] = '管理者'; $lang['user_status_generic'] = '一般'; $lang['user_status_guest'] = 'ゲスト'; @@ -384,7 +384,7 @@ $lang['Advanced features'] = '高度な機能'; $lang['Overall'] = '全体'; $lang['Year'] = '年'; $lang['Month'] = '月'; -$lang['Day'] = '日'; +$lang['Day'] = '曜日'; $lang['Pages seen'] = 'ページ閲覧回数'; $lang['Time'] = '時間'; $lang['IP'] = 'IP'; @@ -438,7 +438,7 @@ $lang['Main "guest" user status is incorrect'] = 'メイン「ゲスト」ユー $lang['Default user does not exist'] = 'デフォルトユーザーが設定されていません。'; $lang['Main "webmaster" user does not exist'] = 'メイン「ウェブマスタ」ユーザーは存在しません。'; $lang['Main "webmaster" user status is incorrect'] = 'メイン「ウェブマスタ」ユーザーステータスが正しくありません。'; -$lang['User "%s" created with "%s" like password'] = 'ユーザ「 %s 」がパスワード「 %s 」で作成されました。'; +$lang['User "%s" created with "%s" like password'] = 'ユーザー「 %s 」がパスワード「 %s 」で作成されました。'; $lang['Status of user "%s" updated'] = 'ユーザ "%s" のステータスが更新されました。'; $lang['add new photos to caddie'] = 'キャディに新しいエレメントを追加する'; $lang['No display'] = '表示なし'; @@ -475,7 +475,7 @@ $lang['Can\'t create temporary file.'] = '一時ファイルを作成できま $lang['Can\'t download archive.'] = 'アーカイブをダウンロードできません。'; $lang['Can\'t read or extract archive.'] = 'アーカイブを読めないか、展開できません。'; $lang['An error occured during extraction (%s).'] = '展開中にエラーが発生しました (%s)。'; -$lang['Please check "plugins" folder and sub-folders permissions (CHMOD).'] = '「プラグイン」フォルダおよびサブフォルダのパーミッションをチェック (CHMOD) してください。'; +$lang['Please check "plugins" folder and sub-folders permissions (CHMOD).'] = '「プラグイン」フォルダおよびサブフォルダのパーミッションをチェックしてください(CHMOD)。'; $lang['Can\'t connect to server.'] = 'サーバに接続できません。'; $lang['Purge compiled templates'] = 'コンパイル済みテンプレートを削除する'; $lang['ACCESS_0'] = 'フリーアクセス'; @@ -529,7 +529,7 @@ $lang['Number of downloads'] = 'ダウンロードの件数'; $lang['Piwigo Announcements Newsletter'] = 'Piwigo のニューズレター'; $lang['Keep in touch with Piwigo project, subscribe to Piwigo Announcement Newsletter. You will receive emails when a new release is available (sometimes including a security bug fix, it\'s important to know and upgrade) and when major events happen to the project. Only a few emails a year.'] = 'Piwigoプロジェットのニュースレターでは、Piwigoの新しいリリース情報やセキュリティ・バグ修正、アップグレードなどについてのお知らせいたします。Piwigoのニュースレターに加入して下さい。'; $lang['Subscribe %s'] = '加入 %s'; -$lang['Subscribe %s to Piwigo Announcements Newsletter'] = ' %s Piwigoのニューズレターを加入する'; +$lang['Subscribe %s to Piwigo Announcements Newsletter'] = ' %s Piwigoのニューズレターを購読する'; $lang['Purge search history'] = 'パージ検索履歴'; $lang['Hide'] = '隠す'; $lang['Password is missing. Please enter the password.'] = 'パスワードがありません。パスワードを入力して下さい。'; @@ -547,12 +547,12 @@ $lang['Instructions to use Piwigo'] = 'Piwigoの使い方'; $lang['Installed Themes'] = 'インストールされたテーマ'; $lang['Add New Theme'] = '新しいテーマを追加する'; $lang['Forbid this theme to users'] = 'このテーマをユーザーに禁止する'; -$lang['Set as default theme for unregistered and new users'] = '新しいユーザーや登録されてないユーザーにデフォルト・テーマを設定する'; +$lang['Set as default theme for unregistered and new users'] = '新しいユーザーや登録されてないユーザーにデフォルトのテーマを設定する'; $lang['unknown'] = '不明'; $lang['Upload Photos'] = '写真をアップロードする'; $lang['Drop into album'] = 'アルバムに入れる'; $lang['+ Add an upload box'] = '+ アップロード・ボックスを追加する'; -$lang['Create the "%s" directory at the root of your Piwigo installation'] = ' Piwigoにインストールされている場所の"%s" というディレクトリーに作成してください。'; +$lang['Create the "%s" directory at the root of your Piwigo installation'] = 'Piwigoのインストールされている場所の"%s" というディレクトリーに作成してください。'; $lang['Give write access (chmod 777) to "%s" directory at the root of your Piwigo installation'] = 'Piwigoにインストールされている場所の "%s" というディレクトリーに書き込み(chmod 777)アクセスをする。'; $lang['existing album'] = '存在しているアルバム'; $lang['create a new album'] = '新しいアルバムを作成する'; @@ -616,10 +616,10 @@ $lang['Select:'] = '選択:'; $lang['None'] = 'なし'; $lang['Invert'] = '反転'; $lang['Impossible to deactivate this theme, you need at least one theme.'] = 'このテーマは無効になりません。少なくとも一つのテーマが必要です。'; -$lang['Webmaster status is required.'] = 'ウェッブマスターのステータスが必要'; -$lang['Bound Theme'] = 'バウンドテーマ'; +$lang['Webmaster status is required.'] = 'ウェブマスターのステータスが必要'; +$lang['Bound Theme'] = 'テーマを割り当てる'; $lang['Allow rating'] = 'レーティングを許可する'; -$lang['Select at least one comment'] = '少なくとも一つのコメントを選択して下さい'; +$lang['Select at least one comment'] = '少なくとも1つのコメントを選択して下さい'; $lang['Active Plugins'] = '有効なプラグイン'; $lang['Inactive Plugins'] = '無効なプラグイン'; $lang['Missing Plugins'] = '見つからないプラグイン'; @@ -659,7 +659,7 @@ $lang['Choose an action'] = 'アクションを選択して下さい'; $lang['Activate icon "new" next to albums and pictures'] = 'アルバムと写真のとなりに、\'起動アイコン　"新" があります'; $lang['Deactivate all'] = '全て非活性する'; $lang['Default photos order'] = 'デフォルト写真順番'; -$lang['Delete orphan tags'] = '使われていないタグを削除する'; +$lang['Delete orphan tags'] = '使われていないタグを削除します'; $lang['delete photo'] = '写真を削除する'; $lang['Duplicates'] = '重複'; $lang['Error on file "%s" : %s'] = '"%s"　のファイル・エラー : %s'; @@ -679,7 +679,7 @@ $lang['Include history data (Warning: server memory limit may be exceeded)'] = ' $lang['Unable to dump database.'] = 'ダンプデータベースができません。'; $lang['Update in progress... Please wait.'] = 'アップグレード処理中 ... お待ちください。'; $lang['Update to Piwigo %s'] = 'Piwigo %s にアップグレード'; -$lang['Two updates are available'] = '２個のアップグレードがあります'; +$lang['Two updates are available'] = '2個のアップグレードがあります'; $lang['This is a minor update, with only bug corrections.'] = 'これはマイナーアップグレードだけバグ修正しています。'; $lang['This is a major update, with new exciting features.'] = 'これはメジャーアップグレードで、 いろいろな楽しい新機能がついています。.'; $lang['Some themes and plugins may be not available yet.'] = 'あるテーマとプラグインはまだできていません。'; @@ -718,7 +718,7 @@ $lang['Permission management'] = '権限管理'; $lang['Remove all filters'] = '全てのフィルターを削除'; $lang['Remove from caddie'] = 'キャディーから削除'; $lang['Restore'] = '復元'; -$lang['Set author'] = '作者をセット'; +$lang['Set author'] = '作者を設定'; $lang['Some upgrades are available for extensions.'] = '拡張機能のアップグレードがあります。'; $lang['Type here the author name'] = '作者名を入力してください。'; $lang['Update All'] = '全てをアップデート'; @@ -762,8 +762,8 @@ $lang['top left corner'] = '左上'; $lang['top right corner'] = '右上'; $lang['%s photos can not be regenerated'] = '%s 更新できなかった写真。'; $lang['%s photos have been regenerated'] = '%s 更新できた写真。'; -$lang['Approximate maximum resolution: %dM pixels (that\'s %dx%d pixels).'] = 'おおよその最大レゾリューション：%dM ピクセル (%dx%d ピクセルである).'; -$lang['By default, Piwigo will create a new websize from the HD (high definition) version of your photo.'] = 'デフォルトで、PiwigoがHD（高品位）版の写真より、最新ウェブサイズ版を作成します。'; +$lang['Approximate maximum resolution: %dM pixels (that\'s %dx%d pixels).'] = 'おおよその最大解像度：%dM ピクセル (%dx%d ピクセルである).'; +$lang['By default, Piwigo will create a new websize from the HD (high definition) version of your photo.'] = 'デフォルトで、PiwigoはHD(高品質)版の写真から新しくウェブサイズ版を生成します。'; $lang['Do you want to activate anyway?'] = 'とにかく有効化したいですか？'; $lang['ERROR: THIS PLUGIN IS MISSING BUT IT IS INSTALLED! UNINSTALL IT NOW.'] = 'エラー：このプラグインがありませんが、インストールされています！すぐアンインストールして下さい。'; $lang['Follow Orientation'] = '配向進み'; @@ -809,15 +809,15 @@ $lang['Multiple Size'] = '複数のサイズ'; $lang['Piwigo Publish plugin for Lightroom'] = 'Lightroom 用 Piwigo エクスポートプラグイン'; $lang['Piwigo export plugin for Aperture'] = 'Aperture 用 Piwigo エクスポートプラグイン'; $lang['Piwigo export plugin for iPhoto'] = 'iPhoto 用 Piwigo エクスポートプラグイン'; -$lang['Piwigo for Android'] = 'Piwigo for Android'; -$lang['Piwigo for iOS (iPhone, iPad, iPod Touch)'] = 'Piwigo for iOS (iPhone, iPad, iPod Touch)'; +$lang['Piwigo for Android'] = 'Android用Piwigo'; +$lang['Piwigo for iOS (iPhone, iPad, iPod Touch)'] = 'iOS用Piwigo(iPhone, iPad, iPod Touch)'; $lang['Piwigo publish plugin for Shotwell'] = 'Shotwell 用 Piwigo 公開プラグイン'; $lang['Piwigo publish plugin for digiKam'] = 'digiKam 用 Piwigo 公開プラグイン'; $lang['Predefined filter'] = '定義済みフィルター'; $lang['Select groups...'] = 'グループを選択...'; $lang['Select users...'] = 'ユーザーを選択...'; -$lang['Set creation date'] = 'コレクション日を設定'; -$lang['Sharpen'] = 'シャープ'; +$lang['Set creation date'] = '作成日を設定'; +$lang['Sharpen'] = 'シャープにする'; $lang['The whole page'] = 'ページ全体'; $lang['The whole set'] = 'セット全体'; $lang['This album contains no photo.'] = 'このアルバムには写真がありません。'; @@ -834,13 +834,13 @@ $lang['Generate multiple size images'] = '複数サイズのイメージを作 $lang['Original file : %s'] = 'オリジナルファイル : %s'; $lang['Added by %s'] = '%sで追加されました。'; $lang['Automatic sort order'] = '自動並び替え'; -$lang['By default, the center of interest is placed in the middle of the photo.'] = '写真の真ん中は中心デフォルト'; +$lang['By default, the center of interest is placed in the middle of the photo.'] = 'デフォルトで、関心の中心は写真の中央に合わせます'; $lang['Center of interest'] = '中心'; $lang['No destination tag selected'] = '行き先タグ選択されていません'; $lang['No group is permitted to see this private album'] = 'このプライベートなアルバムを見ることのできるグループはありません'; $lang['No photo in the current set.'] = '現在のセットには写真がありません。'; $lang['No photo selected, %d photos in current set'] = '写真が選択されません。現在のセットに%d枚写真があります。'; -$lang['Orphan tags deleted'] = 'オーファンタグ削除されました。'; +$lang['Orphan tags deleted'] = '使われていないタグが削除されました'; $lang['Photos generation in progress...'] = '写真作成中・・・'; $lang['Posted %s on %s'] = '%sの%s展示されました。'; $lang['Save manual order'] = 'マニュアル順保存します。'; @@ -850,12 +850,12 @@ $lang['The uploaded file was only partially uploaded'] = 'アップロードさ $lang['There is no group in this gallery.'] = 'このガラリにグループがありません。'; $lang['Type in a search term'] = '検索アイテムを入力してください。'; $lang['Visited %d times'] = '%d回見られました。'; -$lang['WARNING! This plugin does not seem to be compatible with this version of Piwigo.'] = '注意！このプラグインがこのPIWIGOのバージョンに合っていません。'; +$lang['WARNING! This plugin does not seem to be compatible with this version of Piwigo.'] = '注意！このプラグインはPiwigoのバージョンに合っていません。'; $lang['Who can see this photo?'] = 'どなたがこの写真を見られますか？'; $lang['With no album'] = 'アルバムなしを含まれます。'; $lang['With no tag'] = 'タグなしを含まれます。'; $lang['With no virtual album'] = 'バーチャル・アルバムが含まれません。'; -$lang['You can activate only one mobile theme.'] = 'モバイル・テーマ一つしか有効できません。'; +$lang['You can activate only one mobile theme.'] = 'モバイル・テーマは1つしか有効化できません。'; $lang['cancel manual order'] = 'マニュアル順を中止します。'; $lang['registered users'] = '登録されているユーザー'; $lang['simple visitors'] = '単ユーザー'; @@ -882,7 +882,7 @@ $lang['Duplicate'] = '重複'; $lang['Duplicate selected tags'] = '選択したタグを複製します'; $lang['Apply watermark if height is bigger than'] = 'これ以上の高さの際にウォーターマークを付ける'; $lang['Apply watermark if width is bigger than'] = 'これ以上の幅の際にウォーターマークを付ける'; -$lang['Adobe Photoshop Lightroom is a photography software designed to manage large quantities of digital images and doing post production work.'] = 'Adobe Photoshop Lightroomは、大量のデジタル画像の管理と、撮影後の仕事のために設計されて写真用ソフトウェアです。'; +$lang['Adobe Photoshop Lightroom is a photography software designed to manage large quantities of digital images and doing post production work.'] = 'Adobe Photoshop Lightroomは、大量のデジタル画像の管理と、撮影後の仕事のために設計された写真用ソフトウェアです。'; $lang['Permission granted for groups'] = 'グループ権限'; $lang['Panorama'] = 'パノラマ'; $lang['Number of albums per page'] = '１ページ当りのアルバム数'; @@ -900,7 +900,7 @@ $lang['Loading...'] = 'ロード中 ...'; $lang['Change password'] = 'パスワードを変える'; $lang['Change username'] = 'ユーザー名を変える'; $lang['Tag "%s" is now a duplicate of "%s"'] = 'タグ "%s"は、現在 "%s"と重複しています'; -$lang['Allow users to add a link to their website'] = 'ユーザは自分のウェブサイトへのリンクを追加できるようにする'; +$lang['Allow users to add a link to their website'] = 'ユーザーは自分のウェブサイトへのリンクを追加できるようにする'; $lang['All %d users are selected'] = '全ての %d ユーザが選択されました'; $lang['Piwigo for iOS application empowers you to connect to your Piwigo gallery from your iPhone, iPad or iPod Touch, create some albums and upload several photos at once.'] = 'Piwigo for iOSアプリは、iPhone、iPad、iPod Touchから、Piwigoギャラリーに接続し、アルバムを作成したり、複数の写真を一括でアップロードしたりできます。'; $lang['Activate it now'] = '今すぐ有効にする'; @@ -917,13 +917,13 @@ $lang['date & time'] = '日付と時刻'; $lang['No matching user found'] = '一致するユーザはみつかりませんでした'; $lang['ReGalAndroid (RemoteGallery client for Android) is an open source (GPL v3) Piwigo client for the Android platform.'] = 'ReGalAndroid (RemoteGallery client for Android)は、Android 携帯/タブレット向けのオープンソース(GPL v3)クライアントソフトです'; $lang['Rename'] = 'リネーム'; -$lang['Select at least one tag'] = '最低１つのタグを選択してください'; +$lang['Select at least one tag'] = '最低1つのタグを選択してください'; $lang['width & height'] = '幅と高さ'; $lang['close'] = '閉じる'; -$lang['User %s added'] = 'ユーザ %s を追加しました'; -$lang['User %s updated'] = 'ユーザ %s を更新しました'; -$lang['Users modified'] = 'ユーザの変更'; -$lang['Update user'] = 'ユーザの更新'; +$lang['User %s added'] = 'ユーザー %s を追加しました'; +$lang['User %s updated'] = 'ユーザー %s を更新しました'; +$lang['Users modified'] = 'ユーザーの変更'; +$lang['Update user'] = 'ユーザーの更新'; $lang['Upload in progress'] = 'アップロード状況'; $lang['Refresh photo set'] = 'フォトセットをリフレッシュ'; $lang['Password updated'] = 'パスワードを更新しました'; @@ -933,4 +933,63 @@ $lang['Mail address is mandatory for registration'] = '登録のために、メ $lang['Empty caddie'] = '空のキャディ'; $lang['%u users have automatic permission because they belong to a granted group.'] = '%u ユーザは、承認されたグループに所属していますので、自動的にパーミッションが付与されます'; $lang['visitors need to login and have the appropriate permissions to see this album'] = 'このアルバムを見るために、ログインをして、パーミッションを得る必要があります。'; -$lang['View in gallery'] = 'ギャラリーで見る'; \ No newline at end of file +$lang['View in gallery'] = 'ギャラリーで見る'; +$lang['Tags %s merged into tag %s'] = 'タグ　%sは、%sにマージされました'; +$lang['digiKam is designed for photographers who want to view, manage, edit, enhance, organize, tag, and share photographs.'] = 'digiKamは、写真を見たり、管理、編集したり、シェアしたりしたい人向けのソフトです。'; +$lang['digiKam is an advanced digital photo management free software for Linux, Windows, and MacOSX.'] = 'digiKam は、洗練された写真管理ソフト（フリーソフト）です。Linux, Windows, Mac OS Xで動作します。'; +$lang['Shotwell is an open source digital photo organizer that runs on Linux. It is the default photo manager in Ubuntu and Fedora.'] = 'Shotwellは、Linux上で動作するオープンソースな写真管理ソフトです。UbuntuやFedoraではデフォルトになっています。'; +$lang['Select at least two tags for merging'] = 'マージするタグを2つ以上選択して下さい'; +$lang['Select a zone with your mouse to define a new center of interest.'] = 'マウスを使って、必要な領域を選択して下さい'; +$lang['include photos with lower privacy level'] = 'プライバシーレベルの低い写真が、含まれています'; +$lang['The uploaded file exceeds the upload_max_filesize directive in php.ini: %sB'] = 'アップロードされたファイルは、php.iniに定められたupload_max_sizeを超過しています: %sB'; +$lang['The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form'] = 'アップロードされたファイルは、HTMLフォームで指定されたMAX_FILE_SIZEディレクティブを超過しています'; +$lang['The settings for the guest are from the %s user'] = 'ゲストの設定は、%sユーザーから設定されています'; +$lang['The picture dimensions will be reduced to %dx%d pixels.'] = '写真は、%dx%dピクセルに縮小されます'; +$lang['The original maximum width must be a number between %d and %d'] = '元の最大の幅は、%dから%dの間の数で指定しなくてはいけません'; +$lang['The original maximum height must be a number between %d and %d'] = '元の最大の高さは、%dから%dの間の数で指定しなくてはいけません'; +$lang['The original image quality must be a number between %d and %d'] = '元の写真の品質は、%dから%dの間の数で指定しなくてはいけません'; +$lang['on the %d selected users'] = '%d人の選択されたユーザー'; +$lang['on the %d selected photos'] = '%d枚の選択された写真'; +$lang['iPhoto is the default photo manager on MacOSX. The Piwigo export plugin let you create new albums and export your photos directly from iPhoto to your Piwigo photo gallery.'] = 'iPhotoはMac OS Xのデフォルトの写真管理ソフトウェアです。Piwigoエクスポートプラグインにより、新しいアルバムを作成し、iPhotoからPiwigoギャラリーに直接エクスポートすることができます'; +$lang['between %s and %s MB'] = '%sから%s MBの間で'; +$lang['based on'] = '元'; +$lang['You have specified $conf[\'order_by\'] in your local configuration file, this parameter in deprecated, please remove it or rename it into $conf[\'order_by_custom\'] !'] = 'ローカルの設定ファイルで$conf[\'order_by\']が指定されています。このパラメーターは古く推奨されません。削除するか、$conf[\'order_by_custom\']に置き換えてください!'; +$lang['You can\'t define a default photo order because you have a custom setting in your local configuration.'] = 'ローカルの設定により、デフォルトの写真の順序を設定できません'; +$lang['Y Repeat'] = 'Y リピート'; +$lang['Type here the name of the new group'] = '新しいグループ名を入力してください'; +$lang['To export your photos from digiKam to Piwigo, simply install digiKam and the Kipi-plugins.'] = 'digikamkからPiwigoに写真をアップロードするには、digikamとKipiプラグインをインストールしてください'; +$lang['This group will be unset to default'] = 'このグループはデフォルトでは使われなくなります'; +$lang['This group will be set to default'] = 'デフォルトでこのグループが使われます'; +$lang['This album contains %d photos, added on %s.'] = 'このアルバムは%d個の写真を含んでいます。%sに追加しました'; +$lang['This album contains %d photos, added between %s and %s.'] = 'このアルバムは%d個の写真を含んでいます。%sと%sの間に追加しました'; +$lang['The uploaded files exceed the post_max_size directive in php.ini: %sB'] = 'アップロードされたファイルは、php.iniに定められたpost_max_sizeを超過しています: %sB'; +$lang['The center of interest is the most meaningful zone in the photo.'] = '関心の中心は、写真で最も重要な意味を持つ領域です'; +$lang['The Piwigo publish Plug-in allows you to export and synchronize photos from Lightroom directly to your Piwigo photo gallery.'] = 'LightroomのPiwigo公開プラグインにより、Piwigoのギャラリーを直接エクスポートし同期させることができます'; +$lang['The Piwigo export plugin allows you to create albums and export photos.'] = 'Piwigoエクスポートプラグインにより、アルバムを作成しエクスポートすることができます'; +$lang['Source tag'] = 'ソースタグ'; +$lang['Showing %s to %s of %s users'] = '%sから%sのユーザーを表示する(全%sユーザー)'; +$lang['Show %s users'] = '%sのユーザーを表示する'; +$lang['Save visits in history for'] = '訪問の履歴を保存する'; +$lang['Restore default configuration. You will lose your plugin settings!'] = 'デフォルトの設定を復元します。プラグインに関する設定は失われます'; +$lang['Resize after upload disabled due to the use of GD as graphic library'] = 'GDを画像ライブラリーとして使用しているためアップロードして拡大縮小する機能は無効化されています'; +$lang['Reset ignored updates'] = '無視したアップデートをリセットする'; +$lang['Registered on %s, %s.'] = '登録日: %s, %s'; +$lang['Rated %d times, score : %.2f'] = '%d回評価され、評価は%.2fです'; +$lang['Recipients'] = '受信者'; +$lang['No recipient selected'] = '受信者が選ばれていません'; +$lang['No user is permitted to see this private album'] = 'このプライベートアルバムを見ることのできるユーザーはいません'; +$lang['No user selected of %d users'] = '%dのユーザーのからユーザーが選ばれていません'; +$lang['No user selected, no action possible.'] = 'ユーザーが選択されていないので、操作できません'; +$lang['On your Linux, simply install Shotwell with your package manager and the activate Piwigo publishing option.'] = 'Linuxでは、Shotwellをパッケージ管理ソフトウェアからインストールすることで、Piwigoに公開するオプションを使うことができます'; +$lang['No and unlock sub-albums'] = 'いいえ。サブアルバムのロックを解除します'; +$lang['Last visit on %s, %s.'] = '最新の訪問日: %s, %s'; +$lang['Impossible to deactivate the default theme.'] = 'デフォルトのテーマを無効化することはできません'; +$lang['If no HD is available and if the current websize is bigger than resize dimensions, Piwigo will move it as HD and create a downsized websize photo from it.'] = 'HD版がない、または、現在のウェブサイズ版がサイズ変更後より大きい場合、Piwigoは、それをHD版とし、それから縮小したウェブサイズ版を作成します'; +$lang['For security reason, authentication keys do not work for administrators.'] = 'セキュリティー上の理由により、管理者は認証キーを使うことはできません'; +$lang['Edit user'] = 'ユーザーを編集する'; +$lang['Each email sent will contain its own automatic authentication key on links, valid for %s.'] = '電子メールは自動認証キーのリンクがあります。%sに対して有効です'; +$lang['Delete %d orphan photos'] = '%dの迷子の写真を削除します'; +$lang['Orphans'] = '迷子'; +$lang['You have %d orphan tags: %s.'] = '%d個の使われていないタグがあります: %s'; +$lang['Aperture is designed for professional photographers with iPhoto simplicity.'] = 'Apartureは、iPhotoのシンプルさを持ったプロの写真家用に設計されたソフトウェアです。'; +$lang['Aperture is a powerful tool to refine images and manage massive libraries on Mac.'] = 'Apartureは、Mac上で写真を調整し、大規模なライブラリーを管理するための強力なツールです。'; \ No newline at end of file diff --git a/sources/language/ja_JP/common.lang.php b/sources/language/ja_JP/common.lang.php index b651594..9eec0d8 100644 --- a/sources/language/ja_JP/common.lang.php +++ b/sources/language/ja_JP/common.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -22,7 +22,7 @@ // +-----------------------------------------------------------------------+ /* Language Name: 日本語 [JP] -Version: 2.7.2 +Version: 2.8.2 Language URI: http://piwigo.org/ext/extension_view.php?eid=425 Author: Piwigo team Author URI: http://piwigo.org @@ -54,7 +54,7 @@ $lang['About'] = 'About'; $lang['All tags'] = 'すべてのタグ'; $lang['Any tag'] = 'すべてのtag'; $lang['At least one listed rule must be satisfied.'] = '少なくともリスト記載ルール1つを満たす必要があります。'; -$lang['Author'] = '撮影者'; +$lang['Author'] = '作成者'; $lang['Albums'] = 'アルバム'; $lang['Album'] = 'アルバム'; $lang['Close this window'] = 'このウィンドウを閉じる'; @@ -424,4 +424,5 @@ $lang['Apply on properties'] = 'プロパティの適用'; $lang['Link: %s'] = 'リンク: %s'; $lang['No results for'] = 'みつかりませんでした。'; $lang['Photo description'] = '写真の説明'; -$lang['Photo title'] = '写真のタイトル'; \ No newline at end of file +$lang['Photo title'] = '写真のタイトル'; +$lang['Your authentication key is no longer valid.'] = 'あなたの認証キーは既に有効ではありません。'; \ No newline at end of file diff --git a/sources/language/ja_JP/help/photos_add_ftp.html b/sources/language/ja_JP/help/photos_add_ftp.html index 23956ed..21336b4 100644 --- a/sources/language/ja_JP/help/photos_add_ftp.html +++ b/sources/language/ja_JP/help/photos_add_ftp.html @@ -26,38 +26,35 @@

    ギャラリーディレクトリは、Piwigoディレクトリ「galleries」にあります。以下、非常に小さな (しかし、多くの特長を持つ) ギャラリーのディレクトリツリーの例です:

    - 
    .
-|-- admin
-|-- doc
-|-- galleries
-|   |-- album-1
-|   |   |-- album-1.1
-|   |   |   |-- album-1.1.1
-|   |   |   |   |-- album-1.1.1.1
-|   |   |   |   |   |-- pwg_high
-|   |   |   |   |   |   +-- wedding.jpg
-|   |   |   |   |   |-- thumbnail
-|   |   |   |   |   |   +-- TN-wedding.jpg
-|   |   |   |   |   +-- wedding.jpg
-|   |   |   |   +-- album-1.1.1.2
-|   |   |   +-- album-1.1.2
-|   |   |-- album-1.2
-|   |   |   |-- pookie.jpg
-|   |   |   +-- thumbnail
-|   |   |       +-- TN-pookie.jpg
-|   |   +-- album-1.3
-|   +-- album-2
-|       |-- piglet.gif
-|       |-- pwg_representative
-|       |   +-- video.jpg
-|       |-- thumbnail
-|       |   +-- TN-piglet.jpg
-|       +-- video.avi
-|-- include
-|-- install
-|-- language
-|-- template
-+-- tool
    + + 
    +galleries
+|-- wedding
+|   |-- celebration
+|   |   |-- arrival
+|   |   |   |-- paul-alone.jpg
+|   |   |   +-- sarah-alone.jpg
+|   |   +-- departure
+|   |       +-- paul-and-sarah.jpg
+|   +-- party
+|       |-- dancers001.jpg
+|       |-- dancers002.jpg
+|       +-- dancers003.jpg
++-- honeymoon
+|   |-- hotel.png
+|   |-- video-from-plane.avi
+|   +-- pwg_representative
+|       +-- video-from-plane.jpg
++-- photoshoot
+    |-- img0001.jpg
+    |-- img0002.jpg
+    +-- pwg_format
+        |-- img0001.cr2
+        |-- img0001.cmyk.jpg
+        |-- img0001.zip
+        |-- img0002.cr2
+        +-- img0002.cmyk.jpg
+
    @@ -73,6 +70,8 @@
  • デフォルトでは、写真エレメント (ビデオ、サウンド、テキスト等) に関して、ファイル名の拡張子に関連付けられるアイコンはありません。 任意で、あなたはサムネイルおよび見本ファイルを関連付けることができます (上記例のvideo.aviをご覧ください)。
    • +
  • Multiple formats: a photo can be available in several formats. In this example, we have 3 additional formats for img0001.jpg. You can activate this feature with $conf['enable_formats'] = true; in your local configuration and define a list of formats, like $conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');
    • +
  • 警告: ディレクトリおよびファイル名には、文字、「-」「_」「.」の記号のみ含んでください。空白、アクセント符号は含まないでください。
  • ファイル、サムネイルおよび見本が正しくディレクトリに配置された場合、「管理 > アルバム > 同期化」に移動してください。
    • diff --git a/sources/language/ja_JP/index.php b/sources/language/ja_JP/index.php index c8de97f..0b96c3e 100644 --- a/sources/language/ja_JP/index.php +++ b/sources/language/ja_JP/index.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/language/ja_JP/install.lang.php b/sources/language/ja_JP/install.lang.php index 8ae1d0e..6754f1c 100644 --- a/sources/language/ja_JP/install.lang.php +++ b/sources/language/ja_JP/install.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/language/ja_JP/upgrade.lang.php b/sources/language/ja_JP/upgrade.lang.php index 63b8984..53eb826 100644 --- a/sources/language/ja_JP/upgrade.lang.php +++ b/sources/language/ja_JP/upgrade.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -35,10 +35,9 @@ $lang['Upgrade informations'] = '更新情報'; $lang['Perform a maintenance check in [Administration>Tools>Maintenance] if you encounter any problem.'] = '問題がある場合、[管理 > ツール > メンテナンス] でメンテナンスチェックを実行してください。'; $lang['Only administrator can run upgrade: please sign in below.'] = '管理者のみアップグレードを実行できます: 以下でログインしてください。'; $lang['You do not have access rights to run upgrade'] = 'あなたには、アップグレードを実行する権限がありません。'; -$lang['All sub-albums of private albums become private'] = 'プライベートカテゴリのすべてのサブカテゴリがプライベートにされました。'; +$lang['All sub-albums of private albums become private'] = 'プライベートアルバムに含まれるすべてのサブアルバムがプライベートにされました。'; $lang['User permissions and group permissions have been erased'] = 'ユーザパーミッションおよびグループパーミッションが削除されました。'; $lang['Only thumbnails prefix and webmaster mail address have been saved from previous configuration'] = '以前の設定より、サムネイル接頭辞およびウェブマスターのメールアドレスのみ保存されました。'; $lang['As a precaution, following plugins have been deactivated. You must check for plugins upgrade before reactiving them:'] = '予防措置として、次のプラグインは無効になりました。プラグインを有効にする前に、プラグインのアップグレードを確認してください。:'; $lang['In %s, before ?>, insert:'] = '%sに、 ?>の前に入力:'; -$lang['As a precaution, following themes have been deactivated. You must check for themes upgrade before reactiving them:'] = '予防措置として、次のテーマが無効になりました。テーマを有効にする前に、アップグレードを確認してください。：'; -?> \ No newline at end of file +$lang['As a precaution, following themes have been deactivated. You must check for themes upgrade before reactiving them:'] = '予防措置として、次のテーマが無効になりました。テーマを有効にする前に、アップグレードを確認してください。：'; \ No newline at end of file diff --git a/sources/language/ka_GE/admin.lang.php b/sources/language/ka_GE/admin.lang.php index 1a6b313..bb17168 100644 --- a/sources/language/ka_GE/admin.lang.php +++ b/sources/language/ka_GE/admin.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/language/ka_GE/common.lang.php b/sources/language/ka_GE/common.lang.php index fb975f1..bd17cee 100644 --- a/sources/language/ka_GE/common.lang.php +++ b/sources/language/ka_GE/common.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -22,7 +22,7 @@ // +-----------------------------------------------------------------------+ /* Language Name: ქართული [GE] -Version: 2.7.0 +Version: 2.8.2 Language URI: http://piwigo.org/ext/extension_view.php?eid=426 Author: Piwigo team Author URI: http://piwigo.org diff --git a/sources/language/ka_GE/help/photos_add_ftp.html b/sources/language/ka_GE/help/photos_add_ftp.html index b05abce..c5faf4f 100644 --- a/sources/language/ka_GE/help/photos_add_ftp.html +++ b/sources/language/ka_GE/help/photos_add_ftp.html @@ -33,39 +33,35 @@

    კატეგორიის ფოლდერები განლაგებულია ფოლდერ "galleries" -ში. ქვევით ნახეთ პატარა გალერეის წყობა:

    + 
    -.
-|-- admin
-|-- doc
-|-- galleries
-|   |-- category-1
-|   |   |-- category-1.1
-|   |   |   |-- category-1.1.1
-|   |   |   |   |-- category-1.1.1.1
-|   |   |   |   |   |-- pwg_high
-|   |   |   |   |   |   +-- wedding.jpg
-|   |   |   |   |   |-- thumbnail
-|   |   |   |   |   |   +-- TN-wedding.jpg
-|   |   |   |   |   +-- wedding.jpg
-|   |   |   |   +-- category-1.1.1.2
-|   |   |   +-- category-1.1.2
-|   |   |-- category-1.2
-|   |   |   |-- pookie.jpg
-|   |   |   +-- thumbnail
-|   |   |       +-- TN-pookie.jpg
-|   |   +-- category-1.3
-|   +-- category-2
-|       |-- piglet.gif
-|       |-- pwg_representative
-|       |   +-- video.jpg
-|       |-- thumbnail
-|       |   +-- TN-piglet.jpg
-|       +-- video.avi
-|-- include
-|-- install
-|-- language
-|-- template
-+-- tool
    +galleries +|-- wedding +| |-- celebration +| | |-- arrival +| | | |-- paul-alone.jpg +| | | +-- sarah-alone.jpg +| | +-- departure +| | +-- paul-and-sarah.jpg +| +-- party +| |-- dancers001.jpg +| |-- dancers002.jpg +| +-- dancers003.jpg ++-- honeymoon +| |-- hotel.png +| |-- video-from-plane.avi +| +-- pwg_representative +| +-- video-from-plane.jpg ++-- photoshoot + |-- img0001.jpg + |-- img0002.jpg + +-- pwg_format + |-- img0001.cr2 + |-- img0001.cmyk.jpg + |-- img0001.zip + |-- img0002.cr2 + +-- img0002.cmyk.jpg + @@ -80,6 +76,8 @@
  • ელემენტები, რომლებიც არ არიან ფოტოები (ვიდეო, მუსიკა, ტექსტი და ა.შ.) წარმოდგენილი არიან ამ ფაილის შესაბამისი მინიატურებით. დამატებით, თქვენ შეგიძლიათ დაუკავშიროთ მინიატურა და წარმომადგენლობითი ფაილი (ნახე video.avi მაგალითში მაღლა).
    • +
  • Multiple formats: a photo can be available in several formats. In this example, we have 3 additional formats for img0001.jpg. You can activate this feature with $conf['enable_formats'] = true; in your local configuration and define a list of formats, like $conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');
    • +
  • ყურადღება: ფოლდერების და ფაილების სახელი უნდა შედგებოდეს ასოების, რიცხვების, "-", "_" ან "." -საგან. ნუ გამოიყენებთ დაშორებებს.
  • ცნობისათვის: კატეგორია შეიძლება შეიცავდეს ელემენტებს და ქვეკატეგორიებს ერთდოულად. მიუხედავად ამისა, რეკომენდირებულია ყოველი კატეგორიისათვის აირჩიოთ, შეიცავს იგი ელემენტებს თუ კატეგორიებს.
    • diff --git a/sources/language/ka_GE/index.php b/sources/language/ka_GE/index.php index c8de97f..0b96c3e 100644 --- a/sources/language/ka_GE/index.php +++ b/sources/language/ka_GE/index.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/language/ka_GE/install.lang.php b/sources/language/ka_GE/install.lang.php index 6d956ee..b139399 100644 --- a/sources/language/ka_GE/install.lang.php +++ b/sources/language/ka_GE/install.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -46,14 +46,14 @@ $lang['Password [confirm]'] = 'გაიმეორეთ პაროლი'; $lang['verification'] = 'კიდევ ერთხელ,შეცდომის გამოსარიცხად'; $lang['Need help ? Ask your question on Piwigo message board.'] = 'გჭირდებათ დახმარება?დასვით შეკითხვები Piwigo–ს ფორუმზე.'; $lang['Visitors will be able to contact site administrator with this mail'] = 'გამოყენებული იქნება მომხმარებლების მიერ ადმინისტრატორთან კავშირისათვის'; -$lang['PHP 5 is required'] = 'საჭიროა PHP 5'; +$lang['PHP 5 is required'] = 'საჭიროა PHP 5.2'; $lang['It appears your webhost is currently running PHP %s.'] = 'სავარაუდოდ თქვენი ხოსტინგი ამჟამად იყენებს PHP %s.'; -$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo–ს შეუძლია შეეცადოს გადართოს თქვენი კონფიგურაცია PHP 5, .htaccess ფაილს შექმნით ან შეცვლით.'; +$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo–ს შეუძლია შეეცადოს გადართოს თქვენი კონფიგურაცია PHP 5.2, .htaccess ფაილს შექმნით ან შეცვლით.'; $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'აღნიშნეთ,რომ თქვენ შეგიძლიათ თქვენით შეცვალოთ კონფიგურაცია და ამის შემდეგ ახლიდან გაუშვით Piwigo.'; -$lang['Try to configure PHP 5'] = 'შვეცადოთ PHP 5 გადაკონფიგურირება'; +$lang['Try to configure PHP 5'] = 'შვეცადოთ PHP 5.2 გადაკონფიგურირება'; $lang['Sorry!'] = 'ბოდიში!'; -$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo–ს არ შეუძლია PHP 5 გადაკონფიგურირება.'; -$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'თქვენ უნდა მიმართოთ პროვაიდერს დახმარებისა და განმარტებისათვის ტუ როგორ მოახერხოთ PHP 5 ზე გადართვა.'; +$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo–ს არ შეუძლია PHP 5.2 გადაკონფიგურირება.'; +$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'თქვენ უნდა მიმართოთ პროვაიდერს დახმარებისა და განმარტებისათვის ტუ როგორ მოახერხოთ PHP 5.2 ზე გადართვა.'; $lang['Hope to see you back soon.'] = 'იმედი გავქვს მალე შემოგვიერთდებით.'; $lang['Congratulations, Piwigo installation is completed'] = 'გილოცავთ,Piwigo–ს დაყენება დამთავრებულია'; $lang['An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning : database.inc.php must only contain what is in the textarea, no line return or space character)'] = 'ალტერნატიული გადაწყვეტილება მდგომარეობს შემდეგში,შეგიძლიათ დააკოპიროთ ტექსტი მაღლა ბლოკიდან და ჩასვათ ამ ფაილში "local/config/database.inc.php" (გაფრთხილება: database.inc.php უნდა შეიცავდეს მხოლოდ იმას რაც წერია textarea–ში, თავისუფალი ადგილების და დაბრუნების ხაზების გარეშე)'; @@ -63,5 +63,4 @@ $lang['You can download the config file and upload it to local/config directory $lang['Don\'t hesitate to consult our forums for any help : %s'] = 'ნუ მოგერიდებათ დახმარებისა და კონსულტაციისათვის მოგვმართოთ ჩვენს ფორუმზე: %s'; $lang['Just another Piwigo gallery'] = 'Piwigo -ს კიდევ ერთი გალერეა'; $lang['Welcome to my photo gallery'] = 'კეთილი იყოს ჩემს ფოტო გალერეაში თქვენი მობრძანება'; -$lang['Welcome to your new installation of Piwigo!'] = 'კეთილი იყოს თქვენს მიერ Piwigo -ს დაყენება!'; -?> \ No newline at end of file +$lang['Welcome to your new installation of Piwigo!'] = 'კეთილი იყოს თქვენს მიერ Piwigo -ს დაყენება!'; \ No newline at end of file diff --git a/sources/language/ka_GE/upgrade.lang.php b/sources/language/ka_GE/upgrade.lang.php index 41aab4c..da4eca2 100644 --- a/sources/language/ka_GE/upgrade.lang.php +++ b/sources/language/ka_GE/upgrade.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/language/km_KH/admin.lang.php b/sources/language/km_KH/admin.lang.php index d930cc3..3c56981 100644 --- a/sources/language/km_KH/admin.lang.php +++ b/sources/language/km_KH/admin.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -242,4 +242,19 @@ $lang['Batch Manager'] = 'កម្មវិធីគ្រប់គ្រងជ $lang['Basic settings'] = 'ការកំណត់មូលដ្ឋាន'; $lang['Average rate'] = 'អត្រាជាមធ្យម'; $lang['Available versions for'] = 'ជំនាន់ដែល​មាន​សម្រាប់'; -$lang['Available only with HTML format'] = 'មាន​តែ​នៅលើ​ទម្រង់ HTML ទេ'; \ No newline at end of file +$lang['Available only with HTML format'] = 'មាន​តែ​នៅលើ​ទម្រង់ HTML ទេ'; +$lang['Check all'] = 'ធីកទាំងអស់'; +$lang['Change username'] = 'ផ្តាស់ប្តូរឈ្មោះប្រើប្រាស់'; +$lang['Change password'] = 'ផ្តាស់ប្តូរ​ពាក្យ​សម្ងាត់'; +$lang['Change Admin Colors'] = 'ផ្លាស់ប្តូរ​ពណ៌​អ្នក​គ្រប់​គ្រង'; +$lang['Center of interest'] = 'ចំណុច​កណ្តាល​នៃ​ចំណាប់​អារម្មណ៍​'; +$lang['Cannot delete the old permalink !'] = 'Permalink ចាស់​មិន​អាច​លុប​បាន!'; +$lang['Can\'t read or extract archive.'] = 'បណ្ណសារមិនអាច​អាន​បាន ឬស្រង់​ចេញ​បាន'; +$lang['Can\'t download archive.'] = 'បណ្ណសារមិនអាច​ទាញ​យក​បាន'; +$lang['Can\'t create temporary file.'] = 'ឯកសារបណ្តោះអាសន្នដែលមិនអាចត្រូវបានបង្កើតឡើង'; +$lang['Can\'t connect to server.'] = 'ការ​ភ្ជាប់​ទៅ​កាន់​ម៉ាស៊ីន​មេមិន​អាច​ប្រើ​បាន'; +$lang['Caddie management'] = 'ការ​គ្រប់​គ្រង Caddie'; +$lang['By default, the center of interest is placed in the middle of the photo.'] = 'តាម​ការ​កំណត់​ជា​ស្រេច ចំណុច​កណ្តាល​នៃ​ចំណាប់​អារម្មណ៍​នឹង​ត្រូវ​បាន​ដាក់​នៅ​ចំណុច​កណ្តាល​នៃ​រូប​ថត'; +$lang['Caddie'] = 'Caddie'; +$lang['By default, Piwigo will create a new websize from the HD (high definition) version of your photo.'] = 'តាមការកំណត់ជាស្រេច Piwigo និងបង្កើត​វិបសាយ​ថ្មី​មួយ​ពី HD (high definition) version នៃរូបថត​របស់​អ្នក'; +$lang['Allow users to add a link to their website'] = 'អនុញ្ញាតឲ្យអ្នកប្រើប្រាស់​បន្ថែម​តំណភ្ជាប់​ទៅកាន់​វិបសាយ​របស់​គេ'; \ No newline at end of file diff --git a/sources/language/km_KH/common.lang.php b/sources/language/km_KH/common.lang.php index 8daf067..bcba215 100644 --- a/sources/language/km_KH/common.lang.php +++ b/sources/language/km_KH/common.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -22,7 +22,7 @@ // +-----------------------------------------------------------------------+ /* Language Name: ខ្មែរ [KH] -Version: 2.7.0 +Version: 2.8.2 Language URI: http://piwigo.org/ext/extension_view.php?eid=579 Author: Piwigo team Author URI: http://piwigo.org @@ -424,4 +424,5 @@ $lang['No results for'] = 'មិនមានលទ្ធផលសំរាប $lang['Photo description'] = 'ពិពណ៌នារូបថត'; $lang['Photo title'] = 'ឈ្មោះរូបថត'; $lang['Album name, A → Z'] = 'ឈ្មោះអាល់ប៊ុម A → Z'; -$lang['Album name, Z → A'] = 'ឈ្មោះអាល់ប៊ុម Z → A'; \ No newline at end of file +$lang['Album name, Z → A'] = 'ឈ្មោះអាល់ប៊ុម Z → A'; +$lang['Link: %s'] = 'តំណភ្ជាប់៖ %s'; \ No newline at end of file diff --git a/sources/language/km_KH/index.php b/sources/language/km_KH/index.php index c8de97f..0b96c3e 100644 --- a/sources/language/km_KH/index.php +++ b/sources/language/km_KH/index.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/language/km_KH/install.lang.php b/sources/language/km_KH/install.lang.php index 0b41680..b119bfb 100755 --- a/sources/language/km_KH/install.lang.php +++ b/sources/language/km_KH/install.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -21,7 +21,7 @@ // | USA. | // +-----------------------------------------------------------------------+ $lang['Password ']['confirm'] = 'ពាក្យ​សម្ងាត់​ [បញ្ជាក់]'; -$lang['PHP 5 is required'] = 'PHP 5 ត្រូវ​ការជា​ចាំបាច់'; +$lang['PHP 5 is required'] = 'PHP 5.2 ត្រូវ​ការជា​ចាំបាច់'; $lang['Database configuration'] = 'ការ​កំណត់​លើ​មូលដ្ឋាន​ទិន្នន័យ'; $lang['Download the config file'] = 'ទាញ​យក​ឯកសារកំណត់'; $lang['Admin configuration'] = 'ការ​កំណត់​ផ្នែក​រដ្ឋបាល'; @@ -33,11 +33,35 @@ $lang['Default gallery language'] = 'ភាសាវិចិត្រសាល $lang['Database table prefix'] = 'បុព្វបទតារាងមូលដ្ឋាន​ទិន្ន​ន័យ'; $lang['Database name'] = 'ឈ្មោះ​មូលដ្ឋាន​ទិន្ន​ន័យ'; $lang['Hope to see you back soon.'] = 'សង្ឃឹមថា​នឹងឃើញ​អ្នក​មកវិញឆាប់ៗ'; -$lang['Try to configure PHP 5'] = 'ព្យាយាម​កែកំណត់ PHP 5'; +$lang['Try to configure PHP 5'] = 'ព្យាយាម​កែកំណត់ PHP 5.2'; $lang['User'] = 'អ្នក​​ប្រើប្រាស់'; $lang['Sorry!'] = 'សុំទោស!'; $lang['Start Install'] = 'ចាប់ផ្តើម​បញ្ចូល'; $lang['Welcome to your new installation of Piwigo!'] = 'ស្វាគមន៍​មកកាន់​​ការបញ្ចូល​ថ្មីរបស់​ភីវីហ្គូ!'; $lang['Welcome to my photo gallery'] = 'ស្វាគមន៍​មកកាន់​វិចិត្រសាលរូបភាព​របស់​ខ្ញុំ'; $lang['Just another Piwigo gallery'] = 'គ្រាន់តែជា​វិចិត្រសាលផ្សេងទៀតរបស់​ភីវីហ្គូ'; -$lang['Congratulations, Piwigo installation is completed'] = 'អប់​អរ​សាទរ, ការ​បញ្ចូល​ភីវីហ្គូ​បាន​សម្រេច'; \ No newline at end of file +$lang['Congratulations, Piwigo installation is completed'] = 'អប់​អរ​សាទរ, ការ​បញ្ចូល​ភីវីហ្គូ​បាន​សម្រេច'; +$lang['also given by your host provider'] = 'ផ្គត់ផ្គង់ដោយអ្នកផ្គត់ផ្គង់ hosting របស់អ្នកផងដែរ'; +$lang['user login given by your host provider'] = 'ការចូលរបស់អ្នកប្រើប្រាស់ បានផ្តល់ដោយអ្នកផ្តល់ host របស់អ្នក'; +$lang['localhost or other, supplied by your host provider'] = 'localhost ឬផ្សេងទៀត ដែលបានផ្គត់ផ្គង់ដោយអ្នកផ្តល់ host របស់អ្នក'; +$lang['database tables names will be prefixed with it (enables you to manage better your tables)'] = 'ឈ្មោះតារាង database នឹងត្រូវបានដាក់បុព្វបទជាមួយវា (អនុញ្ញាតឱ្យអ្នកគ្រប់គ្រងតារាងរបស់អ្នកល្អប្រសើរជាងមុន)'; +$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo អាចព្យាយាមដើម្បីប្តូរការកំណត់រចនាសម្ព័ន្ធរបស់អ្នកទៅ PHP 5.2 ដោយការបង្កើត ឬកែប្រែឯកសារ .htaccess'; +$lang['You can download the config file and upload it to local/config directory of your installation.'] = 'អ្នកអាចទាញយក​ឯកសាររចនាសម្ព័ន្ធ ហើយផ្ទុកឡើងទៅកាន់ថត local/config នៅក្នុងការតំឡើងរបស់អ្នក'; +$lang['Visitors will be able to contact site administrator with this mail'] = 'ភ្ញៀវនឹងអាចប្រើអ៊ីម៉ែលនេះដើម្បីទាក់ទងអ្នកគ្រប់គ្រងតំបន់បណ្ដាញ'; +$lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'ចំណាំថាអ្នកអាចប្តូររចនាសម្ព័ន្ធដោយខ្លួនអ្នក ហើយបន្ទាប់មកចាប់ផ្តើម Piwigo សារជាថ្មី'; +$lang['Need help ? Ask your question on Piwigo message board.'] = 'ត្រូវការជំនួយ? សូមសួរសំណួររបស់អ្នកនៅលើ ក្តារសារ Piwigo'; +$lang['Keep it confidential, it enables you to access administration panel'] = 'រក្សាទុកវាជាសម្ងាត់, វាអនុញ្ញាតឱ្យអ្នកដើម្បីចូលដំណើរការ administration panel'; +$lang['It will be shown to the visitors. It is necessary for website administration'] = 'វានឹងត្រូវបានបង្ហាញដល់ភ្ញៀវ។ វាជាការចាំបាច់សម្រាប់ការគ្រប់គ្រងវ៉ិបសាយ'; +$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo គឺមិនអាចកំណត់ PHP 5.2'; +$lang['It appears your webhost is currently running PHP %s.'] = 'នៅលើម៉ាស៊ីនបណ្តាញរបស់អ្នកបច្ចុប្បន្នកំពុងដំណើរការ PHP​ %s'; +$lang['Don\'t hesitate to consult our forums for any help : %s'] = 'ចូរកុំស្ទាក់ស្ទើរក្នុងការពិគ្រោះយោបល់នៅវេទិការបស់យើងសម្រាប់ជំនួយណាមួយ: %s'; +$lang['Creation of config file local/config/database.inc.php failed.'] = 'ការបង្កើតរចនាសម្ព័ន្ធឯកសារ local/config/database.inc.php បរាជ័យ'; +$lang['Connection to server succeed, but it was impossible to connect to database'] = 'ការភ្ជាប់ទៅកាន់ម៉ាស៊ីនមេបានជោគជ័យ តែការភ្ជាប់ទៅកាន់ database​ គឺមិនអាចធ្វើទៅបាន'; +$lang['webmaster login can\'t contain characters \' or "'] = ' +ការចូលរបស់អ្នកគ្រប់គ្រងបណ្ដាញមិនអាចមានតួអក្សរ \' ឬ​ "'; +$lang['user password given by your host provider'] = 'ពាក្យសម្ងាត់របស់អ្នកប្រើប្រាស់់ដែលបានផ្គត់ផ្គង់ដោយអ្នកផ្តល់​ host របស់អ្នក'; +$lang['verification'] = 'ការផ្ទៀងផ្ទាត់'; +$lang['enter a login for webmaster'] = 'សូមបញ្ចូលឈ្មោះអ្នកគ្រប់គ្រងបណ្ដាញ'; +$lang['please enter your password again'] = 'សូមបញ្ចូលលេខសម្ងាត់របស់អ្នកម្តងទៀត'; +$lang['An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning : database.inc.php must only contain what is in the textarea, no line return or space character)'] = 'ដំណោះស្រាយជំនួសគឺដើម្បីចម្លងអត្ថបទនៅក្នុងប្រអប់ខាងលើនិងបិទភ្ជាប់វាទៅក្នុងឯកសារ​ "local/config/database.inc.php" (ប្រុងប្រយ័ត្ន: database.inc.php ត្រូវតែមានតែមួយគត់នូវអ្វីដែលមានក្នុង textarea, គ្មានបន្ទាត់ត្រឡប់ ឬចន្លោះតួអក្សរ'; +$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'អ្នកគួរតែយោងទៅលើជំនួយរបស់អ្នកផ្តល់សេវាបង្ហោះរបស់អ្នក និងរកមើលពីរបៀបដែលអ្នកអាចប្ដូរទៅកម្មវិធី PHP 5.2 បានដោយខ្លួនឯង'; \ No newline at end of file diff --git a/sources/language/km_KH/upgrade.lang.php b/sources/language/km_KH/upgrade.lang.php index 5163f3d..124f302 100755 --- a/sources/language/km_KH/upgrade.lang.php +++ b/sources/language/km_KH/upgrade.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/language/kn_IN/admin.lang.php b/sources/language/kn_IN/admin.lang.php index 6431c60..82e7c9d 100755 --- a/sources/language/kn_IN/admin.lang.php +++ b/sources/language/kn_IN/admin.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/language/kn_IN/common.lang.php b/sources/language/kn_IN/common.lang.php index 5cd93b1..8288748 100644 --- a/sources/language/kn_IN/common.lang.php +++ b/sources/language/kn_IN/common.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -22,7 +22,7 @@ // +-----------------------------------------------------------------------+ /* Language Name: ಕನ್ನಡ [IN] -Version: 2.7.0 +Version: 2.8.2 Language URI: http://piwigo.org/ext/extension_view.php?eid=693 Author: Piwigo team Author URI: http://piwigo.org diff --git a/sources/language/kn_IN/install.lang.php b/sources/language/kn_IN/install.lang.php index 4ddad7b..0954d79 100755 --- a/sources/language/kn_IN/install.lang.php +++ b/sources/language/kn_IN/install.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -45,24 +45,23 @@ $lang['Creation of config file local/config/database.inc.php failed.'] = 'local/ $lang['Database configuration'] = 'ಡೇಟಾಬೇಸ್ ಕಾರ್ಯ ಸಿದ್ಧತೆಗಳು (Database configuration)'; $lang['Download the config file'] = 'ಕಾರ್ಯಸಿದ್ಧತೆ ಕಡತ (config file) ವನ್ನು ಇಳಿಸಿಕೊಳ್ಳಿ'; $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'ಗಮನಿಸಿ : ನಿಮ್ಮ ಕಾರ್ಯ ಸಿದ್ಧತೆಗಳನ್ನು ನೀವೇ ಬದಲಾಯಿಸಬಹುದು ಮತ್ತು ಆನಂತರ ಅದರ ಬಳಕೆಗಾಗಿ Piwigo ಅನ್ನು ಮರುಚಾಲಿಸಿ.'; -$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = '.htaccess ಕಡತವನ್ನು ರೂಪಿಸುವುದರ ಅಥವಾ ಮಾರ್ಪಡಿಸುವುದರ ಮೂಲಕ Piwigo ನಿಮ್ಮ ಕಾರ್ಯ ಸಿದ್ಧತೆಗಳನ್ನು PHP 5 ಗೆ ವರ್ಗಾಯಿಸಲು ಪ್ರಯತ್ನಿಸುತ್ತದೆ.'; -$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo ಗೆ PHP 5 ಅನ್ನು ಸಿಧ್ಧಗೊಳಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ.'; -$lang['Try to configure PHP 5'] = 'PHP 5 ಅನ್ನು ಸಿಧ್ಧಗೊಳಿಸಲು ಪ್ರಯತ್ನಿಸಿ.'; +$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = '.htaccess ಕಡತವನ್ನು ರೂಪಿಸುವುದರ ಅಥವಾ ಮಾರ್ಪಡಿಸುವುದರ ಮೂಲಕ Piwigo ನಿಮ್ಮ ಕಾರ್ಯ ಸಿದ್ಧತೆಗಳನ್ನು PHP 5.2 ಗೆ ವರ್ಗಾಯಿಸಲು ಪ್ರಯತ್ನಿಸುತ್ತದೆ.'; +$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo ಗೆ PHP 5.2 ಅನ್ನು ಸಿಧ್ಧಗೊಳಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ.'; +$lang['Try to configure PHP 5'] = 'PHP 5.2 ಅನ್ನು ಸಿಧ್ಧಗೊಳಿಸಲು ಪ್ರಯತ್ನಿಸಿ.'; $lang['You can download the config file and upload it to local/config directory of your installation.'] = 'ಸ್ಥ್ಪಾಪನಾ ಕಾರ್ಯದಲ್ಲಿ, ನೀವು ಕಾರ್ಯಸಿದ್ಧತೆ ಕಡತ ವನ್ನು ಇಳಿಸಿಕೊಳ್ಳಬಹುದು ಮತ್ತು ಅದನ್ನು local/config ಡೈರಕ್ಟರಿಗೆ ವರ್ಗಾಯಿಸಬಹುದು.'; $lang['An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning : database.inc.php must only contain what is in the textarea, no line return or space character)'] = 'An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning: database.inc.php must only contain what is in the textarea, no line return or space character)'; $lang['database tables names will be prefixed with it (enables you to manage better your tables)'] = 'ಡೇಟಾಬೇಸ್ ಟೇಬಲ್ ಗಳ ಹೆಸರುಗಳಿಗೆ ಪೂರ್ವಪ್ರತ್ಯಯ ( prefix ) ಗಳನ್ನು ಅಳವಡಿಸುತ್ತದೆ. (ಟೇಬಲ್ ಗಳನ್ನು ಉತ್ತಮ ರೀತಿಯಲ್ಲಿ ನಿರ್ವಹಿಸಲು ಇದು ನಿಮಗೆ ಸಹಾಯಕ)'; $lang['Don\'t hesitate to consult our forums for any help : %s'] = 'ಯಾವುದೇ ಬಗೆಯ ಸಹಾಯಕ್ಕೆ ನಮ್ಮ ಈ ಚರ್ಚಾವೇದಿಕೆ (forum) ಗಳನ್ನು ಬಳಸುವಲ್ಲಿ ಹಿಂಜರಿಯಬೇಡಿ : %s'; $lang['Database table prefix'] = 'ಡೇಟಾಬೇಸ್ ಟೇಬಲ್ ಗಳ ಪೂರ್ವಪ್ರತ್ಯಯ ( prefix )'; $lang['Password ']['confirm'] = 'ಪ್ರವೇಶಪದ [ಖಾತ್ರಿ]'; -$lang['PHP 5 is required'] = 'PHP 5 ಅತ್ಯಗತ್ಯವಾಗಿದೆ.'; +$lang['PHP 5 is required'] = 'PHP 5.2 ಅತ್ಯಗತ್ಯವಾಗಿದೆ.'; $lang['Keep it confidential, it enables you to access administration panel'] = 'ಈ ವಿವರಗಳನ್ನು ಸುರಕ್ಷಿತವಾಗಿ ಇಡಿ, ಇದು ನಿಮಗೆ ನಿರ್ವಹಣಾ ಪ್ಯಾನೆಲ್ ಅನ್ನು ಬಳಸುವಾಗ ಉಪಯೊಗಕ್ಕೆ ಬರುತ್ತದೆ.'; $lang['It will be shown to the visitors. It is necessary for website administration'] = 'ಈ ವಿವರಗಳು ನೋಡುಗರಿಗೆ ಲಭ್ಯವಿರುತ್ತವೆ, ಜಾಲತಾಣ ನಿರ್ವಹಣಾ ಕಾರ್ಯಕ್ಕೆ ಇದು ಅತ್ಯಗತ್ಯ.'; $lang['It appears your webhost is currently running PHP %s.'] = 'ನಿಮ್ಮ ವೆಬ್ ಹೋಸ್ಟ್ ಸಧ್ಯಕ್ಕೆ PHP %s ಅನ್ನು ಬಳಸುತ್ತಿದೆ.'; $lang['Hope to see you back soon.'] = 'ಮತ್ತೆ ಸಧ್ಯದಲ್ಲೇ ಭೇಟಿಯಾಗೋಣ.'; $lang['Connection to server succeed, but it was impossible to connect to database'] = 'ಸರ್ವರ್ ಅನ್ನು ಯಶಸ್ವಿಯಾಗಿ ಸಂಪರ್ಕಿಸಲಾಗಿದೆ, ಆದರೆ ಡೇಟಾಬೇಸ್ ಅನ್ನು ಸಂಪರ್ಕಿಸಲು ಸಾಧ್ಯವಾಗುತ್ತಿಲ್ಲ.'; $lang['Visitors will be able to contact site administrator with this mail'] = 'ತಾಣ ನಿರ್ವಹಣೆಗಾರರ (ಸೈಟ್ ಅಡ್ಮಿನ್) ನ್ನು ಸಂಪರ್ಕಿಸಲು ಬಳಕೆದಾರರು/ನೋಡುಗರು ಈ ಮಿಂಚೆ ವಿಳಾಸವನ್ನು ಬಳಸಬಹುದಾಗಿದೆ'; -$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'PHP 5 ಗೆ ನೀವು ಹೇಗೆ ಬದಲಾಯಿಸಿಕೊಳ್ಳ ಬಹುದು ಎಂಬುದರ ವಿವರಗಳನ್ನು ನಿಮ್ಮ ಹೋಸ್ಟಿಂಗ್ ಪ್ರೊವೈಡರ್ ಅವರ ಸಹಾಯದಲ್ಲಿ ನೋಡಿರಿ.'; +$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'PHP 5.2 ಗೆ ನೀವು ಹೇಗೆ ಬದಲಾಯಿಸಿಕೊಳ್ಳ ಬಹುದು ಎಂಬುದರ ವಿವರಗಳನ್ನು ನಿಮ್ಮ ಹೋಸ್ಟಿಂಗ್ ಪ್ರೊವೈಡರ್ ಅವರ ಸಹಾಯದಲ್ಲಿ ನೋಡಿರಿ.'; $lang['also given by your host provider'] = 'ಹಾಗೂ ನಿಮ್ಮ ಹೋಸ್ಟಿಂಗ್ ಪ್ರೊವೈಡರ್ ಅವರಿಂದ ಪೂರೈಸಿದೆ'; $lang['webmaster login can\'t contain characters \' or "'] = 'ವೆಬ್ ಮಾಸ್ಟರ್ ಲಾಗಿನ್ \' ಅಥವಾ " ಸಂಕೇತಾಕ್ಷರಗಳನ್ನು ಹೊಂದಿರಬಾರದು'; -$lang['localhost or other, supplied by your host provider'] = 'ನಿಮ್ಮ ಹೋಸ್ಟ್ ಪ್ರೊವೈಡರ್ ಒದಗಿಸಿರುವ ಲೋಕಲ್ ಹೋಸ್ಟ್ ಅಥವಾ ಇತರೆ'; -?> \ No newline at end of file +$lang['localhost or other, supplied by your host provider'] = 'ನಿಮ್ಮ ಹೋಸ್ಟ್ ಪ್ರೊವೈಡರ್ ಒದಗಿಸಿರುವ ಲೋಕಲ್ ಹೋಸ್ಟ್ ಅಥವಾ ಇತರೆ'; \ No newline at end of file diff --git a/sources/language/kn_IN/upgrade.lang.php b/sources/language/kn_IN/upgrade.lang.php index c8e84f1..3d4bc93 100755 --- a/sources/language/kn_IN/upgrade.lang.php +++ b/sources/language/kn_IN/upgrade.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/language/ko_KR/admin.lang.php b/sources/language/ko_KR/admin.lang.php index 22dad06..898c8ca 100755 --- a/sources/language/ko_KR/admin.lang.php +++ b/sources/language/ko_KR/admin.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -52,11 +52,447 @@ $lang['show details'] = '자세히 보기'; $lang['user_status_guest'] = '손님'; $lang['Add a user'] = '사용자 추가'; $lang['Activate'] = '활성화'; -$lang['Active Languages'] = '활성 언어'; +$lang['Active Languages'] = '활성화된 언어'; $lang['Active Plugins'] = '활성 플러그인'; $lang['Add'] = '추가'; $lang['Add New Language'] = '새로운 언어 추가'; $lang['Add New Theme'] = '새로운 테마 추가'; $lang['Add a filter'] = '필터 추가'; $lang['Add a tag'] = '태그 추가'; -?> \ No newline at end of file +$lang['You are running the latest version of Piwigo.'] = '최신 버전의 Piwigo가 동작 중입니다.'; +$lang['Ignore this update'] = '이 업데이트 무시'; +$lang['Add Photos'] = '사진 추가'; +$lang['Add to caddie'] = '캐디에 추가'; +$lang['Change password'] = '비밀번호 변경'; +$lang['Edit album permissions'] = '앨범 권한 수정'; +$lang['Manage Permissions'] = '권한 관리하기'; +$lang['Manage permissions for group "%s"'] = '"%s" 그룹의 권한을 관리'; +$lang['Manage permissions for user "%s"'] = '"%s" 사용자의 권한을 관리'; +$lang['Purge search history'] = '검색 기록 비우기'; +$lang['Remove from caddie'] = '캐디에서 제거'; +$lang['Synchronize metadata'] = '메타데이터 동기화'; +$lang['Update albums informations'] = '앨범 정보 업데이트하기'; +$lang['Update photos information'] = '사진 정보 업데이트하기'; +$lang['add new photos to caddie'] = '캐디에 새로운 사진 추가'; +$lang['apply automatic sort order'] = '자동정렬 적용'; +$lang['jump to album'] = '앨범으로 이동'; +$lang['manage sub-albums'] = '하위 앨범 관리하기'; +$lang['Numeric identifier : %d'] = '숫자 식별자 : %d'; +$lang['This album contains no photo.'] = '이 앨범에는 등록된 사진이 없습니다.'; +$lang['Can\'t create temporary file.'] = '임시파일을 생성할 수 없습니다.'; +$lang['Create'] = '만들기'; +$lang['create a new album'] = '새 앨범 만들기'; +$lang['create a new site'] = '새 사이트 만들기'; +$lang['created'] = '생성됨'; +$lang['Update Complete'] = '업데이트 완료'; +$lang['Password confirmation is missing. Please confirm the chosen password.'] = '비밀번호 확인란이 비었습니다. 비밀번호 확인란을 입력하십시오.'; +$lang['Password is missing. Please enter the password.'] = '비밀번호란이 비었습니다. 비밀번호를 입력하십시오.'; +$lang['Password updated'] = '비밀번호가 변경됨'; +$lang['User "%s" created with "%s" like password'] = '"%s" 비밀번호를 사용하는 "%s" 사용자가 생성됨'; +$lang['No user selected of %d users'] = '%d 사용자 중 선택된 사용자가 없음'; +$lang['No user selected, no action possible.'] = '선택된 사용자가 없어서 사용 가능한 동작이 없습니다.'; +$lang['%d members'] = '%d 구성원'; +$lang['Members'] = '구성원'; +$lang['No members to manage'] = '관리할 구성원이 없습니다'; +$lang['Please select at least two groups'] = '두 개 이상의 그룹을 선택하십시오'; +$lang['Send an information email to group members'] = '그룹의 구성원에게 정보를 이메일로 발송'; +$lang['Authorized'] = '허용됨'; +$lang['Permissions'] = '권한'; +$lang['Basic settings'] = '기본 설정'; +$lang['General'] = '일반'; +$lang['Configuration'] = '환경설정'; +$lang['Piwigo configuration'] = 'Piwigo 환경설정'; +$lang['Options'] = '옵션'; +$lang['History'] = '기록'; +$lang['Permalink history'] = '퍼머링크 기록'; +$lang['Metadata synchronization results'] = '메타데이터 동기화 결과'; +$lang['Synchronize'] = '동기화하기'; +$lang['Other private albums'] = '다른 개인 앨범'; +$lang['Private'] = '개인'; +$lang['private'] = '개인'; +$lang['Public'] = '공개'; +$lang['Public / Private'] = '공개 / 개인'; +$lang['Caddie'] = '캐디'; +$lang['Caddie management'] = '캐디 관리'; +$lang['Empty caddie'] = '캐디 비우기'; +$lang['Who can see this photo?'] = '누가 이 사진을 볼 수 있나요?'; +$lang['Manage authorizations for selected albums'] = '선택한 앨범의 권한 관리'; +$lang['Error list'] = '오류 목록'; +$lang['Plugin list'] = '플러그인 목록'; +$lang['User list'] = '사용자 목록'; +$lang['All plugins are up to date.'] = '모든 플러그인이 최신입니다.'; +$lang['Inactive Plugins'] = '비활성 플러그인'; +$lang['Plugins'] = '플러그인'; +$lang['Restore'] = '복원'; +$lang['Restore default configuration. You will lose your plugin settings!'] = '기본 환경설정으로 복원합니다. 플러그인 설정이 없어집니다!'; +$lang['Administration Home'] = '관리자 홈'; +$lang['Change Admin Colors'] = '관리자 색상 변경'; +$lang['user_status_admin'] = '관리자'; +$lang['Default user does not exist'] = '기본 사용자가 없습니다'; +$lang['Default user cannot be deleted'] = '기본 사용자는 삭제할수 없습니다.'; +$lang['Database'] = '데이터베이스'; +$lang['Database synchronization with files'] = '파일과 데이터베이스 동기화'; +$lang['Dump Database'] = '데이터베이스 덤프하기'; +$lang['Information data registered in database'] = '데이터베이스에 정보 데이터가 등록됨'; +$lang['Repair and optimize database'] = '데이터베이스 복구 및 최적화'; +$lang['Unable to dump database.'] = '데이터베이스를 덤프 할 수 없습니다.'; +$lang['albums added in the database'] = '데이터베이스에 앨범이 추가됨'; +$lang['albums deleted in the database'] = '데이터베이스에서 앨범이 삭제됨'; +$lang['photos added in the database'] = '데이터베이스에 사진이 추가됨'; +$lang['photos deleted from the database'] = '데이터베이스에서 사진이 삭제됨'; +$lang['photos updated in the database'] = '데이터베이스에 사진이 변경됨'; +$lang['FTP + Synchronization'] = 'FTP + 동기화'; +$lang['Quick Local Synchronization'] = '빠른 로컬 동기화'; +$lang['errors during synchronization'] = '동기화 중에 오류'; +$lang['Deactivate'] = '비활성화'; +$lang['Deactivate all'] = '전체 비활성화'; +$lang['Check for updates'] = '업데이트 확인'; +$lang['Check for upgrade'] = '업그레이드 확인'; +$lang['Check for upgrade failed for unknown reasons.'] = '알수없는 이유로 업그레이드 확인이 실패하였습니다.'; +$lang['Are you sure you want to delete this plugin?'] = '이 플러그인을 삭제하시겠습니까?'; +$lang['Are you sure you want to install this plugin?'] = '이 플러그인을 설치하시겠습니까?'; +$lang['Authorize users to add comments on selected albums'] = '선택한 앨범에 댓글 쓰기를 사용자에게 허용'; +$lang['Automatic correction'] = '자동 수집'; +$lang['Automatic sort order'] = '자동 정렬 순서'; +$lang['Available only with HTML format'] = 'HTML 포맷만 가능합니다'; +$lang['Average rate'] = '평균 등급'; +$lang['Can\'t connect to server.'] = '사용할 수 없는 서버에 연결'; +$lang['Photo Properties'] = '사진 속성'; +$lang['Properties'] = '속성'; +$lang['Cannot delete the old permalink !'] = '오래된 퍼머링크가 삭제되지 않음!'; +$lang['Permalink'] = '퍼머링크'; +$lang['Permalinks'] = '퍼머링크'; +$lang['List'] = '목록'; +$lang['Album list management'] = '앨범 목록 관리'; +$lang['Aperture is a powerful tool to refine images and manage massive libraries on Mac.'] = 'Aperture는 맥에서 사진을 보정하고 대규모 라이브러리를 관리하기 위한 강력한 툴입니다.'; +$lang['Group management'] = '그룹 관리'; +$lang['Manage'] = '관리하기'; +$lang['Manage tags'] = '태그 관리하기'; +$lang['Manage the members'] = '구성원 관리하기'; +$lang['On your Linux, simply install Shotwell with your package manager and the activate Piwigo publishing option.'] = '리눅스에서 패키지 관리자로 간단히 Shotwell를 설치 한 다음 Piwigo의 게시 옵션을 활성화하십시오.'; +$lang['Permission management'] = '권한 설정'; +$lang['Shotwell is an open source digital photo organizer that runs on Linux. It is the default photo manager in Ubuntu and Fedora.'] = 'Shotwell 리눅스에서 실행되는 오픈 소스 디지털 사진 정리도구입니다. 우분투와 페도라의 기본 사진 관리자입니다.'; +$lang['Site manager'] = '사이트 관리자'; +$lang['digiKam is an advanced digital photo management free software for Linux, Windows, and MacOSX.'] = 'digiKam은 리눅스, 윈도우즈 와 맥 OSX를 위한 고급 디지털 사진 관리용 무료 소프트웨어입니다.'; +$lang['digiKam is designed for photographers who want to view, manage, edit, enhance, organize, tag, and share photographs.'] = 'digiKam이 사진을 보기, 관리, 편집, 향상, 정리, 태그과 공유를 하려는 사진작가를 위해 설계되었습니다.'; +$lang['iPhoto is the default photo manager on MacOSX. The Piwigo export plugin let you create new albums and export your photos directly from iPhoto to your Piwigo photo gallery.'] = 'iPhoto는 맥 OSX의 기본 사진 관리자입니다. Piwigo의 익스포트 플러그인은 새로운 앨범을 생성하고 iPhone에서 Piwigo 사진 갤러리로 바로 익스포트 할 수 있도록 합니다.'; +$lang['manage album photos'] = '앨번 사진 관리하기'; +$lang['Groups and users'] = '그룹과 사용자'; +$lang['Send mail to users'] = '사용자에게 메일 발송'; +$lang['Users'] = '사용자'; +$lang['%d mail was not sent.'] = '%d 메일이 발송 안됨'; +$lang['%d mail was sent.'] = '%d 메일이 발송됨'; +$lang['%d mails were not sent.'] = '%d 메일이 발송 안됨'; +$lang['%d mails were sent.'] = '%d 메일이 발송됨'; +$lang['%d user comments rejected'] = '%d 사용자 댓글 거부됨'; +$lang['%d photo was deleted'] = '%d 사진이 삭제됨'; +$lang['%d photos uploaded'] = '%d 사진이 업로드됨'; +$lang['%d photos were deleted'] = '%d 사진이 삭제됨'; +$lang['%d tag'] = '%d 태그'; +$lang['%d tags'] = '%d 태그'; +$lang['%d user'] = '%d 사용자'; +$lang['%d user comment rejected'] = '%d 사용자 댓글 거부됨'; +$lang['%d user comment validated'] = '%d 사용자 댓글 허용됨'; +$lang['%d user comments validated'] = '%d 사용자 댓글 허용됨'; +$lang['%d user deleted'] = '%d 사용자 삭제됨'; +$lang['%d users'] = '%d 사용자'; +$lang['%d users deleted'] = '%d 사용자 삭제됨'; +$lang['%d second'] = '%d 초'; +$lang['%d seconds'] = '%d 초'; +$lang['%d minute'] = '%d 분'; +$lang['%d minutes'] = '%d 분'; +$lang['%d month'] = '%d 개월'; +$lang['%d months'] = '%d 개월'; +$lang['%d anomalies have been detected corrected.'] = '%d 이상이 검출되었고 해결되었습니다.'; +$lang['%d anomalies have been detected.'] = '%d 이상이 검출되었습니다.'; +$lang['%d anomalies have been ignored.'] = '%d 이상이 무시되었습니다.'; +$lang['%d anomalies have not been corrected.'] = '%d 이상이 해결되었습니다.'; +$lang['%d anomaly has been corrected.'] = '%d 이상이 해결되었습니다.'; +$lang['%d anomaly has been detected.'] = '%d 이상이 검출되었습니다.'; +$lang['%d anomaly has been ignored.'] = '%d 이상이 무시되었습니다.'; +$lang['%d anomaly has not been corrected.'] = '%d 이상이 해결되지 않았습니다.'; +$lang['only perform a simulation (no change in database will be made)'] = '시뮬레이션만 실행 (데이터베이스는 변경되지 않음)'; +$lang['%d album moved'] = '%d 앨범 이동됨'; +$lang['%d albums moved'] = '%d 앨범 이동됨'; +$lang['Piwigo Administration'] = 'Piwigo 관리'; +$lang['Switch to clear or dark colors for administration'] = '관리자 화면을 밝거나 어두운 색상으로 전환합니다.'; +$lang['Templates configuration has been recorded.'] = '템플릿 환경설정이 기록됨.'; +$lang['Your configuration settings are saved'] = '환경 설정이 저장됨'; +$lang['Save Settings'] = '설정 저장'; +$lang['Save Template Directory'] = '템플릿 디렉토리 저장'; +$lang['Save order'] = '순서 저장'; +$lang['Save to permalink history'] = '퍼머링크 기록에 저장하'; +$lang['first photo added on %s'] = '%s 에 첫 사진이 등록됨'; +$lang['Aperture is designed for professional photographers with iPhoto simplicity.'] = 'Aperture는 iPhoto를 단순화한 전문 사진작가를 위해 설계되었습니다.'; +$lang['Piwigo export plugin for Aperture'] = 'Aperture용 Piwigo 익스포트 플러그인'; +$lang['Piwigo publish plugin for digiKam'] = 'dikiKam용 Piwigo 배포 플러그인'; +$lang['To export your photos from digiKam to Piwigo, simply install digiKam and the Kipi-plugins.'] = 'digiKam에서 Piwigo로 사진을 내보내려면, digiKam 및 Kipi 플러그인을 설치하면 됩니다.'; +$lang['Piwigo for iOS application empowers you to connect to your Piwigo gallery from your iPhone, iPad or iPod Touch, create some albums and upload several photos at once.'] = 'iOS용 Piwigo 앱은 iPhone, iPad 또는 iPod Touch에서 Piwigo 갤러리에 연결하고 앨범을 생성하고 한번에 여러 사진을 업로드 할 수 있도록 합니다.'; +$lang['Piwigo for Android application empowers you to connect your Android phone or table to your Piwigo gallery, create some albums and upload several photos at once.'] = '안드로이드용 Piwigo 앱은 안드로이드 폰과 태블릿에서 Piwigo 갤러리에 연결하고 앨범을 생성하고 한번에 여러 사진을 업로드 할 수 있도록 합니다.'; +$lang['Piwigo for Android'] = '안드로이드용 Piwigo'; +$lang['Piwigo for iOS (iPhone, iPad, iPod Touch)'] = 'iOS용 Piwigo (iPhone, iPad, iPod Touch)'; +$lang['Available versions for'] = '가능한 버전'; +$lang['Piwigo Uploader'] = 'Piwigo 업로더'; +$lang['pLoader stands for Piwigo Uploader. From your computer, pLoader prepares your photos and transfer them to your Piwigo photo gallery.'] = 'pLoader는 Piwigo 업로더를 의미합니다. 컴퓨터에서 pLoader은 사진을 준비하고 Piwigo 사진 갤러리로 전송합니다.'; +$lang['Allowed file types: %s.'] = '가능한 파일 종류: %s.'; +$lang['Maximum file size: %sB.'] = '최대 파일 크기: %sB.'; +$lang['Select files'] = '파일 선택'; +$lang['Applications'] = '어플리케이션'; +$lang['Web Form'] = '웹 폼'; +$lang['Start Upload'] = '업로드 시작'; +$lang['Unknown upload error'] = '알 수 없는 업로드 오류'; +$lang['Upload'] = '업로드'; +$lang['Upload Photos'] = '사진 업로드'; +$lang['Upload in progress'] = '업로드 진행 중'; +$lang['Uploaded Photos'] = '사진 업로드 됨'; +$lang['Delete selected photos'] = '선택한 사진을 삭제'; +$lang['Manage photos'] = '사진 관리'; +$lang['New photos were added'] = '새로운 사진이 등록됨'; +$lang['Photos'] = '사진'; +$lang['Delete multiple size images'] = '여러 크기의 이미지를 삭제'; +$lang['Purge compiled templates'] = '컴파일된 템플릿을 비우기'; +$lang['Purge history summary'] = '기록 요약정보 비우기'; +$lang['Purge never used notification feeds'] = '사용되지 않은 알림 피드 비우기'; +$lang['Purge sessions'] = '세션 비우기'; +$lang['Purge user cache'] = '사용자 캐시 비우기'; +$lang['Purge history detail'] = '기록 상세정보 비우기'; +$lang['Delete orphan tags'] = '사용되지 않는 태그 삭제'; +$lang['Orphan tags deleted'] = '사용되지 않는 태그가 삭제됨'; +$lang['You have %d orphan tags: %s.'] = '사용되지 않는 %d개의 태그가 있습니다: %s.'; +$lang['Lock gallery'] = '갤러리 잠그기'; +$lang['No group is permitted to see this private album'] = '이 개인 앨범을 볼 수 있는 그룹이 없습니다.'; +$lang['Only private albums are listed'] = '개인 앨범만 표시됨'; +$lang['All extensions are up to date.'] = '모든 확장기능이 최신입니다.'; +$lang['Exif extension not available, admin should disable exif use'] = 'Exif 확장기능을 사용할 수 없습니다. exif 사용을 비활성화 해야합니다'; +$lang['Extensions Update'] = '확장기능 업데이트'; +$lang['Some upgrades are available for extensions.'] = '확장기능을 위한 업데이트를 사용할 수 있습니다.'; +$lang['%d user was not updated.'] = '%d 사용자가 변경되지 않음.'; +$lang['%d user was updated.'] = '%d 사용자가 변경됨.'; +$lang['%d users were not updated.'] = '%d 사용자가 변경되지 않음.'; +$lang['Album updated successfully'] = '앨범이 정상적으로 업데이트 됨'; +$lang['Photo informations updated'] = '사진 정보 변경됨'; +$lang['Piwigo Update'] = 'Piwigo 업데이트'; +$lang['Update All'] = '모두 업데이트'; +$lang['Update to Piwigo %s'] = 'Piwigo %s로 업데이트'; +$lang['Update user'] = '사용자 업데이트'; +$lang['Updates'] = '업데이트'; +$lang['General statistics'] = '일반 통계'; +$lang['Statistics'] = '통계'; +$lang['All themes are up to date.'] = '모든 테마가 최신입니다.'; +$lang['Delete this theme'] = '이 테마 삭제'; +$lang['Following themes may not be compatible with the new version of Piwigo:'] = '다음 테마는 Piwigo의 새로운 버전과 호환되지 않을 수 있습니다:'; +$lang['Forbid this theme to users'] = '사용자가 이 테마를 사용할 수 없게 함'; +$lang['Impossible to activate this theme, the parent theme is missing: %s'] = '이 테마를 활성화할 수 없습니다. 부모 테마가 없습니다: %s'; +$lang['Impossible to deactivate this theme, you need at least one theme.'] = '이 테마를 비활성화할 수 없습니다. 최소한 하나의 테마가 필요합니다.'; +$lang['Impossible to delete this theme. Other themes depends on it: %s'] = '이 테마를 삭제할 수 없습니다. 다른 테마와 의존성이 있습니다: %s'; +$lang['Make this theme available to users'] = '사용자가 이 테마를 사용할 수 있게 함'; +$lang['Set as default theme for unregistered and new users'] = '등록되지 않거나 새로운 사용자에게 기본 테마로 설정'; +$lang['Some themes and plugins may be not available yet.'] = '일부 테마와 플러그인이 아직 사용할 수 있지 않습니다.'; +$lang['Theme has been successfully installed'] = '테마가 성공적으로 설치됨'; +$lang['Themes which need upgrade'] = '업그레이드가 필요한 테마'; +$lang['There is no other theme available.'] = '사용 가능한 다른 테마가 없습니다.'; +$lang['Visit theme site'] = '테마 사이트 방문'; +$lang['You can activate only one mobile theme.'] = '모바일 테마는 하나만 활성화 할 수 있습니다.'; +$lang['Impossible to deactivate this language, first set another language as default.'] = '이 언어를 비활성화하지 못합니다. 먼저 다른 언어를 기본으로 설정하십시오.'; +$lang['Impossible to deactivate this language, you need at least one language.'] = '이 언어를 비활성화하지 못합니다. 최소한 하나의 언어는 필요합니다.'; +$lang['Language has been successfully installed'] = '언어가 성공적으로 설치되었음'; +$lang['Languages which need upgrade'] = '업그레이드가 필요한 언어'; +$lang['There is no other language available.'] = '사용가능한 다른 언어가 없습니다'; +$lang['Inactive Languages'] = '비활성화된 언어'; +$lang['Inactive Themes'] = '비활성화된 테마'; +$lang['Active Themes'] = '활성화된 테마'; +$lang['Installed Themes'] = '설치된 테마'; +$lang['Themes'] = '테마'; +$lang['Install'] = '설치'; +$lang['Uninstall'] = '제거'; +$lang['Actions'] = '동작'; +$lang['GD version'] = 'GD 버전'; +$lang['New Version'] = '새로운 버전'; +$lang['Piwigo version'] = 'Piwigo 버전'; +$lang['Version'] = '버전'; +$lang['All languages are up to date.'] = '모든 언어가 최신입니다.'; +$lang['Delete this language'] = '이 언어 삭제'; +$lang['Forbid this language to users'] = '사용자에게 이 언어를 사용하지 못하도록 함'; +$lang['Make this language available to users'] = '사용자에게 이 언어를 사용할 수 있도록 함'; +$lang['Set as default language for unregistered and new users'] = '등록되지 않는 신규 사용자에게 이 언어를 기본으로 설정'; +$lang['Installed Languages'] = '설치된 언어'; +$lang['Languages'] = '언어'; +$lang['Replacement of original templates by customized templates from template-extension subfolder'] = '원본 템플릿을 템플릿 확장 하위폴더의 사용자 템플릿으로 교체'; +$lang['Templates'] = '템플릿'; +$lang['Hide'] = '숨기기'; +$lang['Guest Settings'] = '손님 설정'; +$lang['Allow users to add a link to their website'] = '웹사이트 링크를 추가 할 수 있도록 허용'; +$lang['Allow users to delete their own comments'] = '사용자의 댓글 삭제 허용'; +$lang['Allow users to edit their own comments'] = '사용자의 댓글 수정 허용'; +$lang['Validation'] = '유효성 검사'; +$lang['Default comments order'] = '기본 댓글 순서'; +$lang['Number of comments per page'] = '페이지당 댓글 수'; +$lang['Comments for all'] = '모두에게 댓글 허용'; +$lang['Show menubar'] = '메뉴바 표시'; +$lang['Activate Navigation Thumbnails'] = '썸네일 네비게이션 활성화'; +$lang['Activate comments'] = '댓글 활성화'; +$lang['Activate Navigation Bar'] = '네비게이션 바 활성화'; +$lang['Number of albums per page'] = '한 페이지의 앨범 수'; +$lang['Activate icon "new" next to albums and pictures'] = '앨범 및 사진 옆에 "새로 만들기" 아이콘 활성화'; +$lang['new'] = '새로 만들기'; +$lang['Activate icon "%s"'] = '"%s" 아이콘 활성화'; +$lang['Photo Page'] = '사진 페이지'; +$lang['Main Page'] = '메인 페이지'; +$lang['Select a file'] = '파일 선택'; +$lang['Opacity'] = '투명도'; +$lang['middle'] = '중간'; +$lang['bottom left corner'] = '좌하단'; +$lang['bottom right corner'] = '우하단'; +$lang['top left corner'] = '좌상단'; +$lang['top right corner'] = '우상단'; +$lang['custom'] = '사용자 지정'; +$lang['Position'] = '위치'; +$lang['Apply watermark if height is bigger than'] = '워터마크를 적용할 최소 세로길이'; +$lang['Apply watermark if width is bigger than'] = '워터마크를 적용할 최소 가로길이'; +$lang['Watermark'] = '워터마크'; +$lang['add a new watermark'] = '새로운 워터마크 추가'; +$lang['Image Quality'] = '사진 품질'; +$lang['The original image quality must be a number between %d and %d'] = '원본 사진 품질은 %d ~ %d 사이 값이어야 합니다.'; +$lang['Resize after upload'] = '업로드 후에 리사이즈'; +$lang['Resize after upload disabled due to the use of GD as graphic library'] = '그래픽 라이브러리로 GD를 사용할 때까지 업로드 후 리사이즈 불가'; +$lang['Original Size'] = '원본 크기'; +$lang['Gallery title'] = '갤러리 제목'; +$lang['With blank value, gallery title will be used'] = '비어있으면, 갤러리 제목이 사용됩니다'; +$lang['Page banner'] = '페이지 배너'; +$lang['Default photos order'] = '사진 정렬 기본 순서'; +$lang['delete'] = '삭제'; +$lang['delete album'] = '앨범 삭제'; +$lang['delete photo'] = '사진 삭제'; +$lang['deleted'] = '삭제됨'; +$lang['Add a criteria'] = '기준 추가'; +$lang['Mail address is mandatory for registration'] = '등록시 메일 주소가 필수'; +$lang['Email admins when a new user registers'] = '새로운 사용자를 등록하면 관리자에게 메일 발송하기'; +$lang['Rating by guests'] = '손님에게 평점 허용'; +$lang['Allow rating'] = '평점 허용'; +$lang['Allow user customization'] = '사용자 개인화 허용'; +$lang['Allow user registration'] = '사용자 등록 허용'; +$lang['Mail theme'] = '메일 테마'; +$lang['Save visits in history for'] = '방문기록 저장: '; +$lang['Week starts on'] = '한 주의 시작'; +$lang['Miscellaneous'] = '기타'; +$lang['simple visitors'] = '단순 방문자'; +$lang['No photo selected, no action possible.'] = '선택된 사진이 없어서 사용 가능한 동작이 없습니다.'; +$lang['Apply action'] = '동작 적용'; +$lang['Tools'] = '도구'; +$lang['Searching...'] = '검색중...'; +$lang['Representant'] = '앨범 썸네일'; +$lang['Representation of albums'] = '앨범 썸네일'; +$lang['Representative'] = '앨범 썸네일'; +$lang['Piwigo export plugin for iPhoto'] = 'iPhoto용 Piwigo 익스포트 플러그인'; +$lang['Piwigo publish plugin for Shotwell'] = 'Shotwell용 Piwigo 배포 플러그인'; +$lang['Photo name'] = '사진 이름'; +$lang['Original file : %s'] = '원본 파일: %s'; +$lang['Panorama'] = '파노라마'; +$lang['Parent album'] = '부모 앨범'; +$lang['Path'] = '경로'; +$lang['New photos added'] = '새로운 사진이 등록됨'; +$lang['New tag'] = '새 태그'; +$lang['No results'] = '결과 없음'; +$lang['Name'] = '이름'; +$lang['New name'] = '새 이름'; +$lang['Loading...'] = '로딩중...'; +$lang['Instructions to use Piwigo'] = 'Piwigo 사용 방법'; +$lang['Informations'] = '정보'; +$lang['Height'] = '세로'; +$lang['Hour'] = '시'; +$lang['IP'] = 'IP'; +$lang['Ignore All'] = '모두 무시'; +$lang['Ignore selected anomalies'] = '선택된 문제점 무시'; +$lang['GD library is missing'] = 'GD 라이브러리가 없음'; +$lang['Graphics Library'] = '그래픽 라이브러리'; +$lang['Failed to write file to disk'] = '파일을 디스크에 기록하지 못함'; +$lang['File'] = '파일'; +$lang['File/directory read error'] = '파일/디렉토리 읽기 오류'; +$lang['Forbidden'] = '금지됨'; +$lang['Edit album'] = '앨범 수정'; +$lang['Edit photo'] = '사진 수정'; +$lang['Edit ranks'] = '등급 수정'; +$lang['Edit selected tags'] = '선택된 태그 수정'; +$lang['Edit tags'] = '태그 수정'; +$lang['Detailed informations'] = '상세 정보'; +$lang['Directory'] = '디렉토리'; +$lang['Directory does not exist'] = '디렉토리가 존재하지 않음'; +$lang['Downloads'] = '다운로드'; +$lang['Drop into album'] = '앨범 선택'; +$lang['ERROR'] = 'ERROR'; +$lang['ERROR: THIS PLUGIN IS MISSING BUT IT IS INSTALLED! UNINSTALL IT NOW.'] = 'ERROR: 이 플러그인은 설치되었으나 찾을 수 없습니다! 지금 삭제하세요.'; +$lang['Delete Representant'] = '앨범 썸네일 삭제'; +$lang['Delete selected tags'] = '선택된 태그 삭제'; +$lang['Delete selected users'] = '선택된 사용자 삭제'; +$lang['An error has occured during upgrade.'] = '업데이트 중에 오류가 발생하였습니다.'; +$lang['%d week'] = '%d 주'; +$lang['%d weeks'] = '%d 주'; +$lang['%d year'] = '%d 년'; +$lang['%d years'] = '%d 년'; +$lang['%d member'] = '%d 구성원'; +$lang['Change username'] = '사용자 이름 변경'; +$lang['Level 0'] = '권한없음'; +$lang['Level 1'] = '지인'; +$lang['Level 2'] = '친구'; +$lang['Level 4'] = '가족'; +$lang['Level 8'] = '관리자'; +$lang['All %d users are selected'] = '모두 %d 사용자가 선택됨'; +$lang['Invert'] = '반전'; +$lang['None'] = '없음'; +$lang['none'] = '없음'; +$lang['Showing %s to %s of %s users'] = '%s ~ %s 보기 (전체 %s 사용자)'; +$lang['Cancel'] = '취소'; +$lang['Send connection settings by email'] = '접속 정보를 메일로 발송'; +$lang['Send'] = '발송'; +$lang['%d users were updated.'] = '%d 사용자가 변경됨.'; +$lang['User %s [%s] was not added to the subscription list.'] = '%s [%s] 사용자는 구독자 목록에 추가하지 못했습니다.'; +$lang['Error when sending email to %s [%s].'] = '%s [%s] 에게 메일 발송 중 오류 발생함.'; +$lang['Subscribed'] = '구독'; +$lang['Unsubscribed'] = '수신거부'; +$lang['Warning: subscribing or unsubscribing will send mails to users'] = '주의: 구독 또는 수신거부의 상태변경은 사용자에게 메일이 발송됩니다'; +$lang['Subscribe/unsubscribe users'] = '구독/수신 거부 사용자'; +$lang['Include display of recent photos grouped by dates'] = '날짜별 최신 사진을 표시'; +$lang['Complementary mail content'] = '대체할 메일 내용'; +$lang['Add detailed content'] = '상세내용을 포함'; +$lang['Send mail as'] = '다음 제목으로 메일 발송:'; +$lang['Send mail on HTML format'] = 'HTML 포맷으로 메일 보내기'; +$lang['%d parameter was updated.'] = '%d 파라미터가 변경됨.'; +$lang['%d parameters were updated.'] = '%d 파라미터가 변경됨.'; +$lang['Parameters'] = '파라미터'; +$lang['There is no available subscribers to mail.'] = '메일로 공지를 받는 사용자가 없습니다.'; +$lang['No group selected, no action possible.'] = '선택된 그룹이 없어서 사용 가능한 동작이 없습니다.'; +$lang['Group'] = '그룹'; +$lang['Group name'] = '그룹 이름'; +$lang['Groups'] = '그룹'; +$lang['Move albums'] = '앨범 이동'; +$lang['New parent album'] = '새로운 부모 앨범'; +$lang['Virtual albums to move'] = '이동할 가상 앨범'; +$lang['Move'] = '이동'; +$lang['date & time'] = '날짜와 시간'; +$lang['file name'] = '파일이름'; +$lang['Batch Manager'] = '배치 관리자'; +$lang['Guest cannot be deleted'] = '손님 계정은 삭제할 수 없음'; +$lang['Guests'] = '손님'; +$lang['Rate'] = '등급'; +$lang['Rate date'] = '평가 날짜'; +$lang['Number of rates'] = '평가 수'; +$lang['Sum of rates'] = '평가 합계'; +$lang['Operating system'] = '운영체제'; +$lang['Rating'] = '평점'; +$lang['Menu Management'] = '메뉴 관리'; +$lang['Reinitialize check integrity'] = '무결성 검사 재초기화'; +$lang['Maintenance'] = '유지보수'; +$lang['overrides existing values with empty ones'] = '빈 값에 대해서도 기존 값을 덮어씀'; +$lang['even already synchronized photos'] = '이미 동기화된 사진 포함'; +$lang['Action'] = '동작'; +$lang['Choose an action'] = '동작 선택'; +$lang['Choose an option'] = '옵션 선택'; +$lang['display maximum informations (added albums and photos, deleted albums and photos)'] = '최대값 정보 표시 (추가된 앨범과 사진, 삭제된 앨범과 사진)'; +$lang['Everybody'] = '모두'; +$lang['Who can see these photos?'] = '누가 이 사진들을 볼 수 있나요?'; +$lang['directories + files'] = '디렉토리 + 파일'; +$lang['only directories'] = '디렉토리만'; +$lang['nothing'] = '없음'; +$lang['synchronize files structure with database'] = '파일 구조를 데이터베이스와 동기화'; +$lang['Environment'] = '환경'; +$lang['Show info'] = '정보 보기'; \ No newline at end of file diff --git a/sources/language/ko_KR/common.lang.php b/sources/language/ko_KR/common.lang.php index 5760055..41dd0e7 100644 --- a/sources/language/ko_KR/common.lang.php +++ b/sources/language/ko_KR/common.lang.php @@ -22,7 +22,7 @@ // +-----------------------------------------------------------------------+ /* Language Name: 한국어 [KR] -Version: 2.7.0 +Version: 2.8.2 Language URI: http://piwigo.org/ext/extension_view.php?eid=509 Author: Piwigo team Author URI: http://piwigo.org @@ -72,7 +72,7 @@ $lang['Each listed rule must be satisfied.'] = '각각의 기준을 만족해야 $lang['Email address'] = '메일 주소'; $lang['Enter your personnal informations'] = '개인 정보를 입력해 주세요'; $lang['Error sending email'] = '메일을 보내는 중 오류가 발생하였습니다'; -$lang['File name'] = '파일명'; +$lang['File name'] = '파일 이름'; $lang['File'] = '파일'; $lang['Filesize'] = '파일 크기'; $lang['Filter and display'] = '필터 후 표시'; @@ -110,7 +110,7 @@ $lang['Tags'] = '태그'; $lang['The RSS notification feed provides notification on news from this website : new photos, updated albums, new comments. Use a RSS feed reader.'] = 'RSS 피드 알림은 이 사이트의 새 사진, 댓글, 업데이트된 앨범에 대해 알려줍니다. RSS 리더와 함께 사용하세요.'; $lang['Unknown feed identifier'] = '알 수 없는 피드 식별자입니다'; $lang['User comments'] = '사용자 댓글'; -$lang['Username'] = '사용자명'; +$lang['Username'] = '사용자 이름'; $lang['Visits'] = '방문자'; $lang['Webmaster'] = '웹마스터'; $lang['Week %d'] = '이번주 %d'; @@ -317,7 +317,7 @@ $lang['N/A'] = 'N/A'; $lang['Not repeat the slideshow'] = '슬라이드쇼 반복하지 않기'; $lang['Number of photos per page'] = '페이지상 사진 수'; $lang['Page not found'] = '페이지를 찾을 수 없습니다'; -$lang['Username: %s'] = '사용자명: %s'; +$lang['Username: %s'] = '사용자 이름: %s'; $lang['Website'] = '웹사이트'; $lang['You will receive a link to create a new password via email.'] = '이메일로 새로운 암호 설정을 위한 링크가 전송되었습니다.'; $lang['Your password has been reset'] = '암호가 초기화 되었습니다.'; @@ -331,7 +331,7 @@ $lang['slideshow'] = '슬라이드쇼'; $lang['square'] = '사각형'; $lang['stop the slideshow'] = '슬라이드쇼 정지'; $lang['the beginning'] = '시작'; -$lang['the username must be given'] = '사용자명이 필요합니다'; +$lang['the username must be given'] = '사용자 이름이 필요합니다'; $lang['this email address is already in use'] = '이미 사용중인 이메일입니다'; $lang['thumb'] = '대표사진'; $lang['today'] = '오늘'; @@ -344,9 +344,9 @@ $lang['The passwords do not match'] = '암호가 일치하지 않습니다'; $lang['Thumbnails'] = '썸네일'; $lang['User "%s" has no email address, password reset is not possible'] = '사용자 "%s"의 이메일 정보가 없어, 암호 초기화가 불가능합니다.'; $lang['User: %s'] = '사용자: %s'; -$lang['Username is mandatory'] = '사용자명은 필수 항목입니다.'; -$lang['Username modification'] = '사용자명 변경'; -$lang['Username or email'] = '사용자명 혹은 이메일'; +$lang['Username is mandatory'] = '사용자 이름은 필수 항목입니다.'; +$lang['Username modification'] = '사용자 이름 변경'; +$lang['Username or email'] = '사용자 이름 혹은 이메일'; $lang['mandatory'] = '필수'; $lang['Password: %s'] = '암호: %s'; $lang['Pause of slideshow'] = '슬라이드쇼 일시정지'; @@ -360,8 +360,8 @@ $lang['Original'] = '원본'; $lang['Mobile'] = '모바일'; $lang['Bad request'] = '잘못된 요청'; $lang['Email'] = '이메일'; -$lang['File name, A → Z'] = '파일명, A → Z'; -$lang['File name, Z → A'] = '파일명, Z → A'; +$lang['File name, A → Z'] = '파일 이름, A → Z'; +$lang['File name, Z → A'] = '파일 이름, Z → A'; $lang['Go back to the album'] = '앨범으로 돌아가기'; $lang['Last Page'] = '마지막 페이지'; $lang['return to the display of all photos'] = '모든 사진 보기로 돌아가기'; @@ -392,17 +392,17 @@ $lang['Photo title, Z → A'] = '사진 제목, Z->A'; $lang['Rating score, high → low'] = '평점, 내림차순'; $lang['Rating score'] = '평점'; $lang['useful when password forgotten'] = '암호를 잊은 경우를 대비'; -$lang['Username "%s" on gallery %s'] = '갤러리 %s에 있는 사용자명 "%s"'; +$lang['Username "%s" on gallery %s'] = '갤러리 %s에 있는 사용자 이름 "%s"'; $lang['Tag results for'] = '태그 겸색 결과 : '; $lang['The number of photos per page must be a not null scalar'] = '페이지당 사진 수는 0이 아닌 정수여야 합니다'; $lang['Password reset is not allowed for this user'] = '해당 사용자는 암호 초기화를 할 수 없습니다.'; -$lang['Please enter your username or email address.'] = '사용자명 혹은 이메일 주소를 입력하십시오.'; +$lang['Please enter your username or email address.'] = '사용자 이름 혹은 이메일 주소를 입력하십시오.'; $lang['Specials'] = '특집'; $lang['Registration of %s'] = '%s 등록'; $lang['Search for all terms'] = '모든 단어로 검색'; $lang['Search for any term'] = '아무 단어나 검색'; $lang['Search for words'] = '단어로 검색'; -$lang['Your username has been successfully changed to : %s'] = '성공적으로 사용자명을 %s로 변경하였습니다.'; +$lang['Your username has been successfully changed to : %s'] = '성공적으로 사용자 이름을 %s로 변경하였습니다.'; $lang['Numeric identifier, 1 → 9'] = '숫자 식별자, 1 → 9'; $lang['Numeric identifier, 9 → 1'] = '숫자 식별자, 9 → 1'; $lang['SQL queries in'] = 'SQL 쿼리에 '; @@ -418,4 +418,10 @@ $lang['Password confirmation is missing. Please confirm the chosen password.'] = $lang['Password is missing. Please enter the password.'] = '암호가 입력되지 않았습니다. 암호를 입력하십시오.'; $lang['%d photos per page'] = '페이지당 %d 개의 사진'; $lang['Theme'] = '테마'; -?> +$lang['Apply on properties'] = '속성 적용'; +$lang['Album name, A → Z'] = '앨범 이름, A → Z'; +$lang['Album name, Z → A'] = '앨범 이름, Z → A'; +$lang['Link: %s'] = '링크: %s'; +$lang['Photo description'] = '사진 설명'; +$lang['Photo title'] = '사진 제목'; +$lang['No results for'] = '다음의 검색 결과가 없음'; \ No newline at end of file diff --git a/sources/language/ko_KR/install.lang.php b/sources/language/ko_KR/install.lang.php index e45fb81..a9af4fb 100755 --- a/sources/language/ko_KR/install.lang.php +++ b/sources/language/ko_KR/install.lang.php @@ -1,24 +1,24 @@ Piwigo message board.'] = '도움이 필요하신가요? Piwigo message board에 물어보세요.'; -$lang['Piwigo was not able to configure PHP 5.'] = 'PHP5 설정에 실패했습니다'; -$lang['Try to configure PHP 5'] = 'PHP5 설정 시도중'; +$lang['Piwigo was not able to configure PHP 5.'] = 'PHP5.2 설정에 실패했습니다'; +$lang['Try to configure PHP 5'] = 'PHP5.2 설정 시도중'; $lang['Welcome to my photo gallery'] = '사진 갤러리에 오신 것을 환영합니다'; $lang['please enter your password again'] = '암호를 다시 입력하십시오'; $lang['An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning : database.inc.php must only contain what is in the textarea, no line return or space character)'] = '또다른 방법으로는 위의 텍스트 상자에 있는 문장을 복사하여 "local/config/database.inc.php"에 복사하는 방법입니다. (경고: database.inc.php는 줄바꿈이나 스페이스 없이 위 텍스트 상자에 있는 내용만 포함해야 합니다. '; $lang['Congratulations, Piwigo installation is completed'] = '축하합니다, Piwigo설치가 끝났습니다'; $lang['Default gallery language'] = '기본 언어'; -$lang['PHP 5 is required'] = 'PHP5가 필요합니다'; +$lang['PHP 5 is required'] = 'PHP5.2가 필요합니다'; $lang['Password ']['confirm'] = '암호 [확인]'; $lang['Sorry!'] = '죄송합니다!'; $lang['Start Install'] = '설치 시작'; @@ -57,4 +57,11 @@ $lang['Download the config file'] = '설정파일 다운로드'; $lang['Host'] = '트명호스트'; $lang['Installation'] = '설치'; $lang['It appears your webhost is currently running PHP %s.'] = '웹서버가 PHP %s를 사용중입니다'; -?> \ No newline at end of file +$lang['Hope to see you back soon.'] = '곧 다시 만나기를 바랍니다.'; +$lang['It will be shown to the visitors. It is necessary for website administration'] = '방문자에게 표시됩니다. 웹사이트 관리를 위해서 필요합니다.'; +$lang['Just another Piwigo gallery'] = '다른 Piwigo 갤러리'; +$lang['Keep it confidential, it enables you to access administration panel'] = '기밀 유지 하십시오. 관리자 패널에 접근할 수 있습니다.'; +$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo는 .htaccess 파일을 생성하거나 수정하여 PHP 5.2 구성으로 전환하려고 시도 할 수 있습니다.'; +$lang['Welcome to your new installation of Piwigo!'] = '새로 설치된 Piwigo에 오신 것을 환영합니다.'; +$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = '호스팅 제공 업체의 지원 내용을 참고하여 직접 PHP 5.2로 전환하는 방법을 찾아야 합니다.'; +$lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = '참고 : 직접 구성을 변경한 다음 Piwigo를 다시 시작할 수 있습니다.'; \ No newline at end of file diff --git a/sources/language/ko_KR/upgrade.lang.php b/sources/language/ko_KR/upgrade.lang.php index 41f34da..601f884 100755 --- a/sources/language/ko_KR/upgrade.lang.php +++ b/sources/language/ko_KR/upgrade.lang.php @@ -1,24 +1,24 @@ \ No newline at end of file +$lang['This page proposes to upgrade your database corresponding to your old version of Piwigo to the current version. The upgrade assistant thinks you are currently running a release %s (or equivalent).'] = '이 페이지는 이전 버전의 Piwigo에서 새 버전으로 데이터베이스로 업그레이드할 것을 제안합니다. 업그레이드 도우미가 정식 버전 %s (또는 유사한 버전)이 동작 중인 것으로 확인됩니다.'; +$lang['Perform a maintenance check in [Administration>Tools>Maintenance] if you encounter any problem.'] = '문제가 발생하었다면 [관리>도구>유지보수]에서 유지보수 점검을 실행하십시오.'; +$lang['User permissions and group permissions have been erased'] = '사용자와 그룹의 권한이 제거됨'; +$lang['Only thumbnails prefix and webmaster mail address have been saved from previous configuration'] = '이전 환경설정에서 썸네일의 접두어와 웹마스터의 메일 주소만 저장되었습니다'; +$lang['As a precaution, following plugins have been deactivated. You must check for plugins upgrade before reactiving them:'] = '예방을 위해서 다음의 플러그인들이 비활성화되었습니다. 플러그인들을 재활성화하기 전에 업그레이드할 수 있는지 확인해야 합니다:'; +$lang['As a precaution, following themes have been deactivated. You must check for themes upgrade before reactiving them:'] = '예방을 위해서 다음의 테마들이 비활성화되었습니다. 테마들을 재활성화하기 전에 업그레이드할 수 있는지 확인해야 합니다:'; +$lang['All sub-albums of private albums become private'] = '비공개 앨범의 모든 하위 앨범들은 비공개가 됩니다'; +$lang['In %s, before ?>, insert:'] = '%s에서 ?>전에 입력:'; diff --git a/sources/language/kok_IN/common.lang.php b/sources/language/kok_IN/common.lang.php index be5de6f..c77eb43 100644 --- a/sources/language/kok_IN/common.lang.php +++ b/sources/language/kok_IN/common.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -22,7 +22,7 @@ // +-----------------------------------------------------------------------+ /* Language Name: कोंकणी [IN] -Version: 2.5.0 +Version: 2.8.2 Language URI: http://piwigo.org/ext/extension_view.php?eid=660 Author: Piwigo team Author URI: http://piwigo.org diff --git a/sources/language/lb_LU/common.lang.php b/sources/language/lb_LU/common.lang.php index 9fc19a5..96c5619 100644 --- a/sources/language/lb_LU/common.lang.php +++ b/sources/language/lb_LU/common.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -22,7 +22,7 @@ // +-----------------------------------------------------------------------+ /* Language Name: Lëtzebuergesch [LU] -Version: 2.7.0 +Version: 2.8.2 Language URI: http://piwigo.org/ext/extension_view.php?eid=715 Author: Piwigo team Author URI: http://piwigo.org @@ -366,4 +366,19 @@ $lang['display most recent photos'] = 'Weist déi neisten Fotoen'; $lang['from %s to %s'] = 'vun %s bis %s'; $lang['posted after %s (%s)'] = 'agesat nom %s (%s)'; $lang['posted before %s (%s)'] = 'agesat virum %s (%s)'; -$lang['posted on %s'] = 'agesat den %s'; \ No newline at end of file +$lang['posted on %s'] = 'agesat den %s'; +$lang['mail address must be like xxx@yyy.eee (example : jack@altern.org)'] = 'E-Mail-Adresse muss dem Muster xxx@yyy.eee (Beispiel: jack@altern.org) entspriechen'; +$lang['delete this photo from your favorites'] = 'Dës Foto aus de Favoritten läschen'; +$lang['delete all photos from your favorites'] = 'All Fotoen aus de Favoritten läschen'; +$lang['created before %s (%s)'] = 'erstallt virum %s (%s)'; +$lang['created between %s (%s) and %s (%s)'] = 'erstallt tëschent dem %s (%s) an dem %s (%s)'; +$lang['You will receive a link to create a new password via email.'] = 'Dir kritt e Link per E-mail fir e neit Passwuert ze erstellen'; +$lang['Your comment has been registered'] = 'Äre Kommentar ass gespäichert'; +$lang['created after %s (%s)'] = 'erstallt nom %s (%s)'; +$lang['Photo title'] = 'Bildtitel'; +$lang['Photo description'] = 'Bildbeschreiwung'; +$lang['Link: %s'] = 'Adress: %s'; +$lang['End-Date'] = 'Enddatum'; +$lang['Apply on properties'] = 'Eegenschaften iwerhuelen'; +$lang['Album name, Z → A'] = 'Albumnumm, Z → A'; +$lang['Album name, A → Z'] = 'Albumnumm, A → Z'; \ No newline at end of file diff --git a/sources/language/lt_LT/admin.lang.php b/sources/language/lt_LT/admin.lang.php index 77f130f..310faf4 100755 --- a/sources/language/lt_LT/admin.lang.php +++ b/sources/language/lt_LT/admin.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -455,7 +455,6 @@ $lang['Number of albums per page'] = 'Albumų skaičius puslapyje'; $lang['Number of comments per page'] = 'Komentarų skaičius puslapyje'; $lang['Number of downloads'] = 'Atsisiuntimų skaičius'; $lang['Number of rates'] = 'Įvertinimų kiekis'; -$lang['Number of thumbnails to create'] = 'Sukurti piktogramų'; $lang['Numeric identifier : %d'] = 'Skaitinis identifikatorius: %d'; $lang['Obsolete Plugins'] = 'Pasenę priedai'; $lang['On your Linux, simply install Shotwell with your package manager and the activate Piwigo publishing option.'] = 'Linux\'e paketu menedžerio pagalba tiesiog instaliuokite Shotwell, tuomet aktyvuokite "Piwigo publishing" parinktį.'; @@ -529,7 +528,6 @@ $lang['Lock'] = 'Užrakinti'; $lang['Lock albums'] = 'Užrakinti albumus'; $lang['Lock gallery'] = 'Užrakinti galerijas'; $lang['Locked'] = 'Užrakinta'; -$lang['Mail address is obligatory for all users'] = 'Pašto adresas privalomas visiems vartotojams'; $lang['Mail content'] = 'Pranešimo turinys'; $lang['Mail sent to %s [%s].'] = 'Pranešimas išsiųstas %s [%s].'; $lang['Main "guest" user does not exist'] = 'Pagrindinis "guest" vartotojas neegzistuoja'; @@ -629,7 +627,6 @@ $lang['new'] = 'nauja'; $lang['no write access'] = 'nėra rašymo teisių'; $lang['none'] = 'nė vienas'; $lang['nothing'] = 'niekas'; -$lang['number of miniaturized photos'] = 'sukurta piktogramų'; $lang['display'] = 'rodyti'; $lang['display maximum informations (added albums and photos, deleted albums and photos)'] = 'rodyti maksimaliai informacijos (pridėti/pašalinti albumai ir nuotraukos)'; $lang['dissociate from group'] = 'atskirti nuo grupės'; @@ -967,4 +964,16 @@ $lang['Users modified'] = 'Vartotojo informacija pakeista'; $lang['Close user details'] = 'Užverti vartotojo detales'; $lang['Open user details'] = 'Atverti vartotojo detales'; $lang['close'] = 'uždaryti'; -$lang['Activate it now'] = 'Aktyvuoti dabar'; \ No newline at end of file +$lang['Activate it now'] = 'Aktyvuoti dabar'; +$lang['No and unlock sub-albums'] = 'Ne ir atrakinti subalbumus'; +$lang['Allow users to add a link to their website'] = 'Leisti vartotojams pridėti nuorodą į savo puslapį'; +$lang['Empty caddie'] = 'Krepšelis tuščias'; +$lang['Impossible to deactivate the default theme.'] = 'Neįmanoma išjungti numatytosios temos.'; +$lang['Mail address is mandatory for registration'] = 'El. pašto adresas būtinas registracijai'; +$lang['The settings for the guest are from the %s user'] = 'Svečio nustatymai nustatyti iš %s vartotojo'; +$lang['Upload in progress'] = 'Įkeliama'; +$lang['based on'] = 'remiantis'; +$lang['between %s and %s MB'] = 'tarp %s ir %s MB'; +$lang['date & time'] = 'data ir laikas'; +$lang['file name'] = 'failo pavadinimas'; +$lang['width & height'] = 'plotis ir dydis'; \ No newline at end of file diff --git a/sources/language/lt_LT/common.lang.php b/sources/language/lt_LT/common.lang.php index c4422e9..ca847a2 100644 --- a/sources/language/lt_LT/common.lang.php +++ b/sources/language/lt_LT/common.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -22,7 +22,7 @@ // +-----------------------------------------------------------------------+ /* Language Name: Lietuviu [LT] -Version: 2.7.0 +Version: 2.8.2 Language URI: http://piwigo.org/ext/extension_view.php?eid=648 Author: Piwigo team Author URI: http://piwigo.org @@ -432,4 +432,10 @@ $lang['Password confirmation is missing. Please confirm the chosen password.'] = $lang['Password confirmation is missing. Please confirm the chosen password.'] = 'Nav paroles apstiprinājuma. Lūdzu apstipriniet paroli.'; $lang['%d photos per page'] = '%d nuotr. puslapyje'; $lang['Theme'] = 'Tema'; -$lang['No results for'] = 'Nėra rezultatų'; \ No newline at end of file +$lang['No results for'] = 'Nėra rezultatų'; +$lang['Album name, A → Z'] = 'Albumo pavadinimas, A → Ž'; +$lang['Album name, Z → A'] = 'Albumo pavadinimas, Ž → A'; +$lang['Apply on properties'] = 'Taikyti pakeitimus'; +$lang['Link: %s'] = 'Nuoroda: %s'; +$lang['Photo description'] = 'Nuotraukos aprašymas'; +$lang['Photo title'] = 'Nuotraukos pavadinimas'; \ No newline at end of file diff --git a/sources/language/lt_LT/install.lang.php b/sources/language/lt_LT/install.lang.php index f071681..0c48864 100755 --- a/sources/language/lt_LT/install.lang.php +++ b/sources/language/lt_LT/install.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -27,24 +27,24 @@ $lang['Congratulations, Piwigo installation is completed'] = 'Sveikiname, Piwigo $lang['enter a login for webmaster'] = 'įveskite webmasterio vartotojo vardą'; $lang['webmaster login can\'t contain characters \' or "'] = 'webmasterio vartotojo vardas negali turėti simbolių \' ar "'; $lang['Start Install'] = 'Pradėti įdiegimą'; -$lang['Try to configure PHP 5'] = 'Pabandyti sukonfigūruoti PHP 5'; +$lang['Try to configure PHP 5'] = 'Pabandyti sukonfigūruoti PHP 5.2'; $lang['Welcome to your new installation of Piwigo!'] = 'Prašom užeiti į naują Piwigo svetainę!'; $lang['also given by your host provider'] = 'taip pat teikiamas Jūsų hostingo paslaugų tiekėjo'; $lang['An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning : database.inc.php must only contain what is in the textarea, no line return or space character)'] = 'Alternatyvus būdas - tai nukopijuoti tekstą iš lauko aukščiau ir įrašyti jį į "local/config/database.inc.php" failą. Dėmesio! database.inc.php turi būti įrašyta tik tai, kas yra textarea laukelyje, jokių tuščių eilučių ir tarpų.'; $lang['user login given by your host provider'] = 'login, kurį davė jūsų paslaugų tiekėjas'; $lang['user password given by your host provider'] = 'slaptažodis, kurį davė jūsų paslaugų tiekėjas'; $lang['Visitors will be able to contact site administrator with this mail'] = 'Lankytojai šiuo el-pašto adresu galės susisiekti su administratorium'; -$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Jūs turėtumėte kreiptis pagalbos į savo paslaugų tiekėją, kaip perjungti į PHP 5 pačiam.'; +$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Jūs turėtumėte kreiptis pagalbos į savo paslaugų tiekėją, kaip perjungti į PHP 5.2 pačiam.'; $lang['database tables names will be prefixed with it (enables you to manage better your tables)'] = 'šį prefiksą turės duomenų bazės lentelės (tai padeda geriau valdyti lenteles)'; $lang['please enter your password again'] = 'dar sykį įveskite savo slaptažodį'; $lang['verification'] = 'patikrinimas'; $lang['Hope to see you back soon.'] = 'Iki greito pasimatymo.'; $lang['Need help ? Ask your question on Piwigo message board.'] = 'Reikia pagalbos ? Užduokite klausimą Piwigo pranešimų lentoje.'; $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'Dėmesio, jūs galite pakeisti savo konfigūraciją pats ir tada perkrauti Piwigo.'; -$lang['PHP 5 is required'] = 'reikalingas PHP 5'; +$lang['PHP 5 is required'] = 'reikalingas PHP 5.2'; $lang['Password ']['confirm'] = 'Slaptažodis [pakartoti]'; -$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo gali pamėginti perjungti Jūsų konfigūraciją į PHP5 sukuriant, ar modifikuojant, .htaccess failą.'; -$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo negalėjo sukonfigūruoti PHP 5'; +$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo gali pamėginti perjungti Jūsų konfigūraciją į PHP5.2 sukuriant, ar modifikuojant, .htaccess failą.'; +$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo negalėjo sukonfigūruoti PHP 5.2'; $lang['Sorry!'] = 'Apgailestaujame!'; $lang['User'] = 'Vartotojas'; $lang['Welcome to my photo gallery'] = 'Sveiki atvykę į mano foto galeriją'; @@ -64,5 +64,4 @@ $lang['It appears your webhost is currently running PHP %s.'] = 'Jūsų webhost\ $lang['It will be shown to the visitors. It is necessary for website administration'] = 'Tai bus rodoma lankytojams. Tai būtina puslapio administracijai'; $lang['Just another Piwigo gallery'] = 'Tiesiog dar viena Piwigo galerija'; $lang['Keep it confidential, it enables you to access administration panel'] = 'Saugokite tai slaptai, nes tai leidžia prisijungti prie administratoriaus valdymo skydo.'; -$lang['localhost or other, supplied by your host provider'] = 'localhost arba kitas, suteiktas jūsų paslaugų tiekėjo'; -?> \ No newline at end of file +$lang['localhost or other, supplied by your host provider'] = 'localhost arba kitas, suteiktas jūsų paslaugų tiekėjo'; \ No newline at end of file diff --git a/sources/language/lt_LT/upgrade.lang.php b/sources/language/lt_LT/upgrade.lang.php index 409323b..954833a 100755 --- a/sources/language/lt_LT/upgrade.lang.php +++ b/sources/language/lt_LT/upgrade.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/language/lv_LV/admin.lang.php b/sources/language/lv_LV/admin.lang.php index 245c25c..2facc88 100644 --- a/sources/language/lv_LV/admin.lang.php +++ b/sources/language/lv_LV/admin.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -977,4 +977,13 @@ $lang['between %s and %s MB'] = 'starp %s un %s MB'; $lang['width & height'] = 'platums&augstums'; $lang['file name'] = 'faila nosaukums'; $lang['date & time'] = 'datums&laiks'; -$lang['Upload in progress'] = 'Notiek augšupielāde'; \ No newline at end of file +$lang['Upload in progress'] = 'Notiek augšupielāde'; +$lang['Each email sent will contain its own automatic authentication key on links, valid for %s.'] = 'Katram nosūtītajam e-pastam būs sava automātiskā autentifikācijas atslēga saitēm, derīga %s.'; +$lang['For security reason, authentication keys do not work for administrators.'] = 'Drošības apsvērumu dēļ, autentifikācijas atslēgas nestrādā administratoriem.'; +$lang['No user is permitted to see this private album'] = 'Nevienam lietotājam nav atļauts redzēt šo privāto albumu'; +$lang['Y Repeat'] = 'YAtkārtojumi'; +$lang['Recipients'] = 'Saņēmēji'; +$lang['Orphans'] = 'Nezināmie'; +$lang['No recipient selected'] = 'Nav izvēlēts neviens saņēmējs'; +$lang['Edit user'] = 'Rediģēt lietotāju'; +$lang['Delete %d orphan photos'] = 'Dzēst %d nezināmos foto '; \ No newline at end of file diff --git a/sources/language/lv_LV/common.lang.php b/sources/language/lv_LV/common.lang.php index 9553d94..0434d5d 100644 --- a/sources/language/lv_LV/common.lang.php +++ b/sources/language/lv_LV/common.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -22,7 +22,7 @@ // +-----------------------------------------------------------------------+ /* Language Name: Latviešu [LV] -Version: 2.7.0 +Version: 2.8.2 Language URI: http://piwigo.org/ext/extension_view.php?eid=427 Author: Piwigo team Author URI: http://piwigo.org @@ -425,4 +425,5 @@ $lang['Photo title'] = 'Foto nosaukums'; $lang['Photo description'] = 'Foto apraksts'; $lang['Album name, A → Z'] = 'Albūma nosaukums, A → Z '; $lang['Album name, Z → A'] = 'Albūma nosaukums, Z → A '; -$lang['Link: %s'] = 'Saite: %s'; \ No newline at end of file +$lang['Link: %s'] = 'Saite: %s'; +$lang['Your authentication key is no longer valid.'] = 'Jūsu autentifikācijas atslēga vairs nav derīga'; \ No newline at end of file diff --git a/sources/language/lv_LV/help/photos_add_ftp.html b/sources/language/lv_LV/help/photos_add_ftp.html index 3f380df..76ccd4c 100644 --- a/sources/language/lv_LV/help/photos_add_ftp.html +++ b/sources/language/lv_LV/help/photos_add_ftp.html @@ -25,43 +25,39 @@

    Kategoriju mapes atrodas Piwigo mapē "galleries". Tālāk seko ļoti mazas (bet ar ļoti daudz iespējām) galerijas mapju koks: -

    -.
-|-- admin
-|-- doc
-|-- galleries
-|   |-- category-1
-|   |   |-- category-1.1
-|   |   |   |-- category-1.1.1
-|   |   |   |   |-- category-1.1.1.1
-|   |   |   |   |   |-- pwg_high
-|   |   |   |   |   |   +-- wedding.jpg
-|   |   |   |   |   |-- thumbnail
-|   |   |   |   |   |   +-- TN-wedding.jpg
-|   |   |   |   |   +-- wedding.jpg
-|   |   |   |   +-- category-1.1.1.2
-|   |   |   +-- category-1.1.2
-|   |   |-- category-1.2
-|   |   |   |-- pookie.jpg
-|   |   |   +-- thumbnail
-|   |   |       +-- TN-pookie.jpg
-|   |   +-- category-1.3
-|   +-- category-2
-|       |-- piglet.gif
-|       |-- pwg_representative
-|       |   +-- video.jpg
-|       |-- thumbnail
-|       |   +-- TN-piglet.jpg
-|       +-- video.avi
-|-- include
-|-- install
-|-- language
-|-- template
-+-- tool
    + + 
    +galleries
+|-- wedding
+|   |-- celebration
+|   |   |-- arrival
+|   |   |   |-- paul-alone.jpg
+|   |   |   +-- sarah-alone.jpg
+|   |   +-- departure
+|   |       +-- paul-and-sarah.jpg
+|   +-- party
+|       |-- dancers001.jpg
+|       |-- dancers002.jpg
+|       +-- dancers003.jpg
++-- honeymoon
+|   |-- hotel.png
+|   |-- video-from-plane.avi
+|   +-- pwg_representative
+|       +-- video-from-plane.jpg
++-- photoshoot
+    |-- img0001.jpg
+    |-- img0002.jpg
+    +-- pwg_format
+        |-- img0001.cr2
+        |-- img0001.cmyk.jpg
+        |-- img0001.zip
+        |-- img0002.cr2
+        +-- img0002.cmyk.jpg
+
    -
  • Izņemot ar nosaukumu "thumbnail", "pwg_high" vai "pwg_representative" (skatīt skaidrojumu zemāk), katra mape zem "galleries" veido kategoriju. To dziļumam nav ierobežojumu.
    • +
  • Izņemot ar nosaukumu "pwg_representative" vai "pwg_format (skatīt skaidrojumu zemāk), katra mape zem "galleries" veido kategoriju. To dziļumam nav ierobežojumu.
  • Pamatā elementu pārstāv fails. Fails var būt Piwigo elements, ja tā paplašinājums ir starp file_ext konfigurācijas parametru iespējām (skatīt include/config_default.inc.php failu). Fails var būt attēls, ja tā paplašinājums ir starp picture_ext konfigurācijas parametru iespējām.
    • @@ -71,6 +67,8 @@
  • Pēc noklusējuma ikonai, kas pārstāv faila nosaukuma paplašinājumu, nav nekādu papildus attēla elementu (video, skaņu, tekstu, jebkas...) . Ar papildus izvēli, Jūs varat sasaistīt sīkbildi un pārstāvošo failu (skatīt video.avi augstāk piemērā).
    • +
  • Multiple formats: a photo can be available in several formats. In this example, we have 3 additional formats for img0001.jpg. You can activate this feature with $conf['enable_formats'] = true; in your local configuration and define a list of formats, like $conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');
    • +
  • Brīdinājums: mapju un failu nosaukumi jāveido tikai no burtiem, cipariem, "-", "_" vai ".". Nav pieļaujami tukšumi vai apakšsvītras.
  • Kolīdz faili, sīkbildes un pārstāvības ir korekti saliktas mapēs, ejam uz: Administrēšanu » Kategorijām » Sinchronizšānu
    • diff --git a/sources/language/lv_LV/index.php b/sources/language/lv_LV/index.php index c8de97f..0b96c3e 100644 --- a/sources/language/lv_LV/index.php +++ b/sources/language/lv_LV/index.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/language/lv_LV/install.lang.php b/sources/language/lv_LV/install.lang.php index 094ce46..bf72b9c 100644 --- a/sources/language/lv_LV/install.lang.php +++ b/sources/language/lv_LV/install.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -46,14 +46,14 @@ $lang['Password [confirm]'] = "Parole [apstiprinat]"; $lang['verification'] = "parbaude"; $lang['Need help ? Ask your question on Piwigo message board.'] = "Vajag palidzibu? Uzdodiet savu jautajumu Piwigo sludinajumos."; $lang['Visitors will be able to contact site administrator with this mail'] = "Apmekletaji vares izmantot šo e-pastu, lai sazinatos ar lapas administratoru"; -$lang['PHP 5 is required'] = "nepieciešams PHP 5 "; +$lang['PHP 5 is required'] = 'nepieciešams PHP 5.2 '; $lang['It appears your webhost is currently running PHP %s.'] = "Jusu webhosts patlaban izmanto PHP %s."; -$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = "Piwigo var meginat parslegt Jusu konfiguraciju uz PHP 5 izveidojot vai modificejot a .htaccess failu."; +$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo var meginat parslegt Jusu konfiguraciju uz PHP 5.2 izveidojot vai modificejot a .htaccess failu.'; $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = "Jus varat izmanit savu konfiguraciju pats un pec tam parstartet Piwigo."; -$lang['Try to configure PHP 5'] = "Meginiet nokonfiguret PHP 5"; +$lang['Try to configure PHP 5'] = 'Meginiet nokonfiguret PHP 5.2'; $lang['Sorry!'] = "Atvainojiet!"; -$lang['Piwigo was not able to configure PHP 5.'] = "Piwigo nevar nokonfiguret PHP 5."; -$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = "Jums javeršas pie Jusu hostinga pakalpojuma sniedzeja pec palidzibas un pašam jamegina parslegties uz PHP 5 atbalstu."; +$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo nevar nokonfiguret PHP 5.2'; +$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Jums javeršas pie Jusu hostinga pakalpojuma sniedzeja pec palidzibas un pašam jamegina parslegties uz PHP 5.2 atbalstu.'; $lang['Hope to see you back soon.'] = "Ceram Jus redzet atkal."; $lang['Congratulations, Piwigo installation is completed'] = 'Apsveicam, Piwigo instalacija ir pabeigta'; $lang['An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning : database.inc.php must only contain what is in the textarea, no line return or space character)'] = ' Alternativa ir iekopet tekstu lodzina augšpuse un ielimet to faila "local/config/database.inc.php" (Uzmanibu : database.inc.php drikst saturet tikai to kas ir teksta lodzina, ne enter ne tukšumus)'; @@ -64,5 +64,4 @@ $lang['Just another Piwigo gallery'] = 'Vēl viena Piwigo galerija'; $lang['Welcome to my photo gallery'] = 'Laipni lūgti manā foto galerijā'; $lang['Welcome to your new installation of Piwigo!'] = 'Laipni lūgti Jūsu Piwigo jaunajā instalācijā!'; $lang['Don\'t hesitate to consult our forums for any help : %s'] = 'Nevilcinieties izmantot mūsu forumu palīdzību: %s'; -$lang['localhost or other, supplied by your host provider'] = 'vietējais pakalpojuma sniedzējs vai cits, tas ko atbalsta vietējais pakalpojuma sniedzējs'; -?> \ No newline at end of file +$lang['localhost or other, supplied by your host provider'] = 'vietējais pakalpojuma sniedzējs vai cits, tas ko atbalsta vietējais pakalpojuma sniedzējs'; \ No newline at end of file diff --git a/sources/language/lv_LV/upgrade.lang.php b/sources/language/lv_LV/upgrade.lang.php index 0bbd253..79cfe56 100644 --- a/sources/language/lv_LV/upgrade.lang.php +++ b/sources/language/lv_LV/upgrade.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/language/mk_MK/admin.lang.php b/sources/language/mk_MK/admin.lang.php index 2650bb1..696ad10 100644 --- a/sources/language/mk_MK/admin.lang.php +++ b/sources/language/mk_MK/admin.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/language/mk_MK/common.lang.php b/sources/language/mk_MK/common.lang.php index 15a9153..a370bce 100644 --- a/sources/language/mk_MK/common.lang.php +++ b/sources/language/mk_MK/common.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -22,7 +22,7 @@ // +-----------------------------------------------------------------------+ /* Language Name: Македонски [MK] -Version: 2.7.0 +Version: 2.8.2 Language URI: http://piwigo.org/ext/extension_view.php?eid=428 Author: Piwigo team Author URI: http://piwigo.org diff --git a/sources/language/mk_MK/index.php b/sources/language/mk_MK/index.php index c8de97f..0b96c3e 100644 --- a/sources/language/mk_MK/index.php +++ b/sources/language/mk_MK/index.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/language/mk_MK/install.lang.php b/sources/language/mk_MK/install.lang.php index 02b43ab..1bea637 100755 --- a/sources/language/mk_MK/install.lang.php +++ b/sources/language/mk_MK/install.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -31,6 +31,5 @@ $lang['Hope to see you back soon.'] = 'Се надеваме дека ќе се $lang['Installation'] = 'Инсталација'; $lang['Sorry!'] = 'Извини !'; $lang['Start Install'] = 'Стартувај ја инсталацијата'; -$lang['Try to configure PHP 5'] = 'Пробај да го сетираш PHP 5'; -$lang['User'] = 'Корисник'; -?> \ No newline at end of file +$lang['Try to configure PHP 5'] = 'Пробај да го сетираш PHP 5.2'; +$lang['User'] = 'Корисник'; \ No newline at end of file diff --git a/sources/language/mn_MN/admin.lang.php b/sources/language/mn_MN/admin.lang.php index a550e61..0782ce5 100755 --- a/sources/language/mn_MN/admin.lang.php +++ b/sources/language/mn_MN/admin.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -41,7 +41,7 @@ $lang['other'] = 'бусад'; $lang['photos per page'] = '(нэг хуудсанд харагдах зураг)'; $lang['ranks'] = 'түвшин'; $lang['registered users'] = 'бүртгүүлсэн хэрэглэгчид'; -$lang['registration date'] = 'бүртгүүлсэн огноо'; +$lang['registration date'] = 'Бүртгүүлсэн огноо'; $lang['remove tags'] = 'түлхүүр үгийг хасах'; $lang['remove this filter'] = 'энэ сонголтыг хасах'; $lang['test'] = 'шалгах'; @@ -311,8 +311,8 @@ $lang['Activate'] = 'Идэвхжүүлэх'; $lang['Watermark'] = 'Усан хээ'; $lang['Rename'] = 'Нэрийг солих'; $lang['Position'] = 'Байршил'; -$lang['Number of comments per page'] = 'Нэг хуудасанд харуулах сэтгэгдэлийн тоо'; -$lang['Number of albums per page'] = 'Нэг хуудасанд харуулах цомгийн тоо'; +$lang['Number of comments per page'] = 'Нэг хуудсанд харуулах сэтгэгдэлийн тоо'; +$lang['Number of albums per page'] = 'Нэг хуудсанд харуулах цомгийн тоо'; $lang['Number of rates'] = 'Үнэлсэн тоо'; $lang['Main Page'] = 'Үндсэн хуудас'; $lang['Activate comments'] = 'Сэтгэгдэлийг идэвхжүүлэх'; @@ -645,7 +645,7 @@ $lang['between %.2f and %.2f'] = '%.2f-с %.2f-н хооронд'; $lang['between %d and %d pixels'] = '%d-с %d пикселийн хооронд'; $lang['The picture dimensions will be reduced to %dx%d pixels.'] = 'Зургийн хэмжээ %dx%d пиксель болж багсана.'; $lang['Summary'] = 'Дүгнэлт'; -$lang['Show %s users'] = '%s хэрэглэгчдийг харуулах'; +$lang['Show %s users'] = '%s хэрэглэгчийг харуулах'; $lang['Random photo'] = 'Дурын зураг'; $lang['Name of the duplicate'] = 'Давхардсан нэр'; $lang['Manage the members'] = 'Гишүүдийг зохицуулах'; @@ -744,4 +744,6 @@ $lang['high'] = 'өндөр'; $lang['remove creation date'] = 'үүсгэсэн огноог хасах'; $lang['unknown'] = 'үлмэдэгдэх'; $lang['width & height'] = 'өргөн & өндөр'; -$lang['width must be a number superior to'] = 'өргөний хамгийн бага хэмжээ'; \ No newline at end of file +$lang['width must be a number superior to'] = 'өргөний хамгийн бага хэмжээ'; +$lang['Opacity'] = 'Хамрах хүрээ'; +$lang['Mail address is mandatory for registration'] = 'Бүртгүүлэхэд имэйл хаяг заавал шаардах'; \ No newline at end of file diff --git a/sources/language/mn_MN/common.lang.php b/sources/language/mn_MN/common.lang.php index 0fe4068..eca165d 100644 --- a/sources/language/mn_MN/common.lang.php +++ b/sources/language/mn_MN/common.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -22,7 +22,7 @@ // +-----------------------------------------------------------------------+ /* Language Name: Монгол [MN] -Version: 2.7.2 +Version: 2.8.2 Language URI: http://piwigo.org/ext/extension_view.php?eid=696 Author: Piwigo team Author URI: http://piwigo.org @@ -237,7 +237,7 @@ $lang['delete this photo from your favorites'] = 'энэ зургийг дурт $lang['display your favorites photos'] = 'дуртай зурагнуудаа харах'; $lang['The number of photos per page must be a not null scalar'] = 'Нэг хуудсанд харуулах зургийн тоо 0-с их байх ёстой'; $lang['I want to add photos'] = 'Би зураг оруулмаар байна'; -$lang['Number of photos per page'] = 'Нэг хуудасанд харагдах зургын тоо'; +$lang['Number of photos per page'] = 'Нэг хуудсанд харагдах зургын тоо'; $lang['%d photo is also linked to current tags'] = '%d зураг энэ түлхүүр үгтэй холбоотой байна'; $lang['%d photos are also linked to current tags'] = '%d зураг энэ түлхүүр үгтэй холбоотой байна'; $lang['Update your rating'] = 'Үнэлгээгээ шинэчлэх'; @@ -415,7 +415,7 @@ $lang['Go back to the album'] = 'Цомог уруу буцах'; $lang['Last Page'] = 'сүүлийн хуудас'; $lang['Password is missing. Please enter the password.'] = 'Уучлаарай. Нууц үгээ оруулна уу.'; $lang['Password confirmation is missing. Please confirm the chosen password.'] = 'Нууц үгээ баталгаажуулж давтан оруулна уу.'; -$lang['%d photos per page'] = 'Нэг хуудасанд %d зураг'; +$lang['%d photos per page'] = 'Нэг хуудсанд %d зураг'; $lang['Theme'] = 'Загвар'; $lang['Photo description'] = 'Зургийн тайлбар'; $lang['Photo title'] = 'Зургийн нэр'; @@ -423,4 +423,5 @@ $lang['Apply on properties'] = 'Тохиргоог хадгалах'; $lang['No results for'] = 'Ийм үр дүн олдсонгүй'; $lang['Album name, A → Z'] = 'Цомогын нэр, A → Z'; $lang['Album name, Z → A'] = 'Цомогын нэр, Z → A'; -$lang['Link: %s'] = 'Холбоос: %s'; \ No newline at end of file +$lang['Link: %s'] = 'Холбоос: %s'; +$lang['Your authentication key is no longer valid.'] = 'Хүчингүй болсон баталгаажуулах код байна'; \ No newline at end of file diff --git a/sources/language/mn_MN/install.lang.php b/sources/language/mn_MN/install.lang.php index c9b3792..7ae8195 100755 --- a/sources/language/mn_MN/install.lang.php +++ b/sources/language/mn_MN/install.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -22,10 +22,10 @@ // +-----------------------------------------------------------------------+ $lang['It appears your webhost is currently running PHP %s.'] = 'Таны вэбсервер PHP %s хувилбарыг ашиглаж байна'; -$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo PHP 5-г тохиргоог өөрчилж чадсангүй'; +$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo PHP 5.2-г тохиргоог өөрчилж чадсангүй'; $lang['Congratulations, Piwigo installation is completed'] = 'Танд баяр хүргэе, Piwigo амжилттай сууж дууслаа.'; $lang['Connection to server succeed, but it was impossible to connect to database'] = 'Сервертэй амжилттай холбогдсон боловч мэдээллийн сантай холбогдох үед алдаа гарлаа.'; -$lang['Try to configure PHP 5'] = 'PHP 5 тохиргоогоо өөрчилж үзнэ үү'; +$lang['Try to configure PHP 5'] = 'PHP 5.2 тохиргоогоо өөрчилж үзнэ үү'; $lang['User'] = 'Хэрэглэгч'; $lang['Just another Piwigo gallery'] = 'Piwigo-н галерей нэгээр нэмэгдлээ'; $lang['Database configuration'] = 'Мэдээллийн сангийн тохиргоо'; @@ -37,7 +37,7 @@ $lang['Password ']['confirm'] = 'Нууц үгээ давтах'; $lang['Can\'t connect to server'] = 'Сервертэй холбогдож чадахгүй байна'; $lang['Database name'] = 'Мэдээллийн сангын нэр'; $lang['Default gallery language'] = 'Үндсэн хэл'; -$lang['PHP 5 is required'] = 'PHP 5 шаардлагатай'; +$lang['PHP 5 is required'] = 'PHP 5.2 шаардлагатай'; $lang['Download the config file'] = 'Тохиргооны файлыг татах'; $lang['Admin configuration'] = 'Админий тохиргоо'; $lang['Basic configuration'] = 'Үндсэн тохиргоо'; @@ -59,5 +59,4 @@ $lang['You can download the config file and upload it to local/config directory $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'Тохиргоогоо өөрөө өөрчлөөд Piwigo-г дахин ачаалж болно гэдгийг санаарай.'; $lang['Don\'t hesitate to consult our forums for any help : %s'] = 'Тусламж хэрэгтэй бол манай онлайн форумд хандаарай: %s'; $lang['Host'] = 'Байршуулах компьютер'; -$lang['Installation'] = 'Суулгац'; -?> \ No newline at end of file +$lang['Installation'] = 'Суулгац'; \ No newline at end of file diff --git a/sources/language/mn_MN/upgrade.lang.php b/sources/language/mn_MN/upgrade.lang.php index eb3f3ca..e4a1a17 100755 --- a/sources/language/mn_MN/upgrade.lang.php +++ b/sources/language/mn_MN/upgrade.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/language/ms_MY/common.lang.php b/sources/language/ms_MY/common.lang.php index ccaaad6..92e0ca6 100644 --- a/sources/language/ms_MY/common.lang.php +++ b/sources/language/ms_MY/common.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -22,7 +22,7 @@ // +-----------------------------------------------------------------------+ /* Language Name: Malay [MY] -Version: 2.5.0 +Version: 2.8.2 Language URI: http://piwigo.org/ext/extension_view.php?eid=645 Author: Piwigo team Author URI: http://piwigo.org diff --git a/sources/language/nb_NO/admin.lang.php b/sources/language/nb_NO/admin.lang.php index 4d8b0dc..4acf3b3 100644 --- a/sources/language/nb_NO/admin.lang.php +++ b/sources/language/nb_NO/admin.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -96,9 +96,9 @@ $lang['Linked albums'] = 'Linkede album'; $lang['Lock gallery'] = 'Lås galleri'; $lang['Maintenance'] = 'Vedlikehold'; $lang['Edit album permissions'] = 'Rediger album rettigheter'; -$lang['Manage permissions for group "%s"'] = 'Behandle tillatelser for gruppen "%s"'; -$lang['Manage permissions for user "%s"'] = 'Behandle tillatelser for bruker "%s"'; -$lang['Manage tags'] = 'Behandle tags'; +$lang['Manage permissions for group "%s"'] = 'Rediger tillatelser for gruppen "%s"'; +$lang['Manage permissions for user "%s"'] = 'Rediger tillatelser for bruker "%s"'; +$lang['Manage tags'] = 'Rediger tagger'; $lang['Members'] = 'Medlemmer'; $lang['Metadata synchronized from file'] = 'Metadata synkronisert fra fil'; $lang['Move albums'] = 'Flytt album'; @@ -181,7 +181,7 @@ $lang['Private'] = 'Privat'; $lang['Public'] = 'Offentlig'; $lang['Find a new representant by random'] = 'Finn en ny tilfeldig representant'; $lang['Public / Private'] = 'Offentlig / Privat'; -$lang['Manage authorizations for selected albums'] = 'Behandle autorisasjoner for valgt album'; +$lang['Manage authorizations for selected albums'] = 'Rediger autorisasjoner for valgt album'; $lang['Virtual album added'] = 'Virtuelt album lagt til'; $lang['Virtual album deleted'] = 'Virtuelt album slettet'; $lang['Access type'] = 'Tilgangstype type'; @@ -215,7 +215,7 @@ $lang['Lock'] = 'Lås'; $lang['Locked'] = 'Låst'; $lang['manage album photos'] = 'behandle album elementer'; $lang['manage sub-albums'] = 'behandle grunn-album'; -$lang['Manage'] = 'Behandle'; +$lang['Manage'] = 'Rediger'; $lang['Execution time is out, treatment must be continue [Estimated time: %d second].'] = 'Prossessen svarer ikke, behandling fortsetter [Estimert tid: %d sekund].'; $lang['Execution time is out, treatment must be continue [Estimated time: %d seconds].'] = 'Prossessen svarer ikke, behandling fortsetter [Estimert tid: %d sekunder].'; $lang['Prepared time for list of users to send mail is limited. Others users are not listed.'] = 'Tiden å forberede liste over brukere som vil bli mailet er begrenset. Andre brukere er ikke listet.'; @@ -508,7 +508,7 @@ $lang['Optimizations have been completed with some errors.'] = 'Optimalisering h $lang['Modify information'] = 'Endre informasjon'; $lang['nothing'] = 'ingen ting'; $lang['overrides existing values with empty ones'] = 'overskriver eksisterende verdier med tomme'; -$lang['Manage photo ranks'] = 'Behandle bilde rangering'; +$lang['Manage photo ranks'] = 'Rediger bilde rangering'; $lang['Edit ranks'] = 'Rediger rangering'; $lang['No photo in this album'] = 'Ingen elementer i dette album'; $lang['Images manual order was saved'] = 'Bilders manuelle rekkefølge lagret'; @@ -560,7 +560,7 @@ $lang['Uploaded Photos'] = 'Opplastede bilder'; $lang['%d photos uploaded'] = '%d foto opplastet'; $lang['Privacy level set to "%s"'] = 'Privat nivå satt til "%s"'; $lang['Album "%s" now contains %d photos'] = 'Album "%s" består nå av %d bilder'; -$lang['Manage this set of %d photos'] = 'Behandle disse %d bildene'; +$lang['Manage this set of %d photos'] = 'Rediger disse %d bildene'; $lang['Select files'] = 'Velg filer'; $lang['Everybody'] = 'Alle'; $lang['Who can see these photos?'] = 'Hvem kan se disse bildene?'; @@ -596,7 +596,7 @@ $lang['Switch to clear or dark colors for administration'] = 'Bytt til lyse elle $lang['Theme has been successfully installed'] = 'Temaet er installert'; $lang['Visit Gallery'] = 'Besøk galleriet'; $lang['Visit Piwigo project website'] = 'Besøk Piwigo prosjektets webside'; -$lang['pLoader stands for Piwigo Uploader. From your computer, pLoader prepares your photos and transfer them to your Piwigo photo gallery.'] = 'pLoader står for Piwigo Opplaster. Fra din maskin, pLoader klargjør dine bilder og overfører demtil ditt Piwigo photo galleri.'; +$lang['pLoader stands for Piwigo Uploader. From your computer, pLoader prepares your photos and transfer them to your Piwigo photo gallery.'] = 'pLoader står for Piwigo Opplaster. Fra din maskin, pLoader klargjør dine bilder og overfører dem til ditt Piwigo photo galleri.'; $lang['Guest Settings'] = 'Instillinger for gjester'; $lang['Main Page'] = 'Hovedside'; $lang['Photo Page'] = 'Bilde side'; @@ -758,7 +758,7 @@ $lang['I decide to update anyway'] = 'Jeg vil oppgradere allikevel'; $lang['Ignore All'] = 'Ignorer alle'; $lang['Ignore this update'] = 'Ignorer denne oppdatering'; $lang['Include history data (Warning: server memory limit may be exceeded)'] = 'Inkluder historisk data (Advarsel: serverens minne kan overstiges)'; -$lang['Manage Permissions'] = 'Behandle rettigheter'; +$lang['Manage Permissions'] = 'Rediger rettigheter'; $lang['Maximum file size: %sB.'] = 'Maksimal filstørrelse: %sB.'; $lang['Merge selected tags'] = 'Flett merkede bildetags'; $lang['Merge tags'] = 'Flett bildetags'; @@ -917,7 +917,7 @@ $lang['Name of the duplicate'] = 'Navn på duplikater'; $lang['Source tag'] = 'Kildetagg'; $lang['Tag "%s" is now a duplicate of "%s"'] = 'Tagg "%s" er nå en duplikat av "%s"'; $lang['Landscape'] = 'Liggende'; -$lang['Manage photos'] = 'Behandle bilder'; +$lang['Manage photos'] = 'Rediger bilder'; $lang['Minimum height'] = 'Minimum høyde'; $lang['Minimum width'] = 'Minimum bredde'; $lang['Number of albums per page'] = 'Antall album pr side'; @@ -926,7 +926,7 @@ $lang['Portrait'] = 'Portrett'; $lang['View in gallery'] = 'Se i galleri'; $lang['Ratio'] = 'Ratio'; $lang['Duplicate'] = 'Duplikat'; -$lang['Manage the members'] = 'Behandle medlemmene'; +$lang['Manage the members'] = 'Administrer medlemmer'; $lang['Merge selected groups'] = 'Flett markerte grupper'; $lang['No group selected, no action possible.'] = 'Ingen gruppe markert, kan ikke gjøre noe.'; $lang['No members to manage'] = 'Ingen medlemmer å behandle'; @@ -978,4 +978,13 @@ $lang['based on'] = 'basert på'; $lang['between %s and %s MB'] = 'mellom%s og %s MB'; $lang['date & time'] = 'dato og klokkeslett'; $lang['file name'] = 'filnavn'; -$lang['width & height'] = 'bredde og høyde'; \ No newline at end of file +$lang['width & height'] = 'bredde og høyde'; +$lang['Delete %d orphan photos'] = 'Slett %d eierløse bilder'; +$lang['Each email sent will contain its own automatic authentication key on links, valid for %s.'] = 'Hver e-post som sendes vil inneholde sin egen automatiske autentiseringsnøkkel til lenker, gyldig for %s.'; +$lang['Edit user'] = 'Rediger bruker'; +$lang['For security reason, authentication keys do not work for administrators.'] = 'Av sikkerhetsmessige årsaker vil ikke autentiseringsnøkler fungere for administratorer.'; +$lang['No recipient selected'] = 'Ingen mottaker er valgt'; +$lang['No user is permitted to see this private album'] = 'Ingen brukeren har tillatelse til å se denne private album'; +$lang['Orphans'] = 'Eierløs'; +$lang['Recipients'] = 'Mottakere'; +$lang['Y Repeat'] = 'Y Gjenta'; \ No newline at end of file diff --git a/sources/language/nb_NO/common.lang.php b/sources/language/nb_NO/common.lang.php index db1ccf2..62ce74a 100644 --- a/sources/language/nb_NO/common.lang.php +++ b/sources/language/nb_NO/common.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -22,7 +22,7 @@ // +-----------------------------------------------------------------------+ /* Language Name: Norsk bokmål [NO] -Version: 2.7.2 +Version: 2.8.2 Language URI: http://piwigo.org/ext/extension_view.php?eid=483 Author: Piwigo team Author URI: http://piwigo.org @@ -46,7 +46,7 @@ $lang['User: %s'] = "Bruker: %s"; $lang['Email: %s'] = 'E-post: %s'; $lang['Admin: %s'] = "Admin: %s"; $lang['Registration of %s'] = "Registrering av %s"; -$lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = "Feil status for bruker \"gjest\", default status vil bli brukt. Vennligst kontakt webmaster."; +$lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'Feil status for bruker "gjest", standard status vil bli brukt. Vennligst kontakt webmaster.'; $lang['this email address is already in use'] = 'En annen bruker har allerede denne e-postadressem'; $lang['Tag results for'] = "Tag resultat for"; $lang['from %s to %s'] = "fra %s til %s"; @@ -54,9 +54,9 @@ $lang['Play of slideshow'] = 'Start slideshow'; $lang['Pause of slideshow'] = "Pause slideshow"; $lang['Repeat the slideshow'] = "Gjenta slideshow"; $lang['Not repeat the slideshow'] = "Ikke repeter slideshow"; -$lang['Reduce diaporama speed'] = "Reduser slideshow hastighet"; -$lang['Accelerate diaporama speed'] = "Øk slideshow hastighet"; -$lang['Submit'] = "Send"; +$lang['Reduce diaporama speed'] = 'Reduser hastighet på slideshow'; +$lang['Accelerate diaporama speed'] = 'Øk hastighet på slideshow'; +$lang['Submit'] = 'Lagre'; $lang['Yes'] = "Ja"; $lang['No'] = "Nei"; $lang['%d photo'] = "%d bilde"; @@ -64,7 +64,7 @@ $lang['%d photos'] = "%d bilder"; $lang['%d photo is also linked to current tags'] = '%d bilde er også linket til gjeldende stikkord'; $lang['%d photos are also linked to current tags'] = '%d bilder er også linket til gjeldende stikkord'; $lang['display photos linked to this tag'] = 'Se kun bilder linket til gjeldende stikkord'; -$lang['photos posted during the last %d days'] = "bilder postet innen de siste %d dager"; +$lang['photos posted during the last %d days'] = 'opplastede bilder de siste %d dager'; $lang['Piwigo Help'] = "Piwigo hjelp"; $lang['Rank'] = "Rangering"; $lang['group by letters'] = "ordne etter bokstav"; @@ -74,7 +74,7 @@ $lang['cloud'] = 'sky'; $lang['Reset to default values'] = "Sett tilbake til standard verdier"; $lang['delete all photos from your favorites'] = "slett alle bilder fra dine favoritter"; $lang['Sent by'] = "Sendt av"; -$lang['Cookies are blocked or not supported by your browser. You must enable cookies to connect.'] = "Cookies er blokkert eller ikke støttet av din nettleser. Du må aktivere cookies for å logge inn."; +$lang['Cookies are blocked or not supported by your browser. You must enable cookies to connect.'] = 'Informasjonskapsler er blokkert eller ikke støttet av din nettleser. Du må aktivere informasjonskapsler for å logge inn.'; $lang['day'][0] = 'Søndag'; $lang['day'][1] = 'Mandag'; $lang['day'][2] = 'Tirsdag'; @@ -99,7 +99,7 @@ $lang['Album'] = 'Album'; $lang['Close this window'] = 'Lukk dette vinduet'; $lang['Complete RSS feed (photos, comments)'] = 'Komplett RSS mating (bilder, kommentarer)'; $lang['Confirm Password'] = 'Bekreft Passord'; -$lang['Connection settings'] = 'Tilkoblings innstillinger'; +$lang['Connection settings'] = 'Tilkoblingsinnstillinger'; $lang['Login'] = 'Logg inn'; $lang['Contact webmaster'] = 'Kontakt webmaster'; $lang['Create a new account'] = 'Opprett ny konto'; @@ -112,13 +112,13 @@ $lang['Each listed rule must be satisfied.'] = 'Alle listede krav må være oppf $lang['Email address'] = 'E-postadresse'; $lang['Enter your personnal informations'] = 'Skriv inn dine personlige data'; $lang['Error sending email'] = 'Feil ved sending av e-post'; -$lang['File name'] = 'Fil navn'; +$lang['File name'] = 'Filnavn'; $lang['File'] = 'Fil'; $lang['Filesize'] = 'Filstørrelse'; $lang['Filter and display'] = 'Filtrer og vis'; $lang['Filter'] = 'Filter'; $lang['Forgot your password?'] = 'Glemt passord?'; -$lang['Go through the gallery as a visitor'] = 'Naviger galleriet som gjest'; +$lang['Go through the gallery as a visitor'] = 'Naviger i galleriet som gjest'; $lang['Help'] = 'Hjelp'; $lang['Identification'] = 'Identifikasjon'; $lang['Photos only RSS feed'] = 'Bare bilder RSS feed'; @@ -183,10 +183,10 @@ $lang['all'] = 'alle'; $lang['ascending'] = 'stigende'; $lang['author(s) : %s'] = 'forfatter(e) : %e'; $lang['Expand all albums'] = 'Vis alle album'; -$lang['posted after %s (%s)'] = 'postet etter %s (%s)'; -$lang['posted before %s (%s)'] = 'postet before %s (%s)'; -$lang['posted between %s (%s) and %s (%s)'] = 'postet mellom %s (%s) og %s (%s)'; -$lang['posted on %s'] = 'postet den %s'; +$lang['posted after %s (%s)'] = 'opplastet etter %s (%s)'; +$lang['posted before %s (%s)'] = 'opplastet before %s (%s)'; +$lang['posted between %s (%s) and %s (%s)'] = 'opplastet mellom %s (%s) og %s (%s)'; +$lang['posted on %s'] = 'opplastet den %s'; $lang['Best rated'] = 'Best rangert'; $lang['display best rated photos'] = 'vis de best rangerte bildene'; $lang['Calendar'] = 'Kalender'; @@ -201,17 +201,17 @@ $lang['comment date'] = 'Kommentert dato'; $lang['Comment'] = 'kommentar'; $lang['Your comment has been registered'] = 'Din kommentar er registrert'; $lang['Anti-flood system : please wait for a moment before trying to post another comment'] = 'Overbuffringsvern : Vennligst vent før du prøver å legge til den ny kommentar'; -$lang['Your comment has NOT been registered because it did not pass the validation rules'] = 'Din kommentar har IKKE blitt registrert da den ikke ble validert'; +$lang['Your comment has NOT been registered because it did not pass the validation rules'] = 'Din kommentar har IKKE blitt registrert da den ikke ble godkjent'; $lang['An administrator must authorize your comment before it is visible.'] = 'En administrator må godkjenne din kommentar før den blir synlig.'; $lang['This login is already used by another user'] = 'Denne innloggingen er allerede i bruk.'; $lang['Comments'] = 'Kommentarer'; $lang['Add a comment'] = 'Legg til en kommentar'; -$lang['created after %s (%s)'] = 'oprettet etter %s (%s)'; +$lang['created after %s (%s)'] = 'opprettet etter %s (%s)'; $lang['created before %s (%s)'] = 'opprettet før %s (%s)'; $lang['created between %s (%s) and %s (%s)'] = 'opprettet mellom %s (%s) og %s (%s)'; $lang['created on %s'] = 'opprettet den %s'; -$lang['Customize'] = 'Egendefinert'; -$lang['Your Gallery Customization'] = 'Ditt galleri egendefinert'; +$lang['Customize'] = 'Tilpass'; +$lang['Your Gallery Customization'] = 'Innstillinger for ditt galleri'; $lang['Default'] = 'Standard'; $lang['delete this photo from your favorites'] = 'slett bildet fra dine favoritter'; $lang['Delete'] = 'Slett'; @@ -258,8 +258,8 @@ $lang['New password'] = 'Nytt passord'; $lang['Rate this photo'] = 'Gi karakter på dette bildet'; $lang['Next'] = 'Neste'; $lang['no rate'] = 'ingen karakter'; -$lang['Photos posted within the last %d day.'] = 'Elementer posted kun de %d siste dager.'; -$lang['Photos posted within the last %d days.'] = 'Elementer posted kun de %d siste dager.'; +$lang['Photos posted within the last %d day.'] = 'Kun opplastede bilder den %d siste dagen.'; +$lang['Photos posted within the last %d days.'] = 'Kun opplastede bilder de %d siste dager.'; $lang['password updated'] = 'passord oppdatert'; $lang['Recent period must be a positive integer value'] = 'Siste periode må være en positiv verdi'; $lang['photo'] = 'bilde'; @@ -277,10 +277,10 @@ $lang['Recent photos'] = 'Siste bilder'; $lang['display most recent photos'] = 'Viser de sist sette bilder'; $lang['Redirection...'] = 'Videresender...'; $lang['Please, enter a login'] = 'Vennligst logg inn'; -$lang['login mustn\'t end with a space character'] = 'login må ikke ende med et mellomrom'; -$lang['login mustn\'t start with a space character'] = 'login må ikke starte med et mellomrom'; +$lang['login mustn\'t end with a space character'] = 'brukernavn kan ikke ende med et mellomrom'; +$lang['login mustn\'t start with a space character'] = 'brukernavn kan ikke starte med et mellomrom'; $lang['this login is already used'] = 'denne innloggingen er allerede i bruk'; -$lang['mail address must be like xxx@yyy.eee (example : jack@altern.org)'] = 'mail addresse må være tilsvarende xxx@yyy.eee (eksempel : jack@altern.org)'; +$lang['mail address must be like xxx@yyy.eee (example : jack@altern.org)'] = 'mailaddresse må være tilsvarende xxx@yyy.eee (eksempel : jack@altern.org)'; $lang['Auto login'] = 'Auto innlogging'; $lang['%d Kb'] = '%d Kb'; $lang['Week %d'] = 'Uke %d'; @@ -300,7 +300,7 @@ $lang['Search results'] = 'Søke resultat'; $lang['Search in sub-albums'] = 'Søk i under-album'; $lang['searched words : %s'] = 'søkte ord : %'; $lang['Contact'] = 'Kontakt'; -$lang['set as album representative'] = 'sett som album representant'; +$lang['set as album representative'] = 'bruk som albumets miniatyrbilde'; $lang['Show number of comments'] = 'Vis antall kommentarer'; $lang['Show number of hits'] = 'Vis antall treff'; $lang['slideshow'] = 'slideshow'; @@ -322,10 +322,10 @@ $lang['Edit a comment'] = 'Endre en kommentar'; $lang['Are you sure?'] = 'Er du sikker?'; $lang['(!) This comment requires validation'] = '(!) Denne kommentaren krever godkjenning'; $lang['Welcome'] = 'Velkommen'; -$lang['Welcome to your Piwigo photo gallery!'] = 'Velkommen til din Piwigo photo gallery!'; +$lang['Welcome to your Piwigo photo gallery!'] = 'Velkommen til ditt Piwigo bildegalleri!'; $lang['... or browse your empty gallery'] = '... eller bla i ditt tomme galleri'; $lang['... or please deactivate this message, I will find my way by myself'] = '... eller vennligst deaktiver denne beskjeden, jeg vil finne ut av det selv'; -$lang['Hello %s, your Piwigo photo gallery is empty!'] = 'Hallo %, ditt Piwigo photo gallery er tomt!'; +$lang['Hello %s, your Piwigo photo gallery is empty!'] = 'Hallo %s, ditt Piwigo bildegalleri er tomt!'; $lang['I want to add photos'] = 'Jeg vil legge til foto'; $lang['Manage this user comment: %s'] = 'Behandle denne brukers kommentar: %s'; $lang['Email address is missing. Please specify an email address.'] = 'E-postadresse mangler. Vennligst skriv en e-postadresse.'; @@ -338,7 +338,7 @@ $lang['Enter your new password below.'] = 'Skriv inn ditt nye passord.'; $lang['EXIF Metadata'] = 'Avansert bildedata'; $lang['Hello %s,'] = 'Hei %s,'; $lang['html tags are not allowed in login'] = 'html-kode er ikke lov i brukernavn/passord'; -$lang['If this was a mistake, just ignore this email and nothing will happen.'] = 'Hvis dette var en feiltagelse, bare ignorer denne epost, ingen ting vil skje.'; +$lang['If this was a mistake, just ignore this email and nothing will happen.'] = 'Hvis dette var en feiltagelse, bare ignorer denne epost, ingenting vil skje.'; $lang['Invalid key'] = 'Feil nøkkel'; $lang['Invalid username or email'] = 'Feil brukernavn eller passord'; $lang['IPTC Metadata'] = 'Bildedata'; @@ -424,4 +424,5 @@ $lang['Photo description'] = 'Bildebeskrivelse'; $lang['Photo title'] = 'Bildetittel'; $lang['Album name, A → Z'] = 'Albumnavn, A %rarr; Å'; $lang['Album name, Z → A'] = 'Albumnavn, Å %rarr; A'; -$lang['Link: %s'] = 'Lenke: %s'; \ No newline at end of file +$lang['Link: %s'] = 'Lenke: %s'; +$lang['Your authentication key is no longer valid.'] = 'Din autentiseringsnøkkel er ikke lenger gyldig.'; \ No newline at end of file diff --git a/sources/language/nb_NO/help/photos_add_ftp.html b/sources/language/nb_NO/help/photos_add_ftp.html index 50028f0..dbbd9b4 100644 --- a/sources/language/nb_NO/help/photos_add_ftp.html +++ b/sources/language/nb_NO/help/photos_add_ftp.html @@ -36,42 +36,36 @@ Gratulerer! Du har nå laget ditt første album i ditt foto galleri. galleri (men bruker mange muligheter):

    -.
-|-- admin
-|-- doc
-|-- gallerier
-|   |-- album-1
-|   |   |-- album-1.1
-|   |   |   |-- album-1.1.1
-|   |   |   |   |-- album-1.1.1.1
-|   |   |   |   |   |-- pwg_high
-|   |   |   |   |   |   +-- wedding.jpg
-|   |   |   |   |   |-- miniatyrbilder
-|   |   |   |   |   |   +-- TN-wedding.jpg
-|   |   |   |   |   +-- wedding.jpg
-|   |   |   |   +-- album-1.1.1.2
-|   |   |   +-- album-1.1.2
-|   |   |-- album-1.2
-|   |   |   |-- pookie.jpg
-|   |   |   +-- miniatyrbilder
-|   |   |       +-- TN-pookie.jpg
-|   |   +-- album-1.3
-|   +-- album-2
-|       |-- piglet.gif
-|       |-- pwg_representative
-|       |   +-- video.jpg
-|       |-- miniatyrbilder
-|       |   +-- TN-piglet.jpg
-|       +-- video.avi
-|-- include
-|-- install
-|-- language
-|-- template
-+-- tool
    - +galleries +|-- wedding +| |-- celebration +| | |-- arrival +| | | |-- paul-alone.jpg +| | | +-- sarah-alone.jpg +| | +-- departure +| | +-- paul-and-sarah.jpg +| +-- party +| |-- dancers001.jpg +| |-- dancers002.jpg +| +-- dancers003.jpg ++-- honeymoon +| |-- hotel.png +| |-- video-from-plane.avi +| +-- pwg_representative +| +-- video-from-plane.jpg ++-- photoshoot + |-- img0001.jpg + |-- img0002.jpg + +-- pwg_format + |-- img0001.cr2 + |-- img0001.cmyk.jpg + |-- img0001.zip + |-- img0002.cr2 + +-- img0002.cmyk.jpg + -
  • Untagen de med navnet "miniatyrbilder", "pwg_high" eller "pwg_representative" (se forklaring +
  • Untagen de med navnet "pwg_representative" eller "pwg_format" (se forklaring under), vil hver mappe under "gallerier" representerer et album. Det er ingen begrensning på dybden @@ -98,6 +92,8 @@ standard med et icon tillhørende fil endelsen. Valgfritt, kan du assosiere et m og en representativ fil (se video.avi i eksempelet over).
    • +
  • Multiple formats: a photo can be available in several formats. In this example, we have 3 additional formats for img0001.jpg. You can activate this feature with $conf['enable_formats'] = true; in your local configuration and define a list of formats, like $conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');
    • +
  • Advarsel: navnet på mapper og filer må kun inneholde bokstaver, figurer, "-", "_" eller ".". Ingen tomme mellomrom, ei heller opphøyde karakterer.
    • @@ -109,35 +105,3 @@ class="pwgScreen">Administrasjon » Verktøy »
    - -
    - Miniatyr bilder -
      - -
    • Hvert bilde må ha sitt miniatyr bilde.
      • - -
    • Miniatyr bilde blir lagret i "miniatyrbilde " under mappe i album - mappen. Miniatyr bildene har det samme filnavnet som bildet det passer opp mot, med konfigurasjons - -parametrene prefix_thumbnail som prefix (se inkluder/config.inc.php).
      • - -
    • Miniatyr bilde filer bør ikke nødvendigvis ha samme fil endelse som det assosierte bildet (Eks - -".jpg" bilde kan ha ".GIF" endelse).
      • - -
    • Det anbefales å bruker en ekstern modul for å lage miniatyr bilder.
      • - -
    • Bruken av miniatyr bilde oprettelses verktøyet integrert i Piwigo er ikke anbefalt, Dette - -fordi den resulterte kvaliteten kan være skuffende og den vil bruke mye server ressurser (Dette kan - -være et stort problem på en delt server). - -
    • Om du vleger å bruker web serveren til å lage miniatyr bilder, må du gi skrive rettigheter på - -alle album mappene.
      • - -
    -
    \ No newline at end of file diff --git a/sources/language/nb_NO/index.php b/sources/language/nb_NO/index.php index c8de97f..0b96c3e 100644 --- a/sources/language/nb_NO/index.php +++ b/sources/language/nb_NO/index.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/language/nb_NO/install.lang.php b/sources/language/nb_NO/install.lang.php index 57f4c8c..6d50f9d 100644 --- a/sources/language/nb_NO/install.lang.php +++ b/sources/language/nb_NO/install.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -46,14 +46,14 @@ $lang['Password [confirm]'] = 'Passord [bekreft]'; $lang['verification'] = 'verifisering'; $lang['Need help ? Ask your question on Piwigo message board.'] = 'Trenger du hjelp? Still et spørsmål på Piwigo message board.'; $lang['Visitors will be able to contact site administrator with this mail'] = 'Besøkende vil kunne bruke denne mailen for å kontakte side administrator.'; -$lang['PHP 5 is required'] = 'PHP 5 er nødvendig'; +$lang['PHP 5 is required'] = 'PHP 5.2 er nødvendig'; $lang['It appears your webhost is currently running PHP %s.'] = 'Det kan se ut som om din leverandør kjører PHP %s.'; -$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo kan prøve å endre din konfigurasjon til PHP 5 ved å lage eller modifisere en .htaccess fil.'; +$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo kan prøve å endre din konfigurasjon til PHP 5.2 ved å lage eller modifisere en .htaccess fil.'; $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'Merk, du kan endre din konfigurasjon selv og restarte Piwigo etter dette.'; -$lang['Try to configure PHP 5'] = 'Prøve å konfigurere PHP 5'; +$lang['Try to configure PHP 5'] = 'Prøve å konfigurere PHP 5.2'; $lang['Sorry!'] = 'Beklager!'; -$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo var ikke i stand til å konfigurere PHP 5.'; -$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Du kan sjekke din web tilbyder\'e support og se om du kan endre til PHP 5 selv.'; +$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo var ikke i stand til å konfigurere PHP 5.2'; +$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Du kan sjekke din web tilbyder\'e support og se om du kan endre til PHP 5.2 selv.'; $lang['Hope to see you back soon.'] = 'Håper vi sees snart.'; $lang['Congratulations, Piwigo installation is completed'] = 'Gratulerer, Piwigo installasjonen er ferdig'; $lang['An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning : database.inc.php must only contain what is in the textarea, no line return or space character)'] = 'En alternativ løsning er å kopiere teksten fra tekst boksen over og lime det inn i filen "local/config/database.inc.php" (Advarsel: database.inc.php må kun inneholde hva som ligger i tekstområdet, ingen ny linje eller mellomrom)'; @@ -64,5 +64,4 @@ $lang['Don\'t hesitate to consult our forums for any help : %s'] = 'Ikke nøl me $lang['Just another Piwigo gallery'] = 'Enda et Piwigo bildegalleri'; $lang['Welcome to my photo gallery'] = 'Velkommen til mitt bildegalleri'; $lang['Welcome to your new installation of Piwigo!'] = 'Velkommen til din nye installasjon av Piwigo!'; -$lang['localhost or other, supplied by your host provider'] = 'lokal tjener eller annen tjenesteleverandør'; -?> \ No newline at end of file +$lang['localhost or other, supplied by your host provider'] = 'lokal tjener eller annen tjenesteleverandør'; \ No newline at end of file diff --git a/sources/language/nb_NO/upgrade.lang.php b/sources/language/nb_NO/upgrade.lang.php index 7d053af..85da5ca 100644 --- a/sources/language/nb_NO/upgrade.lang.php +++ b/sources/language/nb_NO/upgrade.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/language/nl_NL/admin.lang.php b/sources/language/nl_NL/admin.lang.php index 722228a..63a46a5 100644 --- a/sources/language/nl_NL/admin.lang.php +++ b/sources/language/nl_NL/admin.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -286,7 +286,7 @@ $lang['no write access'] = 'geen schrijftoegang'; $lang['Permissions'] = 'Rechten'; $lang['private'] = 'Privé'; $lang['public'] = 'Publiek'; -$lang['Purge never used notification feeds'] = 'Verwijder feeds met nooit met gebruikte meldingen'; +$lang['Purge never used notification feeds'] = 'Verwijder feeds met nooit gebruikte meldingen'; $lang['Purge sessions'] = 'Verwijder sessies'; $lang['randomly represented'] = 'willekeurig album-klikplaatje'; $lang['registration date'] = 'Registratiedatum'; @@ -410,8 +410,8 @@ $lang['guest'] = 'gast'; $lang['default values'] = 'Standaard waarden'; $lang['Guest cannot be deleted'] = 'Gast kan niet verwijderd worden'; $lang['Default user cannot be deleted'] = 'Standaard gebruiker kan niet verwijderd worden'; -$lang['Purge history detail'] = 'Details van de filtergeschiedenis'; -$lang['Purge history summary'] = 'Overzicht van de filtergeschiedenis'; +$lang['Purge history detail'] = 'Verwijder details van de geschiedenis'; +$lang['Purge history summary'] = 'Verwijder overzicht van de geschiedenis'; $lang['Check integrity'] = 'Controleer integriteit'; $lang['Anomaly'] = 'Onregelmatigheid'; $lang['Correction'] = 'Correctie'; @@ -525,7 +525,7 @@ $lang['Piwigo Announcements Newsletter'] = 'Piwigo Aankondigings Nieuwsbrief'; $lang['Keep in touch with Piwigo project, subscribe to Piwigo Announcement Newsletter. You will receive emails when a new release is available (sometimes including a security bug fix, it\'s important to know and upgrade) and when major events happen to the project. Only a few emails a year.'] = 'Hou contact met het Piwigo project, abonneer u op de Piwigo Aankondigings Nieuwsbrief. Dan ontvangt u een email wanneer een nieuwe Piwigo-release beschikbaar komt, wanneer een belangrijke beveiligings bugfix nodig is of wanneer belangrijke ontwikkelingen binnen het Piwigo-project plaatsvinden. Alles bij elkaar een paar emails per jaar.'; $lang['Subscribe %s'] = 'Abonneer %s'; $lang['Subscribe %s to Piwigo Announcements Newsletter'] = 'Abonneer %s op de Piwigo Aankondigings Nieuwsbrief'; -$lang['Purge search history'] = 'Verwijder de Zoek-geschiedenis'; +$lang['Purge search history'] = 'Verwijder de zoek-geschiedenis'; $lang['Hide'] = 'Verberg'; $lang['Password is missing. Please enter the password.'] = 'Wachtwoord ontbreekt. Geef uw wachtwoord aub.'; $lang['Password confirmation is missing. Please confirm the chosen password.'] = 'Wachtwoord-bevestiging ontbreekt. Bevestig aub uw gekozen wachtwoord.'; @@ -982,4 +982,13 @@ $lang['width & height'] = 'breedte & hoogte'; $lang['date & time'] = 'datum & tijd'; $lang['between %s and %s MB'] = 'tussen %s en %s MB'; $lang['based on'] = 'gebaseerd op'; -$lang['Upload in progress'] = 'Bezig met uploaden'; \ No newline at end of file +$lang['Upload in progress'] = 'Bezig met uploaden'; +$lang['Y Repeat'] = 'Y Herhaal'; +$lang['Orphans'] = 'Wezen'; +$lang['No user is permitted to see this private album'] = 'Geen enkele gebruiker heeft toelating dit private album te bekijken'; +$lang['For security reason, authentication keys do not work for administrators.'] = 'Om veiligheidsredenen werken authenticatiesleutels niet voor beheerders.'; +$lang['Each email sent will contain its own automatic authentication key on links, valid for %s.'] = 'Elke verzonden email zal in de links automatisch een authenticatiesleutel krijgen die geldig is voor %s.'; +$lang['Delete %d orphan photos'] = 'Verwijder %d achtergebleven foto\'s'; +$lang['Recipients'] = 'Ontvangers'; +$lang['Edit user'] = 'Wijzig gebruiker'; +$lang['No recipient selected'] = 'Geen ontvanger geselecteerd'; \ No newline at end of file diff --git a/sources/language/nl_NL/common.lang.php b/sources/language/nl_NL/common.lang.php index 60ef2de..c42b9d8 100644 --- a/sources/language/nl_NL/common.lang.php +++ b/sources/language/nl_NL/common.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -22,7 +22,7 @@ // +-----------------------------------------------------------------------+ /* Language Name: Nederlands [NL] -Version: 2.7.1 +Version: 2.8.2 Language URI: http://piwigo.org/ext/extension_view.php?eid=429 Author: Piwigo team Author URI: http://piwigo.org @@ -232,8 +232,8 @@ $lang['Show file metadata'] = 'Laat bestandsmetadata zien'; $lang['Powered by'] = 'Mede mogelijk gemaakt door'; $lang['Preferences'] = 'Voorkeuren'; $lang['Previous'] = 'Vorige'; -$lang['Random photos'] = 'Onwillekeurige foto\'s'; -$lang['display a set of random photos'] = 'Geef een aantal onwillekeurig gekozen foto\'s weer'; +$lang['Random photos'] = 'Willekeurige foto\'s'; +$lang['display a set of random photos'] = 'Geef een aantal willekeurig gekozen foto\'s weer'; $lang['Recent albums'] = 'Recente albums'; $lang['display recently updated albums'] = 'geef recent bijgewerkte albums weer'; $lang['Recent period'] = 'Recente periode'; @@ -391,14 +391,14 @@ $lang['File name, Z → A'] = 'Bestandsnaam, Z → A'; $lang['Manual sort order'] = 'Handmatige sorteervolgorde'; $lang['Numeric identifier, 1 → 9'] = 'Nummers, 1 → 9'; $lang['Numeric identifier, 9 → 1'] = 'Nummers, 9 → 1'; -$lang['Photo title, A → Z'] = 'Fototitle, A → Z'; +$lang['Photo title, A → Z'] = 'Fototitel, A → Z'; $lang['Photo title, Z → A'] = 'Fototitel, Z → A'; $lang['Rating score, high → low'] = 'Waarderingsscore, hoog → laag'; $lang['Rating score, low → high'] = 'Waarderingsscore, laag → hoog'; $lang['Visits, high → low'] = 'Bezoeken, hoog → laag'; $lang['Visits, low → high'] = 'Bezoeken, laag %rarr; hoog'; $lang['xsmall'] = 'XS - extra klein'; -$lang['%d rate'] = '%d tarief'; +$lang['%d rate'] = '%d stem(men)'; $lang['Bad request'] = 'Foutief verzoek'; $lang['Forbidden'] = 'Verboden'; $lang['Page not found'] = 'Pagina niet gevonden'; @@ -444,4 +444,5 @@ $lang['month']['5'] = 'Mei'; $lang['month']['6'] = 'Juni'; $lang['month']['7'] = 'Juli'; $lang['month']['8'] = 'Augustus'; -$lang['month']['9'] = 'September'; \ No newline at end of file +$lang['month']['9'] = 'September'; +$lang['Your authentication key is no longer valid.'] = 'Uw authenticatie sleutel is niet langer geldig.'; \ No newline at end of file diff --git a/sources/language/nl_NL/help/index.php b/sources/language/nl_NL/help/index.php index c8de97f..0b96c3e 100644 --- a/sources/language/nl_NL/help/index.php +++ b/sources/language/nl_NL/help/index.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/language/nl_NL/help/photos_add_ftp.html b/sources/language/nl_NL/help/photos_add_ftp.html index b9997a9..262f2db 100644 --- a/sources/language/nl_NL/help/photos_add_ftp.html +++ b/sources/language/nl_NL/help/photos_add_ftp.html @@ -26,38 +26,33 @@

    Categorie mappen zijn in de Piwigo map "galleries". Bekijk de mapstructuur van een kleine gallerie (maar met een hoop mogelijkheden) :

    -.
-|-- admin
-|-- doc
-|-- galleries
-|   |-- categorie-1
-|   |   |-- categorie-1.1
-|   |   |   |-- categorie-1.1.1
-|   |   |   |   |-- categorie-1.1.1.1
-|   |   |   |   |   |-- pwg_high
-|   |   |   |   |   |   +-- wedding.jpg
-|   |   |   |   |   |-- thumbnail
-|   |   |   |   |   |   +-- TN-wedding.jpg
-|   |   |   |   |   +-- wedding.jpg
-|   |   |   |   +-- categorie-1.1.1.2
-|   |   |   +-- categorie-1.1.2
-|   |   |-- categorie-1.2
-|   |   |   |-- pookie.jpg
-|   |   |   +-- thumbnail
-|   |   |       +-- TN-pookie.jpg
-|   |   +-- categorie-1.3
-|   +-- categorie-2
-|       |-- piglet.gif
-|       |-- pwg_representative
-|       |   +-- video.jpg
-|       |-- thumbnail
-|       |   +-- TN-piglet.jpg
-|       +-- video.avi
-|-- include
-|-- install
-|-- language
-|-- template
-+-- tool
    +galleries +|-- wedding +| |-- celebration +| | |-- arrival +| | | |-- paul-alone.jpg +| | | +-- sarah-alone.jpg +| | +-- departure +| | +-- paul-and-sarah.jpg +| +-- party +| |-- dancers001.jpg +| |-- dancers002.jpg +| +-- dancers003.jpg ++-- honeymoon +| |-- hotel.png +| |-- video-from-plane.avi +| +-- pwg_representative +| +-- video-from-plane.jpg ++-- photoshoot + |-- img0001.jpg + |-- img0002.jpg + +-- pwg_format + |-- img0001.cr2 + |-- img0001.cmyk.jpg + |-- img0001.zip + |-- img0002.cr2 + +-- img0002.cmyk.jpg + diff --git a/sources/language/nl_NL/index.php b/sources/language/nl_NL/index.php index c8de97f..0b96c3e 100644 --- a/sources/language/nl_NL/index.php +++ b/sources/language/nl_NL/index.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/language/nl_NL/install.lang.php b/sources/language/nl_NL/install.lang.php index 22a95bc..8228d61 100644 --- a/sources/language/nl_NL/install.lang.php +++ b/sources/language/nl_NL/install.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -46,14 +46,14 @@ $lang['Password [confirm]'] = 'Bevestig wachtwoord'; $lang['verification'] = 'verificatie'; $lang['Need help ? Ask your question on Piwigo message board.'] = 'Hulp nodig ? Stel uw vraag op het Piwigo forum.'; $lang['Visitors will be able to contact site administrator with this mail'] = 'Met dit email-adres kunnen bezoekers contact opnemen met de beheerder'; -$lang['PHP 5 is required'] = 'PHP 5 is vereist'; +$lang['PHP 5 is required'] = 'PHP 5.2 is vereist'; $lang['It appears your webhost is currently running PHP %s.'] = 'Het lijkt er op dat uw webhost momenteel gebruik maakt van PHP %s.'; -$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo kan proberen uw configuratie om te zetten naar PHP 5 door het aanmaken of wijzigen van een .htaccess bestand.'; +$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo kan proberen uw configuratie om te zetten naar PHP 5.2 door het aanmaken of wijzigen van een .htaccess bestand.'; $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'Opmerking: u kunt uw configuratie ook zelf aanpassen en daarna Piwigo opnieuw opstarten.'; -$lang['Try to configure PHP 5'] = 'Probeer PHP 5 te configureren'; +$lang['Try to configure PHP 5'] = 'Probeer PHP 5.2 te configureren'; $lang['Sorry!'] = 'Sorry!'; -$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo kon PHP 5 niet configureren.'; -$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Neem contact op met de support van uw hosting provider en probeer met hen te bepalen hoe u kunt omschakelen naar PHP 5.'; +$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo kon PHP 5.2 niet configureren.'; +$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Neem contact op met de support van uw hosting provider en probeer met hen te bepalen hoe u kunt omschakelen naar PHP 5.2'; $lang['Hope to see you back soon.'] = 'Hoop u snel weer te zien op deze site !.'; $lang['Congratulations, Piwigo installation is completed'] = 'Gefeliciteerd, de Piwigo installatie is afgerond'; $lang['An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning : database.inc.php must only contain what is in the textarea, no line return or space character)'] = 'Als alternatieve oplossing kunt u de tekst in de bovenstaande box kopiëren en plakken in bestand "local/config/database.inc.php" (Opgelet : in database.inc.php mag alleen datgene staan dat in het tekstgebied staat, geen return- of spatie-tekens)'; @@ -64,5 +64,4 @@ $lang['Just another Piwigo gallery'] = 'Alweer een Piwigo galerie'; $lang['Welcome to my photo gallery'] = 'Welkom bij mijn foto galerie'; $lang['Welcome to your new installation of Piwigo!'] = 'Welkom bij uw nieuwe installatie van Piwigo!'; $lang['Don\'t hesitate to consult our forums for any help : %s'] = 'Aarzel niet om onze forum\'s te raadplegen voor hulp: %s'; -$lang['localhost or other, supplied by your host provider'] = 'localhost of andere, geleverd door uw provider'; -?> \ No newline at end of file +$lang['localhost or other, supplied by your host provider'] = 'localhost of andere, geleverd door uw provider'; \ No newline at end of file diff --git a/sources/language/nl_NL/upgrade.lang.php b/sources/language/nl_NL/upgrade.lang.php index 4bde42f..2336ebf 100644 --- a/sources/language/nl_NL/upgrade.lang.php +++ b/sources/language/nl_NL/upgrade.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/language/nn_NO/admin.lang.php b/sources/language/nn_NO/admin.lang.php index 21e5459..b5b39f0 100755 --- a/sources/language/nn_NO/admin.lang.php +++ b/sources/language/nn_NO/admin.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -882,7 +882,6 @@ $lang['Piwigo export plugin for iPhoto'] = 'Piwigo tilleggsprogram for eksport f $lang['Piwigo publish plugin for Shotwell'] = 'Piwigo tilleggsprogram for eksport frå Shotwell'; $lang['Piwigo publish plugin for digiKam'] = 'Piwigo tilleggsprogram for eksport frå digiKam'; $lang['Predefined filter'] = 'Førehandsdefinera filter'; -$lang['Mail address is obligatory for all users'] = 'E-postadresse er påkrevd for alle brukarar'; $lang['Main "guest" user does not exist'] = 'Hovudbrukaren "gjest" finst ikkje'; $lang['Main "guest" user status is incorrect'] = 'Hovudbrukaren "gjest" sin status er feil'; $lang['Main "webmaster" user does not exist'] = 'Hovudbrukaren "webmaster" finst ikkje'; @@ -966,4 +965,15 @@ $lang['Close user details'] = 'Lukk brukardetaljar'; $lang['Open user details'] = 'Opne brukardetaljar'; $lang['close'] = 'lukk'; $lang['Activate it now'] = 'Aktiver nå'; -$lang['Allow users to add a link to their website'] = 'Gje brukarar mogleghet til å legge inn lenke til si nettside'; \ No newline at end of file +$lang['Allow users to add a link to their website'] = 'Gje brukarar mogleghet til å legge inn lenke til si nettside'; +$lang['Empty caddie'] = 'Tøm caddie'; +$lang['Impossible to deactivate the default theme.'] = 'Ikkje mogleg å deaktivere standard utsjånad'; +$lang['Mail address is mandatory for registration'] = 'E-post adresse er påkrevd for å registrere'; +$lang['No and unlock sub-albums'] = 'Nei og lås opp del-album'; +$lang['The settings for the guest are from the %s user'] = 'Instillingar for gjest er frå brukar %s'; +$lang['Upload in progress'] = 'Opplasting i gang'; +$lang['based on'] = 'med utgangspunkt i'; +$lang['between %s and %s MB'] = 'mellom %s og %s MB'; +$lang['date & time'] = 'dato og tid'; +$lang['file name'] = 'filnamn'; +$lang['width & height'] = 'breidde og høgde'; \ No newline at end of file diff --git a/sources/language/nn_NO/common.lang.php b/sources/language/nn_NO/common.lang.php index 15faeac..4a474c0 100644 --- a/sources/language/nn_NO/common.lang.php +++ b/sources/language/nn_NO/common.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -22,7 +22,7 @@ // +-----------------------------------------------------------------------+ /* Language Name: Norwegian nynorsk [NO] -Version: 2.7.0 +Version: 2.8.2 Language URI: http://piwigo.org/ext/extension_view.php?eid=689 Author: Piwigo team Author URI: http://piwigo.org diff --git a/sources/language/nn_NO/help/photos_add_ftp.html b/sources/language/nn_NO/help/photos_add_ftp.html index f44c646..486c383 100755 --- a/sources/language/nn_NO/help/photos_add_ftp.html +++ b/sources/language/nn_NO/help/photos_add_ftp.html @@ -42,11 +42,20 @@ galleries |-- video-fraa-fly.avi +-- pwg_representative +-- video-fraa-fly.jpg ++-- photoshoot + |-- img0001.jpg + |-- img0002.jpg + +-- pwg_format + |-- img0001.cr2 + |-- img0001.cmyk.jpg + |-- img0001.zip + |-- img0002.cr2 + +-- img0002.cmyk.jpg -
  • Bortsett frå "pwg_representative" (sjå forklaring under), vil kvar mappe under "galleries" lage eit album. Det er ingen avgrensing på djubde.
    • +
  • Bortsett frå "pwg_representative" and "pwg_format" (sjå forklaring under), vil kvar mappe under "galleries" lage eit album. Det er ingen avgrensing på djubde.
  • Som utgangspunkt er eit element representera av ei file. Ei fil kan vera eit Piwigo element om filtypa er blant file_ext @@ -57,10 +66,12 @@ galleries
  • Ingen bilet-element (video, lyd, tekstfiler, eller kva som helst...) er som standard vist med eit ikon som samsvarar med filtypa. Valfritt, kan du knytte til ei miniatyrbilete og ein representatnt--fil til ei fil (sjå video.avi i dømet over).
    • +
  • Multiple formats: a photo can be available in several formats. In this example, we have 3 additional formats for img0001.jpg. You can activate this feature with $conf['enable_formats'] = true; in your local configuration and define a list of formats, like $conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');
    • +
  • Varsel: namn på mapper og filer kan bare innehalde bokstavar (a - z, A - Z), tal, "-", "_" or ".". Ikkje bruk mellomrom eller spesielle tegn.
  • Når bilete er plassera korrekt i mapper, gå til: Administrasjon » Verktøy » Synkroniser
    • - \ No newline at end of file + diff --git a/sources/language/nn_NO/install.lang.php b/sources/language/nn_NO/install.lang.php index ee6a8f2..9dac0ab 100755 --- a/sources/language/nn_NO/install.lang.php +++ b/sources/language/nn_NO/install.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -23,7 +23,7 @@ $lang['Database name'] = 'Databasenamn'; $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'Du kan endre konfigurasjonen sjølv og ta omstart på Piwigo etterpå.'; -$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Du bør sjekke med dei som leverar nett-tenaren om korleis du kan byte til PHP5.'; +$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Du bør sjekke med dei som leverar nett-tenaren om korleis du kan byte til PHP5.2'; $lang['also given by your host provider'] = 'er og levera av den som leverar nett-tenaren'; $lang['database tables names will be prefixed with it (enables you to manage better your tables)'] = 'namna på databasetabellane vil verta prefiksa med dette (gjev deg mogleghet til å handtere databasetabellane betre)'; $lang['enter a login for webmaster'] = 'skriv inn brukarnamn for webmaster'; @@ -33,13 +33,13 @@ $lang['user password given by your host provider'] = 'passord du har fått av de $lang['verification'] = 'sjekk'; $lang['webmaster login can\'t contain characters \' or "'] = 'brukarnamn for webmaster kan ikkje innehalde tegna \' eller "'; $lang['Don\'t hesitate to consult our forums for any help : %s'] = 'Ikkje vent med å sjå på foruma våre for hjelp: %s'; -$lang['PHP 5 is required'] = 'PHP5 er påkrevd'; +$lang['PHP 5 is required'] = 'PHP5.2 er påkrevd'; $lang['Password ']['confirm'] = 'Passord [stadfest]'; -$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo kan prøve å byte din konfigurasjon til PHP5 ved å lage eller endre fila .htaccess.'; -$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo greidde ikkje å konfigurere PHP5.'; +$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo kan prøve å byte din konfigurasjon til PHP5.2 ved å lage eller endre fila .htaccess.'; +$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo greidde ikkje å konfigurere PHP5.2'; $lang['Sorry!'] = 'Orsak!'; $lang['Start Install'] = 'Start installasjon'; -$lang['Try to configure PHP 5'] = 'Prøv å konfigurere PHP5'; +$lang['Try to configure PHP 5'] = 'Prøv å konfigurere PHP5.2'; $lang['User'] = 'Brukar'; $lang['Visitors will be able to contact site administrator with this mail'] = 'Dei som vitjar nettsida kan bruke denne e-postadressa for å kontakte administrator for nettsida'; $lang['Welcome to my photo gallery'] = 'Velkomen til mitt biletgalleri'; @@ -64,5 +64,4 @@ $lang['It will be shown to the visitors. It is necessary for website administrat $lang['Just another Piwigo gallery'] = 'Enda eit Piwigo galleri'; $lang['Keep it confidential, it enables you to access administration panel'] = 'Hald dette hemmeleg, det gjev deg tilgang til administrasjonspanelet'; $lang['Need help ? Ask your question on Piwigo message board.'] = 'Treng du hjelp? Still spørsmålet ditt på Piwigo sitt forum.'; -$lang['localhost or other, supplied by your host provider'] = 'localhost eller servernamn gjeve av administrator for server'; -?> \ No newline at end of file +$lang['localhost or other, supplied by your host provider'] = 'localhost eller servernamn gjeve av administrator for server'; \ No newline at end of file diff --git a/sources/language/nn_NO/upgrade.lang.php b/sources/language/nn_NO/upgrade.lang.php index 830b779..836e09e 100755 --- a/sources/language/nn_NO/upgrade.lang.php +++ b/sources/language/nn_NO/upgrade.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/language/pl_PL/admin.lang.php b/sources/language/pl_PL/admin.lang.php index 2f01fe9..f3aa8b6 100644 --- a/sources/language/pl_PL/admin.lang.php +++ b/sources/language/pl_PL/admin.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/language/pl_PL/common.lang.php b/sources/language/pl_PL/common.lang.php index c123857..bf153dd 100644 --- a/sources/language/pl_PL/common.lang.php +++ b/sources/language/pl_PL/common.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -22,7 +22,7 @@ // +-----------------------------------------------------------------------+ /* Language Name: Polski [PL] -Version: 2.7.0 +Version: 2.8.2 Language URI: http://piwigo.org/ext/extension_view.php?eid=430 Author: Piwigo team Author URI: http://piwigo.org diff --git a/sources/language/pl_PL/help/photos_add_ftp.html b/sources/language/pl_PL/help/photos_add_ftp.html index 60919d2..e3ec6c1 100644 --- a/sources/language/pl_PL/help/photos_add_ftp.html +++ b/sources/language/pl_PL/help/photos_add_ftp.html @@ -43,11 +43,20 @@ galleries |-- video-from-plane.avi +-- pwg_representative +-- video-from-plane.jpg ++-- photoshoot + |-- img0001.jpg + |-- img0002.jpg + +-- pwg_format + |-- img0001.cr2 + |-- img0001.cmyk.jpg + |-- img0001.zip + |-- img0002.cr2 + +-- img0002.cmyk.jpg -
  • Poza "pwg_representative" (wyjaśnienie poniżej), każdy podkatalog w katalogu "galleries" tworzy kategorię. Nie ma limitu na poziomy zagłębień katalogów.
    • +
  • Poza "pwg_representative" and "pwg_format" (wyjaśnienie poniżej), każdy podkatalog w katalogu "galleries" tworzy kategorię. Nie ma limitu na poziomy zagłębień katalogów.
  • Ogólnie element jest reprezentowany przez plik. Plik może być elementem Piwigo jeżeli jego rozszerzenie jest zawarte file_ext @@ -59,6 +68,8 @@ galleries
  • Domyślnie, pliki nie będące obrazami (filmy, dźwięki, tekst, cokolwiek innego...), są przedstawiane przy pomocy ikon z rozszerzeniem pliku Opcjonalnie można powiązać miniaturę przez pwg_representative. Przyjrzyj się przykładowi powyżej dla video.avi.
    • + +
  • Multiple formats: a photo can be available in several formats. In this example, we have 3 additional formats for img0001.jpg. You can activate this feature with $conf['enable_formats'] = true; in your local configuration and define a list of formats, like $conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');
  • Ostrzeżenie: nazwy katalogów oraz plików mogą zawierać tylko litery, cyfry oraz znaki "-", "_" lub ".". Nie mogą zawierać innych znaków, znaku spacji ani polskich liter. @@ -67,4 +78,4 @@ galleries Synchronizacja
    • - \ No newline at end of file + diff --git a/sources/language/pl_PL/index.php b/sources/language/pl_PL/index.php index c8de97f..0b96c3e 100644 --- a/sources/language/pl_PL/index.php +++ b/sources/language/pl_PL/index.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/language/pl_PL/install.lang.php b/sources/language/pl_PL/install.lang.php index 815deba..7a9c65a 100644 --- a/sources/language/pl_PL/install.lang.php +++ b/sources/language/pl_PL/install.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -46,14 +46,14 @@ $lang['Password [confirm]'] = 'Hasło [potwierdź]'; $lang['verification'] = 'weryfikacja'; $lang['Need help ? Ask your question on Piwigo message board.'] = 'Potrzebujesz pomocy ? Zadaj pytanie na Forum Piwigo.'; $lang['Visitors will be able to contact site administrator with this mail'] = 'Z jego pomocą odwiedzający będą mogli się skontaktować z administratorem strony'; -$lang['PHP 5 is required'] = 'PHP 5 jest wymagane'; +$lang['PHP 5 is required'] = 'PHP 5.2 jest wymagane'; $lang['It appears your webhost is currently running PHP %s.'] = 'Twój serwer aktualnie używa PHP w wersji %s.'; -$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo może spróbować przełączyć Twoją konfigurację do PHP 5 poprzez modyfikację pliku .htaccess.'; +$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo może spróbować przełączyć Twoją konfigurację do PHP 5.2 poprzez modyfikację pliku .htaccess.'; $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'Możesz również zmienić tę konfigurację sam, a następnie uruchomić ponownie Piwigo.'; -$lang['Try to configure PHP 5'] = 'Spróbuj skonfigurować PHP 5'; +$lang['Try to configure PHP 5'] = 'Spróbuj skonfigurować PHP 5.2'; $lang['Sorry!'] = 'Niestety!'; -$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo nie mógł skonfigurować Twojego PHP 5.'; -$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Możesz skontaktować się z działem wsparcia Twojego providera aby dowiedzieć się jak włączyć PHP 5.'; +$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo nie mógł skonfigurować Twojego PHP 5.2'; +$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Możesz skontaktować się z działem wsparcia Twojego providera aby dowiedzieć się jak włączyć PHP 5.2'; $lang['Hope to see you back soon.'] = 'Do zobaczenia wkrótce.'; $lang['Congratulations, Piwigo installation is completed'] = 'Gratulacje, instalacja Piwigo zakończona sukcesem'; $lang['An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning : database.inc.php must only contain what is in the textarea, no line return or space character)'] = 'Alternatywnym rozwiązaniem jest skopiować tekst z powyższego textbox i wkleić do pliku "local/config/database.inc.php" (Uwaga : database.inc.php musi zawierać to co jest w textbox i nie może zawierać znaków spacji oraz enter)'; @@ -64,5 +64,4 @@ $lang['Just another Piwigo gallery'] = 'Kolejna galeria Piwigo'; $lang['Welcome to my photo gallery'] = 'Witaj w mojej galerii zdjęć'; $lang['Welcome to your new installation of Piwigo!'] = 'Witamy w Towjej nowej instalacji Piwigo!'; $lang['Don\'t hesitate to consult our forums for any help : %s'] = 'Nie obawiaj się kontaktu na forum w celu skorzystania z pomocy: %s'; -$lang['localhost or other, supplied by your host provider'] = 'localhost lub iny, dostarczone przez Twojego dostawcę'; -?> \ No newline at end of file +$lang['localhost or other, supplied by your host provider'] = 'localhost lub iny, dostarczone przez Twojego dostawcę'; \ No newline at end of file diff --git a/sources/language/pl_PL/upgrade.lang.php b/sources/language/pl_PL/upgrade.lang.php index 6826611..00c7fec 100644 --- a/sources/language/pl_PL/upgrade.lang.php +++ b/sources/language/pl_PL/upgrade.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/language/pt_BR/about.html b/sources/language/pt_BR/about.html index b0bf3c6..fb385f0 100644 --- a/sources/language/pt_BR/about.html +++ b/sources/language/pt_BR/about.html @@ -1,15 +1,16 @@ -
  • Piwigo é uma aplicação web que permite a criação de uma galeria de imagens on line.
    • +
  • Esta galeria de fotos é baseada no Piwigo.
    • -
  • Piwigo é desenvolevido em PHP com uma base de dados MySQL.
    • +
  • Piwigo é desenvolvido em PHP com uma base de dados MySQL.
    • -
  • Se houver sugestões ou comentários, visite o sitio oficial e seu forum.
    • +
  • Piwigo é uma aplicação web que permite a criação de uma galeria de imagens on line. Existem diversas extensões que permitem personalizar sua galeria facilmente. +Piwigo é um software livre, ou seja, você pode usá-lo da forma que quiser. Ele foi construído por uma comunidade ativa de usuários e desenvolvedores.
    • -

    A tradução Brasil é mantida por (em ordem alfabética): +

    Piwigo utiliza linguagem PHP com uma base de dados MySQL. Se houver sugestões ou comentários, visite o sitio oficial e seu forum. A tradução Brasil é mantida por (em ordem alfabética):

    diff --git a/sources/language/pt_BR/admin.lang.php b/sources/language/pt_BR/admin.lang.php index e23d04b..fbdfba8 100644 --- a/sources/language/pt_BR/admin.lang.php +++ b/sources/language/pt_BR/admin.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -973,7 +973,7 @@ $lang['Activate it now'] = 'Ativar agora'; $lang['Allow users to add a link to their website'] = 'Permitir usuários adicionar um link em seus websites'; $lang['Impossible to deactivate the default theme.'] = 'Imposível desativar o tema padrão'; $lang['Mail address is mandatory for registration'] = 'Para registro o email é obrigatório'; -$lang['Empty caddie'] = 'Carrinho vazio'; +$lang['Empty caddie'] = 'Esvaziar carrinho'; $lang['No and unlock sub-albums'] = 'Não e desbloquear sub-álbuns'; $lang['The settings for the guest are from the %s user'] = 'As configurações para o convidado são definidas pelo usuário %s'; $lang['based on'] = 'baseado em'; @@ -981,4 +981,14 @@ $lang['between %s and %s MB'] = 'entre %s e %s MB'; $lang['date & time'] = 'dia & hora'; $lang['file name'] = 'nome do arquivo'; $lang['width & height'] = 'largura & comprimento'; -$lang['Upload in progress'] = 'Upload em progresso'; \ No newline at end of file +$lang['Upload in progress'] = 'Upload em progresso'; +$lang['Delete %d orphan photos'] = 'Apagar %d fotos órfãs'; +$lang['Each email sent will contain its own automatic authentication key on links, valid for %s.'] = 'Cada e-mail enviado conterá sua própria chave de autenticação automática em links, válido para %s.'; +$lang['Edit user'] = 'Editar usuário'; +$lang['For security reason, authentication keys do not work for administrators.'] = ' +Por razões de segurança, chaves de autenticação não funcionam para os administradores.'; +$lang['No recipient selected'] = 'Nenhum recipiente selecionado'; +$lang['No user is permitted to see this private album'] = 'Nenhum usuário tem permissão para ver este álbum privado'; +$lang['Orphans'] = 'Órfãos'; +$lang['Recipients'] = 'Recipiente'; +$lang['Y Repeat'] = 'Repetir Y'; \ No newline at end of file diff --git a/sources/language/pt_BR/common.lang.php b/sources/language/pt_BR/common.lang.php index 11a8499..d5e819e 100644 --- a/sources/language/pt_BR/common.lang.php +++ b/sources/language/pt_BR/common.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -22,7 +22,7 @@ // +-----------------------------------------------------------------------+ /* Language Name: Brasil [BR] -Version: 2.7.1 +Version: 2.8.2 Language URI: http://piwigo.org/ext/extension_view.php?eid=431 Author: Piwigo team Author URI: http://piwigo.org @@ -426,4 +426,5 @@ $lang['Photo description'] = 'Descrição da foto'; $lang['Photo title'] = 'Título da foto'; $lang['Album name, A → Z'] = 'Nome do álbum, A → Z'; $lang['Album name, Z → A'] = 'Nome do álbum, Z → A'; -$lang['Link: %s'] = 'Link: %s'; \ No newline at end of file +$lang['Link: %s'] = 'Link: %s'; +$lang['Your authentication key is no longer valid.'] = 'Sua chave de autenticação não é mais válida.'; \ No newline at end of file diff --git a/sources/language/pt_BR/help/photos_add_ftp.html b/sources/language/pt_BR/help/photos_add_ftp.html index 21d5581..e408fa0 100644 --- a/sources/language/pt_BR/help/photos_add_ftp.html +++ b/sources/language/pt_BR/help/photos_add_ftp.html @@ -26,38 +26,33 @@ usando muitos recursos) :

    -.
-|-- admin
-|-- doc
-|-- galleries
-|   |-- category-1
-|   |   |-- category-1.1
-|   |   |   |-- category-1.1.1
-|   |   |   |   |-- category-1.1.1.1
-|   |   |   |   |   |-- pwg_high
-|   |   |   |   |   |   +-- wedding.jpg
-|   |   |   |   |   |-- thumbnail
-|   |   |   |   |   |   +-- TN-wedding.jpg
-|   |   |   |   |   +-- wedding.jpg
-|   |   |   |   +-- category-1.1.1.2
-|   |   |   +-- category-1.1.2
-|   |   |-- category-1.2
-|   |   |   |-- pookie.jpg
-|   |   |   +-- thumbnail
-|   |   |       +-- TN-pookie.jpg
-|   |   +-- category-1.3
-|   +-- category-2
-|       |-- piglet.gif
-|       |-- pwg_representative
-|       |   +-- video.jpg
-|       |-- thumbnail
-|       |   +-- TN-piglet.jpg
-|       +-- video.avi
-|-- include
-|-- install
-|-- language
-|-- template
-+-- tool
    +galleries +|-- wedding +| |-- celebration +| | |-- arrival +| | | |-- paul-alone.jpg +| | | +-- sarah-alone.jpg +| | +-- departure +| | +-- paul-and-sarah.jpg +| +-- party +| |-- dancers001.jpg +| |-- dancers002.jpg +| +-- dancers003.jpg ++-- honeymoon +| |-- hotel.png +| |-- video-from-plane.avi +| +-- pwg_representative +| +-- video-from-plane.jpg ++-- photoshoot + |-- img0001.jpg + |-- img0002.jpg + +-- pwg_format + |-- img0001.cr2 + |-- img0001.cmyk.jpg + |-- img0001.zip + |-- img0002.cr2 + +-- img0002.cmyk.jpg + @@ -77,6 +72,8 @@
  • Outros itens (video, sons, arquivos de texto, o que você quiser...) são por padrão representados por um ícone correspondente à extensão do nome de arquivo. Você tem a opção de associar uma miniatura e um arquivo representativo (veja video.avi no exemplo acima).
    • +
  • Multiple formats: a photo can be available in several formats. In this example, we have 3 additional formats for img0001.jpg. You can activate this feature with $conf['enable_formats'] = true; in your local configuration and define a list of formats, like $conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');
    • +
  • Atenção: o nome dos diretórios e dos arquivos devem conter apenas letras, números, "-", "_" ou ".". Não use espaço em branco e nem caracteres acentuados.
  • Uma vez que os arquivos, as miniaturas e representativos estiverem corretamente alocados nos diretórios, @@ -86,21 +83,3 @@ -
    - Miniaturas (Thumbnails) -
      - -
    • Cada foto deve ter a sua miniatura.
      • - -
    • As miniaturas estão armazenadas no subdiretório "thumbnail" no diretório das categorias. - A miniatura tem o mesmo nome de arquivo que a foto correspondente, com TN- como prefixo.
      • - -
    • Aviso: use um módulo externo para a criação das miniaturas.
      • - -
    • Mesmo se isto não é recomendado (qualidade da imagem, carregamento do servidor, etc), você pode usar a página - class="pwgScreen">Administração » Imagens » Miniaturas para criar as miniaturas.
      • - -
    • Dê acesso de escrita para todos os diretórios das categorias.
      • - -
    -
    \ No newline at end of file diff --git a/sources/language/pt_BR/index.php b/sources/language/pt_BR/index.php index c8de97f..0b96c3e 100644 --- a/sources/language/pt_BR/index.php +++ b/sources/language/pt_BR/index.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/language/pt_BR/install.lang.php b/sources/language/pt_BR/install.lang.php index 0934344..336d27a 100644 --- a/sources/language/pt_BR/install.lang.php +++ b/sources/language/pt_BR/install.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -46,13 +46,13 @@ $lang['Password [confirm]'] = 'Senha [confirmar]'; $lang['verification'] = 'verificação'; $lang['Need help ? Ask your question on Piwigo message board.'] = 'Precisa de ajuda ? Faça a sua pergunta no Piwigo message board.'; $lang['Visitors will be able to contact site administrator with this mail'] = 'Os visitantes poderão entrar em contato com o administrador do site através desse email'; -$lang['PHP 5 is required'] = 'É necessário PHP 5'; +$lang['PHP 5 is required'] = 'É necessário PHP 5.2'; $lang['It appears your webhost is currently running PHP %s.'] = 'Parece que a sua hospedagem está atualmente usando PHP %s.'; -$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo pode tentar mudar sua configuração para PHP 5 através da criação ou modificação de um arquivo .htaccess.'; +$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo pode tentar mudar sua configuração para PHP 5.2 através da criação ou modificação de um arquivo .htaccess.'; $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'Note que você pode alterar sua configuração por conta própria e reiniciar o Piwigo depois disso.'; -$lang['Try to configure PHP 5'] = 'Tentar configurar PHP 5'; +$lang['Try to configure PHP 5'] = 'Tentar configurar PHP 5.2'; $lang['Sorry!'] = 'Lamento!'; -$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo não teve condições de configurar o PHP 5.'; +$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo não teve condições de configurar o PHP 5.2'; $lang["You may referer to your hosting provider's support and see how you could switch to PHP 5 by yourself."] = "Você deve entrar em contato com o suporte do seu provedor e ver como você poderia mudar para PHP 5 por conta própria."; $lang['Hope to see you back soon.'] = 'Espero te ver de volta em breve.'; $lang['An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning : database.inc.php must only contain what is in the textarea, no line return or space character)'] = 'Uma solução alternativa é copiar o texto na caixa acima e cole-o no arquivo "local/config/database.inc.php" (Atenção: database.inc.php deve conter apenas o que está na área de texto, sem retorno de linha ou caractere de espaço)'; @@ -65,4 +65,4 @@ $lang['Welcome to my photo gallery'] = 'Bem-Vindo a minha galeria de fotos.'; $lang['Welcome to your new installation of Piwigo!'] = 'Bem-Vindo a sua nova instalação do Piwigo.'; $lang['You can download the config file and upload it to local/config directory of your installation.'] = 'Você pode baixar o arquivo de configuração e colocá-lo na pasta local/config de sua instalação.'; $lang['localhost or other, supplied by your host provider'] = 'localhost ou outro, fornecido pelo seu provedor de hospedagem'; -?> \ No newline at end of file +$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Você deve entrar em contato com o suporte do seu provedor e ver como você poderia mudar para PHP 5.2 por conta própria.'; \ No newline at end of file diff --git a/sources/language/pt_BR/upgrade.lang.php b/sources/language/pt_BR/upgrade.lang.php index 26e9fe8..e73b30a 100644 --- a/sources/language/pt_BR/upgrade.lang.php +++ b/sources/language/pt_BR/upgrade.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/language/pt_PT/admin.lang.php b/sources/language/pt_PT/admin.lang.php index 749ec35..145ba61 100644 --- a/sources/language/pt_PT/admin.lang.php +++ b/sources/language/pt_PT/admin.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -979,4 +979,14 @@ $lang['between %s and %s MB'] = 'Entre %s e %s MB'; $lang['date & time'] = 'Data e hora'; $lang['file name'] = 'Nome do arquivo'; $lang['width & height'] = 'Largura & altura'; -$lang['Upload in progress'] = 'Carregamento em progresso'; \ No newline at end of file +$lang['Upload in progress'] = 'Carregamento em progresso'; +$lang['Delete %d orphan photos'] = 'Apagar %d fotos órfãos'; +$lang['Each email sent will contain its own automatic authentication key on links, valid for %s.'] = 'Cada e-mail enviado conterá sua própria chave de autenticação automática de links, válido para %s.'; +$lang['Edit user'] = 'Editar usuário'; +$lang['For security reason, authentication keys do not work for administrators.'] = ' +Por razões de segurança, chaves de autenticação não funcionam para os administradores.'; +$lang['No recipient selected'] = 'Nenhum destinatário seleccionado'; +$lang['No user is permitted to see this private album'] = 'Nenhum usuário tem permissão para ver este álbum privado'; +$lang['Orphans'] = 'Órfãos'; +$lang['Recipients'] = 'Destinatários'; +$lang['Y Repeat'] = 'Y Repetir'; \ No newline at end of file diff --git a/sources/language/pt_PT/common.lang.php b/sources/language/pt_PT/common.lang.php index 3d6f3b8..c819072 100644 --- a/sources/language/pt_PT/common.lang.php +++ b/sources/language/pt_PT/common.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -22,7 +22,7 @@ // +-----------------------------------------------------------------------+ /* Language Name: Português [PT] -Version: 2.7.1 +Version: 2.8.2 Language URI: http://piwigo.org/ext/extension_view.php?eid=432 Author: Piwigo team Author URI: http://piwigo.org @@ -429,4 +429,5 @@ $lang['Album name, Z → A'] = 'Nome do album, de A a Z'; $lang['Apply on properties'] = 'Aplicar nas propriedades'; $lang['Link: %s'] = 'Link: %s'; $lang['Photo description'] = 'Descrição da foto'; -$lang['Photo title'] = 'Título da foto'; \ No newline at end of file +$lang['Photo title'] = 'Título da foto'; +$lang['Your authentication key is no longer valid.'] = 'Sua chave de autenticação não é mais válida.'; \ No newline at end of file diff --git a/sources/language/pt_PT/help/cat_options.html b/sources/language/pt_PT/help/cat_options.html new file mode 100644 index 0000000..b807633 --- /dev/null +++ b/sources/language/pt_PT/help/cat_options.html @@ -0,0 +1,23 @@ +

    Opções do Album

    + +

    Opções aplicáveis a vários albuns em simultâneo.

    + +
    + +
    Comentários
    +
    Uma fotografia pode ser comentada pelos visitantes se estiver num album com os comentários activados.
    + +
    Descativa
    +
    Albuns são desactivados para manutenção. Só os administradores podem aceder-lhes a partir da galeria de imagens (do site).
    + +
    Público / privado
    +
    Num album definido como Privado, dê direitos de acesso a registados e a grupos
    + +
    Símbolo
    +
    Esta opção está disponível quando o define na configuração +permite o uso duma imagem aleatória como símbolo (see include/config_defaults.inc.php) to +true. Cada album pode ser representado por uma fotografia aleatória ou por uma única fotografia previamente seleccionada.
    + + +
    diff --git a/sources/language/pt_PT/help/cat_perm.html b/sources/language/pt_PT/help/cat_perm.html new file mode 100644 index 0000000..78a36d2 --- /dev/null +++ b/sources/language/pt_PT/help/cat_perm.html @@ -0,0 +1,11 @@ +

    Edita as permissões dos albuns

    + +

    Esta quadro apenas está disponível para albuns privados. Aqui pode escolher os registados e os grupos autorizados a aceder a um album.

    + +

    Grupos

    + +

    Pode recusar ou permitir que grupos tenham acesso ao album corrente. Alterando as autorizações de grupos, os registados que pertencem a esses grupos serão impedidos ou autorizados a aceder ao album.

    + +

    Registados

    + +

    Pode impedir ou permitr o acesso individual de registados. Registados que tenham acesso por pertencerem a um grupo, poderão ser impedidos a título de excepção.

    diff --git a/sources/language/pt_PT/help/permalinks.html b/sources/language/pt_PT/help/permalinks.html new file mode 100644 index 0000000..1de1516 --- /dev/null +++ b/sources/language/pt_PT/help/permalinks.html @@ -0,0 +1,7 @@ +

    Permalinks

    + +

    Permalinks são usados para melhorar os endereços dos albuns. Quando se define o permalink de um album, o id do album não volta a ser necessário no endereço.

    + +

    Quando se apaga o permalink, pode guardar-se no hisórico dos permalink, e assim os links exteriores às páginas de Piwigo continuam a funcionar. Na tabela do histórico dos permalinks pode ver a data em que um permalink foi apagado, a última vez em que foi usado e o número de vezes que um permalink foi usado.

    + +

    Atenção que cada album terá de ter o seu próprio permalink. No histórico dos permalinks também não pode repetir um permalink que já tenha sido definido.

    diff --git a/sources/language/pt_PT/help/photos_add_ftp.html b/sources/language/pt_PT/help/photos_add_ftp.html index 1d63f81..f519449 100644 --- a/sources/language/pt_PT/help/photos_add_ftp.html +++ b/sources/language/pt_PT/help/photos_add_ftp.html @@ -25,38 +25,33 @@ Parabéns! Você acabou de criar o primeiro álbum da sua galer

    As pastas dos álbums estão na pasta "galleries" no Piwigo. Segue aqui a árvore de pastas de uma pequena galeria (mas usando muitos recursos) :

    -.
-|-- admin
-|-- doc
-|-- galleries
-|   |-- category-1
-|   |   |-- category-1.1
-|   |   |   |-- category-1.1.1
-|   |   |   |   |-- category-1.1.1.1
-|   |   |   |   |   |-- pwg_high
-|   |   |   |   |   |   +-- wedding.jpg
-|   |   |   |   |   |-- thumbnail
-|   |   |   |   |   |   +-- TN-wedding.jpg
-|   |   |   |   |   +-- wedding.jpg
-|   |   |   |   +-- category-1.1.1.2
-|   |   |   +-- category-1.1.2
-|   |   |-- category-1.2
-|   |   |   |-- pookie.jpg
-|   |   |   +-- thumbnail
-|   |   |       +-- TN-pookie.jpg
-|   |   +-- category-1.3
-|   +-- category-2
-|       |-- piglet.gif
-|       |-- pwg_representative
-|       |   +-- video.jpg
-|       |-- thumbnail
-|       |   +-- TN-piglet.jpg
-|       +-- video.avi
-|-- include
-|-- install
-|-- language
-|-- template
-+-- tool
    +galleries +|-- wedding +| |-- celebration +| | |-- arrival +| | | |-- paul-alone.jpg +| | | +-- sarah-alone.jpg +| | +-- departure +| | +-- paul-and-sarah.jpg +| +-- party +| |-- dancers001.jpg +| |-- dancers002.jpg +| +-- dancers003.jpg ++-- honeymoon +| |-- hotel.png +| |-- video-from-plane.avi +| +-- pwg_representative +| +-- video-from-plane.jpg ++-- photoshoot + |-- img0001.jpg + |-- img0002.jpg + +-- pwg_format + |-- img0001.cr2 + |-- img0001.cmyk.jpg + |-- img0001.zip + |-- img0002.cr2 + +-- img0002.cmyk.jpg +
    • @@ -70,6 +65,8 @@ Parabéns! Você acabou de criar o primeiro álbum da sua galer
  • Outros itens (video, sons, arquivos de texto, o que você quiser...) são por padrão representados por um ícone correspondente à extensão do nome de arquivo. Você tem a opção de associar uma miniatura e um ficheiro representativo (veja video.avi no exemplo acima).
    • +
  • Multiple formats: a photo can be available in several formats. In this example, we have 3 additional formats for img0001.jpg. You can activate this feature with $conf['enable_formats'] = true; in your local configuration and define a list of formats, like $conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');
    • +
  • Atenção: o nome das pastas e dos ficheiros devem conter apenas letras, números, "-", "_" ou ".". Não use espaço em branco e nem caracteres acentuados.
  • Uma vez que os ficheiros, as miniaturas e representativos estiverem corretamente alocados nas pastas,vá até : Ferramentas » Sincronizar
    • @@ -77,20 +74,3 @@ Parabéns! Você acabou de criar o primeiro álbum da sua galer -
    - Miniaturas (Thumbnails) -
      - -
    • Cada foto deve ter a sua miniatura.
      • - -
    • As miniaturas estão armazenadas na subpasta "thumbnail" na pasta das categorias. - A miniatura tem o mesmo nome de ficheiro que a foto correspondente, com TN- como prefixo.
      • - -
    • Atenção: use um módulo externo para a criação das miniaturas.
      • - -
    • Embora não seja recomendado (qualidade da imagem, carga do servidor, etc), pode usar a página Ferramentas » Miniaturas para criar as miniaturas.
      • - -
    • Dê permissões de escrita para todas as pastas dos albums.
      • - -
    -
    diff --git a/sources/language/pt_PT/index.php b/sources/language/pt_PT/index.php index c8de97f..0b96c3e 100644 --- a/sources/language/pt_PT/index.php +++ b/sources/language/pt_PT/index.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/language/pt_PT/install.lang.php b/sources/language/pt_PT/install.lang.php index 62ae5b2..89ab8ed 100644 --- a/sources/language/pt_PT/install.lang.php +++ b/sources/language/pt_PT/install.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -46,13 +46,13 @@ $lang['Password [confirm]'] = 'Palavra-passe [confirmação]'; $lang['verification'] = 'Verificar Senha inserida'; $lang['Need help ? Ask your question on Piwigo message board.'] = 'Precisa de ajuda? Faça a sua pergunta no Fórum Piwigo.'; $lang['Visitors will be able to contact site administrator with this mail'] = 'Os visitantes poderão entrar em contacto com o administrador da galeria através deste email'; -$lang['PHP 5 is required'] = 'PHP 5 é necessário'; +$lang['PHP 5 is required'] = 'PHP 5.2 é necessário'; $lang['It appears your webhost is currently running PHP %s.'] = 'Parece que o seu provedor de hospedagem usa actualmente PHP %s.'; -$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo pode tentar mudar a sua configuração para PHP 5 através da criação ou modificação de um arquivo .htaccess.'; +$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo pode tentar mudar a sua configuração para PHP 5.2 através da criação ou modificação de um arquivo .htaccess.'; $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'Note que você pode alterar sua configuração por conta própria e reiniciar o Piwigo depois disso.'; -$lang['Try to configure PHP 5'] = 'Tentar configurar PHP 5'; +$lang['Try to configure PHP 5'] = 'Tentar configurar PHP 5.2'; $lang['Sorry!'] = 'Lamentamos!'; -$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo não pôde configurar o PHP 5.'; +$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo não pôde configurar o PHP 5.2'; $lang["You may referer to your hosting provider's support and see how you could switch to PHP 5 by yourself."] = "Você deve entrar em contacto com o suporte do seu provedor e saber como pode mudar para PHP 5."; $lang['Hope to see you back soon.'] = 'Desejamos volte em breve.'; $lang['Congratulations, Piwigo installation is completed'] = 'Parabéns, a sua instalação Piwigo está completa'; @@ -64,7 +64,6 @@ $lang['Just another Piwigo gallery'] = 'Apenas mais uma galeria Piwigo'; $lang['Welcome to my photo gallery'] = 'Bem-vindo à minha galeria de fotos'; $lang['Welcome to your new installation of Piwigo!'] = 'Bem-vindo à sua nova instalação do Piwigo!'; $lang['Don\'t hesitate to consult our forums for any help : %s'] = 'Não hesite em visitar nossos foruns para qualquer ajuda: %s'; -$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Você deve entrar em contacto com o suporte do seu fornecedor de alojamento e saber como pode mudar para PHP 5.'; +$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Você deve entrar em contacto com o suporte do seu fornecedor de alojamento e saber como pode mudar para PHP 5.2'; $lang['Password ']['confirm'] = 'Senha [confirme]'; -$lang['localhost or other, supplied by your host provider'] = 'hospedeiro local ou outro, fornecido pelo seu alojador'; -?> \ No newline at end of file +$lang['localhost or other, supplied by your host provider'] = 'hospedeiro local ou outro, fornecido pelo seu alojador'; \ No newline at end of file diff --git a/sources/language/pt_PT/upgrade.lang.php b/sources/language/pt_PT/upgrade.lang.php index b37028d..b2f804e 100644 --- a/sources/language/pt_PT/upgrade.lang.php +++ b/sources/language/pt_PT/upgrade.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/language/ro_RO/admin.lang.php b/sources/language/ro_RO/admin.lang.php index 6da3095..cb978a0 100644 --- a/sources/language/ro_RO/admin.lang.php +++ b/sources/language/ro_RO/admin.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -985,4 +985,13 @@ $lang['based on'] = 'bazat pe'; $lang['width & height'] = 'latime & inaltime'; $lang['file name'] = 'numele fisierului'; $lang['date & time'] = 'data & ora'; -$lang['Upload in progress'] = 'Incarcare in desfasurare'; \ No newline at end of file +$lang['Upload in progress'] = 'Incarcare in desfasurare'; +$lang['Each email sent will contain its own automatic authentication key on links, valid for %s.'] = 'Fiecare email trimis va conține cheia de autentificare automată în link, valabilă pentru %s '; +$lang['No user is permitted to see this private album'] = 'Niciunui utilizator nu îi este permis să vadă acest album'; +$lang['No recipient selected'] = 'Nu a fost selectat nici un destinatar'; +$lang['For security reason, authentication keys do not work for administrators.'] = 'Din motive de securitate, cheile de autentificare nu funcţionează pentru administratori'; +$lang['Recipients'] = 'Destinatari'; +$lang['Edit user'] = 'Editează utilizatorul'; +$lang['Y Repeat'] = 'Y Repetare'; +$lang['Delete %d orphan photos'] = 'Sterge %d fotografii orfane'; +$lang['Orphans'] = 'Orfane'; \ No newline at end of file diff --git a/sources/language/ro_RO/common.lang.php b/sources/language/ro_RO/common.lang.php index 9613581..9a924bc 100644 --- a/sources/language/ro_RO/common.lang.php +++ b/sources/language/ro_RO/common.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -22,7 +22,7 @@ // +-----------------------------------------------------------------------+ /* Language Name: Română [RO] -Version: 2.7.0 +Version: 2.8.2 Language URI: http://piwigo.org/ext/extension_view.php?eid=433 Author: Piwigo team Author URI: http://piwigo.org @@ -426,4 +426,6 @@ $lang['Photo description'] = 'Descriere fotografie'; $lang['No results for'] = 'Nici un rezultat pentru'; $lang['Apply on properties'] = 'Aplica la proprietati'; $lang['Album name, A → Z'] = 'Nume album, A & rarr; Z'; -$lang['Link: %s'] = 'Legatura: %s'; \ No newline at end of file +$lang['Link: %s'] = 'Legatura: %s'; +$lang['Your authentication key is no longer valid.'] = ' +Cheia dvs. de autentificare nu mai este valabilă.'; \ No newline at end of file diff --git a/sources/language/ro_RO/index.php b/sources/language/ro_RO/index.php index c8de97f..0b96c3e 100644 --- a/sources/language/ro_RO/index.php +++ b/sources/language/ro_RO/index.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/language/ro_RO/install.lang.php b/sources/language/ro_RO/install.lang.php index 9fe9571..3cca38a 100755 --- a/sources/language/ro_RO/install.lang.php +++ b/sources/language/ro_RO/install.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -47,13 +47,13 @@ $lang['Keep it confidential, it enables you to access administration panel'] = ' $lang['Need help ? Ask your question on Piwigo message board.'] = 'Ai nevoie de ajutor? Intreaba pe Forumul Piwigo.'; $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'Poti sa schimbi configuratia manual si sa restartezi Piwigo dupa aceea.'; $lang['Password [confirm]'] = 'Parola [confirma]'; -$lang['PHP 5 is required'] = 'PHP5 este necesar'; -$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo va incerca sa treaca configuratia ta la PHP5 folosind o fila .htaccess'; -$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo nu a putut sa configureze PHP5'; +$lang['PHP 5 is required'] = 'PHP5.2 este necesar'; +$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo va incerca sa treaca configuratia ta la PHP5.2 folosind o fila .htaccess'; +$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo nu a putut sa configureze PHP5.2'; $lang['please enter your password again'] = 'Introduce parola inca o data'; $lang['Sorry!'] = 'Imi pare rau!'; $lang['Start Install'] = 'Incepe instalarea'; -$lang['Try to configure PHP 5'] = 'Incearca sa configurezi PHP5'; +$lang['Try to configure PHP 5'] = 'Incearca sa configurezi PHP5.2'; $lang['user login given by your host provider'] = 'Userul oferit de providerul de host.'; $lang['user password given by your host provider'] = 'Parola oferita de providerul de host'; $lang['User'] = 'User'; @@ -63,6 +63,5 @@ $lang['webmaster login can\'t contain characters \' or "'] = 'Userul nu poate sa $lang['Welcome to my photo gallery'] = 'Bine ati venit la galeria mea foto'; $lang['Welcome to your new installation of Piwigo!'] = 'Bine ai venit la noua instalare Piwigo!'; $lang['You can download the config file and upload it to local/config directory of your installation.'] = 'Poti sa descarci fila de configurare si sa o uploadezi in folderul local/config al instalarii.'; -$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Ar trebui sa te adresezi hostului si sa intrebi cum poti sa treci la PHP5'; -$lang['localhost or other, supplied by your host provider'] = 'localhost sau alta, furnizat de furnizorul de găzduire'; -?> \ No newline at end of file +$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Ar trebui sa te adresezi hostului si sa intrebi cum poti sa treci la PHP5.2'; +$lang['localhost or other, supplied by your host provider'] = 'localhost sau alta, furnizat de furnizorul de găzduire'; \ No newline at end of file diff --git a/sources/language/ro_RO/upgrade.lang.php b/sources/language/ro_RO/upgrade.lang.php index de0c4a7..713096f 100755 --- a/sources/language/ro_RO/upgrade.lang.php +++ b/sources/language/ro_RO/upgrade.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/language/ru_RU/admin.lang.php b/sources/language/ru_RU/admin.lang.php index 05146c1..e2a19b1 100644 --- a/sources/language/ru_RU/admin.lang.php +++ b/sources/language/ru_RU/admin.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -983,4 +983,13 @@ $lang['date & time'] = 'дата и время'; $lang['file name'] = 'имя файла'; $lang['width & height'] = 'ширина и высота'; $lang['No and unlock sub-albums'] = 'Нет, и разблокировать вложенные альбомы'; -$lang['Upload in progress'] = 'Идет процесс загрузки'; \ No newline at end of file +$lang['Upload in progress'] = 'Идет процесс загрузки'; +$lang['For security reason, authentication keys do not work for administrators.'] = 'Из соображений безопасности ключ идентификации для администраторов не работает.'; +$lang['Delete %d orphan photos'] = 'Удаление %d одиночных фото'; +$lang['Orphans'] = 'Одиночные'; +$lang['Y Repeat'] = 'Повтор Y'; +$lang['No user is permitted to see this private album'] = 'Никакому пользователю не позволено видеть этот частный альбом'; +$lang['Each email sent will contain its own automatic authentication key on links, valid for %s.'] = 'Каждый е-mail содержит свой собственный ключ идентификации по ссылке, действительный для %s.'; +$lang['Edit user'] = 'Редактирование пользователя'; +$lang['Recipients'] = 'Получатели'; +$lang['No recipient selected'] = 'Получатель не выбран'; \ No newline at end of file diff --git a/sources/language/ru_RU/common.lang.php b/sources/language/ru_RU/common.lang.php index 461ff4a..dff02bf 100644 --- a/sources/language/ru_RU/common.lang.php +++ b/sources/language/ru_RU/common.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -22,7 +22,7 @@ // +-----------------------------------------------------------------------+ /* Language Name: Русский [RU] -Version: 2.7.2 +Version: 2.8.2 Language URI: http://piwigo.org/ext/extension_view.php?eid=434 Author: Piwigo team Author URI: http://piwigo.org @@ -428,4 +428,5 @@ $lang['Photo description'] = 'Описание изображения'; $lang['Photo title'] = 'Заголовок изображения'; $lang['Album name, A → Z'] = 'По названиям альбомов, от A → Z'; $lang['Album name, Z → A'] = 'По названиям альбомов, от Z → A'; -$lang['Link: %s'] = 'Ссылка: %s'; \ No newline at end of file +$lang['Link: %s'] = 'Ссылка: %s'; +$lang['Your authentication key is no longer valid.'] = 'Увы, Ваш ключ идентификации больше не действителен.'; \ No newline at end of file diff --git a/sources/language/ru_RU/help/photos_add_ftp.html b/sources/language/ru_RU/help/photos_add_ftp.html index c02a68c..9856d14 100644 --- a/sources/language/ru_RU/help/photos_add_ftp.html +++ b/sources/language/ru_RU/help/photos_add_ftp.html @@ -41,6 +41,15 @@ galleries |-- video-from-plane.avi +-- pwg_representative +-- video-from-plane.jpg ++-- photoshoot + |-- img0001.jpg + |-- img0002.jpg + +-- pwg_format + |-- img0001.cr2 + |-- img0001.cmyk.jpg + |-- img0001.zip + |-- img0002.cr2 + +-- img0002.cmyk.jpg @@ -58,6 +67,8 @@ galleries представлены иконками соответствующими расширению файла. Дополнительно, Вы можете связать миниатюру и представительный файл (см. video.avi в примере выше). +
  • Multiple formats: a photo can be available in several formats. In this example, we have 3 additional formats for img0001.jpg. You can activate this feature with $conf['enable_formats'] = true; in your local configuration and define a list of formats, like $conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');
    • +
  • Внимание: имена папок и файлов должны содержать только латинские буквы, цифры, "-", "_" или ".". Не используйте пробелы и спецсимволы.
    • @@ -66,4 +77,4 @@ galleries - \ No newline at end of file + diff --git a/sources/language/ru_RU/index.php b/sources/language/ru_RU/index.php index c8de97f..0b96c3e 100644 --- a/sources/language/ru_RU/index.php +++ b/sources/language/ru_RU/index.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/language/ru_RU/install.lang.php b/sources/language/ru_RU/install.lang.php index e4908c7..4635784 100644 --- a/sources/language/ru_RU/install.lang.php +++ b/sources/language/ru_RU/install.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -46,14 +46,14 @@ $lang['Password [confirm]'] = 'Повторите пароль'; $lang['verification'] = 'еще раз для исключения опечатки'; $lang['Need help ? Ask your question on Piwigo message board.'] = 'Нужна помощь? Задайте свои вопросы на Форуме Piwigo.'; $lang['Visitors will be able to contact site administrator with this mail'] = 'Будет использоваться для контакта посетителей с администратором'; -$lang['PHP 5 is required'] = 'Требуется PHP 5'; +$lang['PHP 5 is required'] = 'Требуется PHP 5.2'; $lang['It appears your webhost is currently running PHP %s.'] = 'Кажется, что Ваш хостинг в настоящее время под управлением PHP %s.'; -$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo может попытаться переключить Вашу конфигурацию на PHP 5, создавая или изменяя .htaccess файл.'; +$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo может попытаться переключить Вашу конфигурацию на PHP 5.2, создавая или изменяя .htaccess файл.'; $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'Отметьте, что Вы можете изменить конфигурацию самостоятельно и перезапустите Piwigo после этого.'; -$lang['Try to configure PHP 5'] = 'Попытаться переконфигурировать PHP 5'; +$lang['Try to configure PHP 5'] = 'Попытаться переконфигурировать PHP 5.2'; $lang['Sorry!'] = 'Извините!'; -$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo не в состоянии переконфигурировать PHP 5.'; -$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Вы должны обратиться к своему провайдеру за поддержой и разъяснениями, как переключиться на PHP 5.'; +$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo не в состоянии переконфигурировать PHP 5.2'; +$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Вы должны обратиться к своему провайдеру за поддержой и разъяснениями, как переключиться на PHP 5.2'; $lang['Hope to see you back soon.'] = 'Надеемся скоро увидеть Вас вновь.'; $lang['Congratulations, Piwigo installation is completed'] = 'Поздравляем, установка Piwigo полностью завершена'; $lang['An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning : database.inc.php must only contain what is in the textarea, no line return or space character)'] = 'Альтернативное решение состоит в том, чтобы скопировать текст в блоке выше и вставить это в файл "local/config/database.inc.php" (Предупреждение: database.inc.php должен только содержать то, что находится в текстовом поле, без символов возврата строки или пробелов)'; @@ -64,5 +64,4 @@ $lang['Just another Piwigo gallery'] = 'Еще одна галерея Piwigo'; $lang['Welcome to my photo gallery'] = 'Добро пожаловать в мою фотогалерею'; $lang['Don\'t hesitate to consult our forums for any help : %s'] = 'Не стесняйтесь консультироваться на наших форумах для получения любой помощи, %s'; $lang['Welcome to your new installation of Piwigo!'] = 'Добро пожаловать в новую установку Piwigo!'; -$lang['localhost or other, supplied by your host provider'] = 'localhost или другой, который указан провайдером'; -?> \ No newline at end of file +$lang['localhost or other, supplied by your host provider'] = 'localhost или другой, который указан провайдером'; \ No newline at end of file diff --git a/sources/language/ru_RU/upgrade.lang.php b/sources/language/ru_RU/upgrade.lang.php index 2f8eeff..aa06e88 100644 --- a/sources/language/ru_RU/upgrade.lang.php +++ b/sources/language/ru_RU/upgrade.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/language/sh_RS/admin.lang.php b/sources/language/sh_RS/admin.lang.php index ad18ecf..2d9e8db 100644 --- a/sources/language/sh_RS/admin.lang.php +++ b/sources/language/sh_RS/admin.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/language/sh_RS/common.lang.php b/sources/language/sh_RS/common.lang.php index d963f6e..bc1d800 100644 --- a/sources/language/sh_RS/common.lang.php +++ b/sources/language/sh_RS/common.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -22,7 +22,7 @@ // +-----------------------------------------------------------------------+ /* Language Name: Srpski [SR] -Version: 2.7.0 +Version: 2.8.2 Language URI: http://piwigo.org/ext/extension_view.php?eid=435 Author: Piwigo team Author URI: http://piwigo.org diff --git a/sources/language/sh_RS/help/index.php b/sources/language/sh_RS/help/index.php index c8de97f..0b96c3e 100644 --- a/sources/language/sh_RS/help/index.php +++ b/sources/language/sh_RS/help/index.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/language/sh_RS/index.php b/sources/language/sh_RS/index.php index c8de97f..0b96c3e 100644 --- a/sources/language/sh_RS/index.php +++ b/sources/language/sh_RS/index.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/language/sh_RS/install.lang.php b/sources/language/sh_RS/install.lang.php index cf839e4..25fde72 100644 --- a/sources/language/sh_RS/install.lang.php +++ b/sources/language/sh_RS/install.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -46,14 +46,14 @@ $lang['Password [confirm]'] = 'Lozinka[potvrdi]'; $lang['verification'] = 'Provera'; $lang['Need help ? Ask your question on Piwigo message board.'] = 'Potrebna Vam je pomoc? Pitajte na Piwigo tabli za poruke.'; $lang['Visitors will be able to contact site administrator with this mail'] = 'Posetioci ce biti u mogucnosti da koriste ovaj mail da kontaktiraju administratora stranice'; -$lang['PHP 5 is required'] = 'PHP 5 je neophodan'; +$lang['PHP 5 is required'] = 'PHP 5.2 je neophodan'; $lang['It appears your webhost is currently running PHP %s.'] = 'Izgleda da Vaš webhost trenutno koristi PHP %s.'; -$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo može pokušati da promeni Vašu konfiguraciju na PHP 5 kreiranjem ili menjanjem .htaccess datoteke.'; +$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo može pokušati da promeni Vašu konfiguraciju na PHP 5.2 kreiranjem ili menjanjem .htaccess datoteke.'; $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'Imajte u vidu da možete sami izmeniti Vašu konfiguraciju restartovati Piwigo posle toga.'; -$lang['Try to configure PHP 5'] = 'Pokušajte da podestite PHP 5'; +$lang['Try to configure PHP 5'] = 'Pokušajte da podestite PHP 5.2'; $lang['Sorry!'] = 'Žao nam je!'; -$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo wnije uspeo da podesi PHP 5.'; -$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Trebalo bi da se obartite podršci Vašeg hosting provajdera za uputstvo kako da promenite na PHP 5 sami.'; +$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo wnije uspeo da podesi PHP 5.2'; +$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Trebalo bi da se obartite podršci Vašeg hosting provajdera za uputstvo kako da promenite na PHP 5.2 sami.'; $lang['Hope to see you back soon.'] = 'Nadamo se da se uskoro vidimo.'; $lang['Congratulations, Piwigo installation is completed'] = 'Cestitamo, Piwigo instalacija je završena'; $lang['An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning : database.inc.php must only contain what is in the textarea, no line return or space character)'] = 'Alternativno rešenje je da kopirate tekst iz kutije iznad i nalepite u datoteku "local/config/database.inc.php" (Upozorenje : database.inc.php mora sadržati samo tekst iz kutije, bez linije ili praznih karaktera)'; diff --git a/sources/language/sh_RS/upgrade.lang.php b/sources/language/sh_RS/upgrade.lang.php index 4719b80..cda9ee2 100644 --- a/sources/language/sh_RS/upgrade.lang.php +++ b/sources/language/sh_RS/upgrade.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/language/sk_SK/admin.lang.php b/sources/language/sk_SK/admin.lang.php index 112fa59..bab88db 100644 --- a/sources/language/sk_SK/admin.lang.php +++ b/sources/language/sk_SK/admin.lang.php @@ -5,7 +5,7 @@ // +-----------------------------------------------------------------------+ // | Copyright(C) 2009 Pavel Budka & Petr Jirsa http://pbudka.co.cc | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -983,4 +983,13 @@ $lang['file name'] = 'názov súboru'; $lang['based on'] = 'na základe'; $lang['The settings for the guest are from the %s user'] = 'Nastavenia pre hostí sú z %s používateľa'; $lang['No and unlock sub-albums'] = 'Nie a odomknúť pod-albumy'; -$lang['Upload in progress'] = 'Prebieha nahrávanie'; \ No newline at end of file +$lang['Upload in progress'] = 'Prebieha nahrávanie'; +$lang['Each email sent will contain its own automatic authentication key on links, valid for %s.'] = 'Každý odoslaný mail bude obsahovať automatický autentifikačný kľúč na linkoch, platný pre %s.'; +$lang['For security reason, authentication keys do not work for administrators.'] = 'Z bezpečnostných dovodov autentifikačné kľúče nefungujú pre administrátorov.'; +$lang['Delete %d orphan photos'] = 'Vymazať %d osamotených fotiek'; +$lang['Edit user'] = 'Upraviť používateľa'; +$lang['No recipient selected'] = 'Nevybraný žiaden príjemca'; +$lang['No user is permitted to see this private album'] = 'Žiadny používateľ nemá prístup na prezeranie tohto súkroného albumu'; +$lang['Orphans'] = 'Osamotené'; +$lang['Recipients'] = 'Príjemcovia'; +$lang['Y Repeat'] = 'Y opakovaní'; \ No newline at end of file diff --git a/sources/language/sk_SK/common.lang.php b/sources/language/sk_SK/common.lang.php index 2d42f97..67a5760 100644 --- a/sources/language/sk_SK/common.lang.php +++ b/sources/language/sk_SK/common.lang.php @@ -5,7 +5,7 @@ // +-----------------------------------------------------------------------+ // | Copyright(C) 2009 Pavel Budka & Petr Jirsa http://pbudka.co.cc | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -25,7 +25,7 @@ // +-----------------------------------------------------------------------+ /* Language Name: Slovensky [SK] -Version: 2.7.0 +Version: 2.8.2 Language URI: http://piwigo.org/ext/extension_view.php?eid=452 Author: Piwigo team Author URI: http://piwigo.org @@ -434,4 +434,5 @@ $lang['Photo description'] = 'Popis fotky'; $lang['Photo title'] = 'Názov fotky'; $lang['Album name, Z → A'] = 'Názov albumu, Z → A'; $lang['Album name, A → Z'] = 'Názov albumu, A → Z'; -$lang['Link: %s'] = 'Link: %s'; \ No newline at end of file +$lang['Link: %s'] = 'Link: %s'; +$lang['Your authentication key is no longer valid.'] = 'Váš autentifikačný kľúč nie je viac platný.'; \ No newline at end of file diff --git a/sources/language/sk_SK/help/index.php b/sources/language/sk_SK/help/index.php index c8de97f..0b96c3e 100644 --- a/sources/language/sk_SK/help/index.php +++ b/sources/language/sk_SK/help/index.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/language/sk_SK/help/photos_add_ftp.html b/sources/language/sk_SK/help/photos_add_ftp.html index 5130063..2bc825f 100644 --- a/sources/language/sk_SK/help/photos_add_ftp.html +++ b/sources/language/sk_SK/help/photos_add_ftp.html @@ -27,38 +27,33 @@ Gratulujeme! Práve ste vytvorili vašu prvú galériu fotografií vo Vašej Piw "galleries". Tu je ukážka malej adresárovej štruktúry Piwigo (ktorá ale využívá veľa vlastností Piwigo):

    -.
-|-- admin
-|-- doc
-|-- galleries
-|   |-- kategoria-1
-|   |   |-- kategoria-1.1
-|   |   |   |-- kategoria-1.1.1
-|   |   |   |   |-- kategoria-1.1.1.1
-|   |   |   |   |   |-- pwg_high
-|   |   |   |   |   |   +-- svatba.jpg
-|   |   |   |   |   |-- thumbnail
-|   |   |   |   |   |   +-- TN-svatba.jpg
-|   |   |   |   |   +-- svatba.jpg
-|   |   |   |   +-- kategoria-1.1.1.2
-|   |   |   +-- kategoria-1.1.2
-|   |   |-- kategoria-1.2
-|   |   |   |-- slon.jpg
-|   |   |   +-- thumbnail
-|   |   |       +-- TN-slon.jpg
-|   |   +-- kategoria-1.3
-|   +-- kategoria-2
-|       |-- teliatko.gif
-|       |-- pwg_representative
-|       |   +-- video.jpg
-|       |-- thumbnail
-|       |   +-- TN-teliatko.jpg
-|       +-- video.avi
-|-- include
-|-- install
-|-- language
-|-- template
-+-- tool
    +galleries +|-- wedding +| |-- celebration +| | |-- arrival +| | | |-- paul-alone.jpg +| | | +-- sarah-alone.jpg +| | +-- departure +| | +-- paul-and-sarah.jpg +| +-- party +| |-- dancers001.jpg +| |-- dancers002.jpg +| +-- dancers003.jpg ++-- honeymoon +| |-- hotel.png +| |-- video-from-plane.avi +| +-- pwg_representative +| +-- video-from-plane.jpg ++-- photoshoot + |-- img0001.jpg + |-- img0002.jpg + +-- pwg_format + |-- img0001.cr2 + |-- img0001.cmyk.jpg + |-- img0001.zip + |-- img0002.cr2 + +-- img0002.cmyk.jpg + @@ -74,6 +69,8 @@ Gratulujeme! Práve ste vytvorili vašu prvú galériu fotografií vo Vašej Piw
  • Elementy, ktoré nie sú obrázky (video, zvuk, textové súbory, čokoľvek chcete...) majú ako východzí náhľad ikonu, ktorá odpovedá ich prípone. Voliteľne môžete priradiť náhľad a reprezentatívny súbor (viď. video.avi v príklade vyššie).
    • +
  • Multiple formats: a photo can be available in several formats. In this example, we have 3 additional formats for img0001.jpg. You can activate this feature with $conf['enable_formats'] = true; in your local configuration and define a list of formats, like $conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');
    • +
  • Varovanie: názvy adresárov a súborov musia obsahovať len písmená, čísla, "-", "_" alebo ".". Žiadne medzery alebo znaky s diakritikou.
  • Keď sú elementy, obrázky, náhľady a reprezentatívne súbory umiestnené v adresárovej štruktúre, prejdite na: Administrácia » Kategória » @@ -81,22 +78,3 @@ Gratulujeme! Práve ste vytvorili vašu prvú galériu fotografií vo Vašej Piw - -
    - Náhľady -
      - -
    • Všetky obrázky (fotografie) musia mať priradený náhľad.
      • - -
    • Náhľady sú umiestnené v podadresári "thumbnail", ktorý je v adresári kategórie. Náhľad má rovnaký názov ako jemu odpovídajúci obrázok s prefixom podľa konfiguračného parametra prefix_thumbnail (viď. include/config.inc.php).
      • - -
    • Náhľad nemusí mať nutne rovnakú príponu ako jemu odpovedajúcí obrázok (napríklad ".jpg", obrázok môže mať náhľad s ".GIF" príponou).
      • - -
    • Odporúčame použiť externú aplikáciu pre tvorbu náhľadov.
      • - -
    • Vytváranie náhľadov pomocou Piwigo môže viesť k zlej kvalite vytvorených náhľadov, protože tá závisí na zdrojoch servra (a toto môže byť na zdielaných servroch (webhosting) problém). - -
    • Pokiaľ budete aj tak vytvárať náhľady pomocou Piwigo na servri, tak musíte povoliť prístup pre zápis do všetkých adresárov "galleries" a všetkých podadresárov.
      • - -
    -
    diff --git a/sources/language/sk_SK/index.php b/sources/language/sk_SK/index.php index c8de97f..0b96c3e 100644 --- a/sources/language/sk_SK/index.php +++ b/sources/language/sk_SK/index.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/language/sk_SK/install.lang.php b/sources/language/sk_SK/install.lang.php index fc898ee..ae00e0e 100644 --- a/sources/language/sk_SK/install.lang.php +++ b/sources/language/sk_SK/install.lang.php @@ -5,7 +5,7 @@ // +-----------------------------------------------------------------------+ // | Copyright(C) 2009 Pavel Budka & Petr Jirsa http://pbudka.co.cc | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -34,7 +34,6 @@ $lang['It will be shown to the visitors. It is necessary for website administrat $lang['Connection to server succeed, but it was impossible to connect to database'] = 'Spojenie na server sa podarilo, ale nebolo možné pripojiť databázu'; $lang['Can\'t connect to server'] = 'Nebolo možné sa pripojiť k serveru'; $lang['Host'] = 'MySQL server'; -$lang['localhost, sql.multimania.com, toto.freesurf.fr'] = 'localhost, sql.multimania.com, toto.freesurf.sk'; $lang['User'] = 'Používateľ'; $lang['user login given by your host provider'] = 'používateľské meno, ktoré Vám pridelil prevádzkovateľ serveru'; $lang['user password given by your host provider'] = 'heslo na tomto serveri'; @@ -50,14 +49,14 @@ $lang['Password [confirm]'] = 'Heslo [potvrdenie]'; $lang['verification'] = 'kontrola'; $lang['Need help ? Ask your question on Piwigo message board.'] = 'Potrebujete pomoc? Opýtajte sa na Piwigo fóre.'; $lang['Visitors will be able to contact site administrator with this mail'] = 'Návštevníci môžu pomocou tohto e-mailu kontaktovať správcu'; -$lang['PHP 5 is required'] = 'Je nutné PHP 5'; +$lang['PHP 5 is required'] = 'Je nutné PHP 5.2'; $lang['It appears your webhost is currently running PHP %s.'] = 'Na Vašom webhostingu je PHP %s.'; -$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo sa môže pokúsiť zmeniť Vaše nastavenie na PHP 5 tým, že vytvorí alebo zmení súbor .htaccess.'; +$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo sa môže pokúsiť zmeniť Vaše nastavenie na PHP 5.2 tým, že vytvorí alebo zmení súbor .htaccess.'; $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'Prípadne môžete zmeniť Vašu konfiguráciu sami a potom reštartovať Piwigo.'; -$lang['Try to configure PHP 5'] = 'Pokúste sa zmeniť Vaše nastavenie na PHP 5'; +$lang['Try to configure PHP 5'] = 'Pokúste sa zmeniť Vaše nastavenie na PHP 5.2'; $lang['Sorry!'] = 'Bohužiaľ!'; -$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo nebolo schopné zmeniť Vaše nastavenie na PHP 5.'; -$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Obráďte sa na poskytovateľa Vašeho webhostingu, aby ste zistili, ako môžete zmeniť Vaše nastavenie na PHP 5.'; +$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo nebolo schopné zmeniť Vaše nastavenie na PHP 5.2'; +$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Obráďte sa na poskytovateľa Vašeho webhostingu, aby ste zistili, ako môžete zmeniť Vaše nastavenie na PHP 5.2'; $lang['Hope to see you back soon.'] = 'Veríme, že sa čoskoro uvidíme.'; $lang['Congratulations, Piwigo installation is completed'] = 'Gratulujeme, Piwigo inštalácia je ukončená'; $lang['An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning : database.inc.php must only contain what is in the textarea, no line return or space character)'] = 'Náhradným riešením je skopírovať text z boxu vyššie a vložiť ho do súboru "local/config/database.inc.php" (Upozornenie: súbor database.inc.php môže obsahovať len to, čo je v tomto boxe, žiadne znaky odriadkovania alebo medzery)'; @@ -68,5 +67,4 @@ $lang['Just another Piwigo gallery'] = 'Len iná Piwigo galéria'; $lang['Welcome to my photo gallery'] = 'Vitajte v mojej foto galérii'; $lang['Welcome to your new installation of Piwigo!'] = 'Vitajte vo Vašej novej inštalácii Piwigo!'; $lang['Don\'t hesitate to consult our forums for any help : %s'] = 'Neváhajte konzultovať na našom fóre každú pomoc: %s'; -$lang['localhost or other, supplied by your host provider'] = 'localhost alebo iné, obdržíte od poskytovateľa hostu'; -?> \ No newline at end of file +$lang['localhost or other, supplied by your host provider'] = 'localhost alebo iné, obdržíte od poskytovateľa hostu'; \ No newline at end of file diff --git a/sources/language/sk_SK/upgrade.lang.php b/sources/language/sk_SK/upgrade.lang.php index 21f2122..815883b 100644 --- a/sources/language/sk_SK/upgrade.lang.php +++ b/sources/language/sk_SK/upgrade.lang.php @@ -5,7 +5,7 @@ // +-----------------------------------------------------------------------+ // | Copyright(C) 2009 Pavel Budka & Petr Jirsa http://pbudka.co.cc | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/language/sl_SI/admin.lang.php b/sources/language/sl_SI/admin.lang.php index baa6284..778a00e 100644 --- a/sources/language/sl_SI/admin.lang.php +++ b/sources/language/sl_SI/admin.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -370,7 +370,7 @@ $lang['Forbidden'] = 'Prepovedano'; $lang['Form'] = 'Obrazec'; $lang['GD library is missing'] = 'GD knjižnica ni nameščena'; $lang['GD version'] = 'GD različica'; -$lang['Gallery title'] = 'Naslov galerije'; +$lang['Gallery title'] = 'Ime galerije'; $lang['Gallery unlocked'] = 'Galerija je odklenjena'; $lang['Generate multiple size images'] = 'Ustvari slike različnih velikosti'; $lang['Give write access (chmod 777) to "%s" directory at the root of your Piwigo installation'] = 'Omogoči dovoljenje za pisanje (chmod 777) na "%s" mapi v korenu vaše Piwigo namestitve'; @@ -402,7 +402,7 @@ $lang['Dissociate from album'] = 'Loči od albuma'; $lang['Dissociated'] = 'Loči'; $lang['Do you want to activate anyway?'] = 'Ĺ˝elite vseeno aktivirati?'; $lang['Does not represent'] = 'Ni sličica za'; -$lang['Dump Database'] = 'Odloži podatkovno bazo'; +$lang['Dump Database'] = 'Shrani bazo podatkov'; $lang['Duplicate'] = 'Podvoji'; $lang['Duplicate selected tags'] = 'Podvoji izbrane oznake'; $lang['Duplicates'] = 'Podvojeni'; @@ -606,7 +606,7 @@ $lang['You cannot delete your account'] = 'Vašega računa ne morete izbrisati.' $lang['You cannot move an album in its own sub album'] = 'Albuma ne morete premakniti v njegov pod-album'; $lang['You have %d orphan tags: %s.'] = 'Imate %d osirotelih oznak: %s.'; $lang['You have specified $conf[\'order_by\'] in your local configuration file, this parameter in deprecated, please remove it or rename it into $conf[\'order_by_custom\'] !'] = 'Določili ste $conf[\'order_by\'] v vaši lokalni nastavitveni datoteki. Ta parameter je opuščen zato ga prosimo odstranite ali spremenite v: $conf[\'order_by_custom\'] !'; -$lang['You have subscribed to receiving notifications by mail.'] = 'Naročili ste se na prejemanje novic na e-pošto.'; +$lang['You have subscribed to receiving notifications by mail.'] = 'Naročili ste se na prejemanje obvestil na e-pošto.'; $lang['You have unsubscribed from receiving notifications by mail.'] = 'Odjavili ste obveščanje po e-pošti.'; $lang['You need to confirm deletion'] = 'Izbris morate potrditi'; $lang['You need to upgrade your system to take full advantage of the application else the application will not work correctly, or not at all'] = 'Razmislite o nadgradnji vašega sistema! Le tako boste lahko uporabljali vse možnosti aplikacije. V nasprotnem primeru aplikacija morda ne bo delovala ali ne bo delovala pravilno.'; @@ -627,7 +627,7 @@ $lang['Week starts on'] = 'Teden se začne z'; $lang['Who can see these photos?'] = 'Kdo lahko vidi te slike?'; $lang['Who can see this photo?'] = 'Kdo lahko vidi to sliko?'; $lang['Width'] = 'Širina'; -$lang['With blank value, gallery title will be used'] = 'Če je prazno bo uporabljen naslov galerije'; +$lang['With blank value, gallery title will be used'] = 'Če je prazno bo uporabljeno ime galerije'; $lang['With no album'] = 'Brez albuma'; $lang['With no tag'] = 'Brez oznake'; $lang['User "%s" created with "%s" like password'] = 'Uporabnik "%s" ustvarjen z geslom "%s"'; @@ -650,7 +650,7 @@ $lang['Virtual album added'] = 'Navidezni album dodan'; $lang['Virtual album deleted'] = 'Navidezni album izbrisan'; $lang['Virtual album name'] = 'Ime navideznega albuma'; $lang['Virtual albums to move'] = 'Navidezni album za premikanje'; -$lang['Unable to dump database.'] = 'Ne morem zavreči podatkovne baze'; +$lang['Unable to dump database.'] = 'Ne morem shraniti baze podatkov'; $lang['Uncheck all'] = 'Odznači vse'; $lang['Unknown upload error'] = 'Nepoznana napaka pri nalaganju'; $lang['Unlock gallery'] = 'Odkleni galerijo'; @@ -676,7 +676,7 @@ $lang['Thumbnail'] = 'Sličica'; $lang['Thumbnails generation in progress...'] = 'Ustvarjanje sličic je v teku.....'; $lang['Time'] = 'Čas'; $lang['Time to send mail is limited. Others mails are skipped.'] = 'Čas za pošiljanje pošte je omejen. Ostala pošta je bila prezrta.'; -$lang['Title'] = 'Naslov'; +$lang['Title'] = 'Ime'; $lang['To send ?'] = 'Poslati?'; $lang['To subscribe'] = 'Naročiti se'; $lang['To unsubscribe'] = 'Odjaviti se'; @@ -685,7 +685,7 @@ $lang['Tools'] = 'Orodja'; $lang['Two updates are available'] = 'Na voljo stad ve posodobitvi'; $lang['Type here the author name'] = 'Tu vpišite ime avtorja'; $lang['Type here the name of the new group'] = 'Tu vpišite ime nove skupine'; -$lang['Type here the title'] = 'Tu vpišite naslov'; +$lang['Type here the title'] = 'Tu vpišite ime galerije'; $lang['Type in a search term'] = 'Vpišite iskalni niz'; $lang['Unable to check for upgrade.'] = 'Ne morem preveriti za nadgradnjo'; $lang['This name is already used by another group.'] = 'To ime že uporablja druga skupina'; @@ -732,7 +732,7 @@ $lang['The picture dimensions will be reduced to %dx%d pixels.'] = 'Dimenzija sl $lang['The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form'] = 'Naložena datoteka presega direktivo MAX_FILE_SIZE , ki je bila določena v HTML obrazcu'; $lang['Subscribe'] = 'Naroči se'; $lang['Subscribe %s'] = 'Naroči %s'; -$lang['Subscribe %s to Piwigo Announcements Newsletter'] = 'Naroči %s se na Piwigo Obvestilne novice'; +$lang['Subscribe %s to Piwigo Announcements Newsletter'] = 'Ta poštni naslov: %s naroči na obveščanje o Piwigo novicah'; $lang['Subscribe to notification by mail'] = 'Naroči se na obvestila na e-pošto'; $lang['Subscribe/unsubscribe users'] = 'Naroči/odjavi uporabnike'; $lang['Subscribed'] = 'Naročen'; @@ -872,7 +872,7 @@ $lang['Piwigo version'] = 'Piwigo različica'; $lang['Please check "plugins" folder and sub-folders permissions (CHMOD).'] = 'Prosimo preverite doveljenja za "plugins" direktorij in poddirektorije (chmod)'; $lang['Please select at least two groups'] = 'Prosimo iberite vsaj dve skupini'; $lang['Please wait...'] = 'Prosimo počakajte...'; -$lang['Plugin has been successfully copied'] = 'Ta vtičnik je bil uspešno kopiran.'; +$lang['Plugin has been successfully copied'] = 'Ta vtičnik je bil uspešno nameščen.'; $lang['Plugin list'] = 'Seznam Vtičnikov'; $lang['Plugins'] = 'Vtičniki'; $lang['Plugins which need upgrade'] = 'Vtičniki, ki jih je potrebno nadgraditi'; @@ -970,11 +970,21 @@ $lang['Activate it now'] = 'Aktivirajte zdaj'; $lang['Allow users to add a link to their website'] = 'Dovoli uporabnikom da dodajo povezavo na njihovo spletno stran'; $lang['Empty caddie'] = 'Izprazni košarico'; $lang['Impossible to deactivate the default theme.'] = 'Privzete teme ni možno izključiti'; -$lang['Mail address is mandatory for registration'] = 'e-poštni naslov je obezen ob registraciji'; +$lang['Mail address is mandatory for registration'] = 'e-poštni naslov je obvezen ob registraciji'; $lang['No and unlock sub-albums'] = 'Ne in odkleni pod-albume'; $lang['The settings for the guest are from the %s user'] = 'Nastavitve za gosta so od uporabnika %s'; $lang['based on'] = 'temlji na'; $lang['between %s and %s MB'] = 'med %s in %s MB'; $lang['date & time'] = 'Datum in ura'; $lang['file name'] = 'ime datoteke'; -$lang['width & height'] = 'širina in višina'; \ No newline at end of file +$lang['width & height'] = 'širina in višina'; +$lang['Upload in progress'] = 'Prenos v teku'; +$lang['Delete %d orphan photos'] = 'Izbriši %d osirotele slike'; +$lang['Each email sent will contain its own automatic authentication key on links, valid for %s.'] = 'Vsako poslano e-poštno sporočilo bo vsebovalo lastni, samodejni ključ za preverjanje pristnosti povezave, v trajanju do %s.'; +$lang['Edit user'] = 'Uredi uporabnika'; +$lang['For security reason, authentication keys do not work for administrators.'] = 'Zaradi varnostnih razlogov ključ za preverjanje pristnosti ne deluje za administratorje'; +$lang['No recipient selected'] = 'Ni izbranih prejemnikov'; +$lang['No user is permitted to see this private album'] = 'Noben uporabnik nima dovoljenja za ogled tega zasebnega albuma'; +$lang['Orphans'] = 'Sirote'; +$lang['Recipients'] = 'Prejemniki'; +$lang['Y Repeat'] = 'Y ponavljanje'; \ No newline at end of file diff --git a/sources/language/sl_SI/common.lang.php b/sources/language/sl_SI/common.lang.php index ccb1931..c9c6a4d 100644 --- a/sources/language/sl_SI/common.lang.php +++ b/sources/language/sl_SI/common.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -22,7 +22,7 @@ // +-----------------------------------------------------------------------+ /* Language Name: Slovenšcina [SI] -Version: 2.7.0 +Version: 2.8.2 Language URI: http://piwigo.org/ext/extension_view.php?eid=453 Author: Piwigo team Author URI: http://piwigo.org @@ -423,4 +423,5 @@ $lang['Album name, Z → A'] = 'Ime Albuma, Ž → A'; $lang['Apply on properties'] = 'Uporabi v lastnostih'; $lang['Link: %s'] = 'Povezava: %s'; $lang['Photo description'] = 'Opis slike'; -$lang['Photo title'] = 'Ime slike'; \ No newline at end of file +$lang['Photo title'] = 'Ime slike'; +$lang['Your authentication key is no longer valid.'] = 'Vaš avtorizacijski ključ ni več veljaven.'; \ No newline at end of file diff --git a/sources/language/sl_SI/help/cat_perm.html b/sources/language/sl_SI/help/cat_perm.html new file mode 100644 index 0000000..8691f2e --- /dev/null +++ b/sources/language/sl_SI/help/cat_perm.html @@ -0,0 +1,13 @@ +

    Urejanje dovoljenj za ogled albuma

    + +

    Ta stran je na voljo le za zasebne albume. Tu lahko nastavite +dovoljenja uporabnikom in skupinam, ki imajo dovoljenje za ogled zasebnih albumov.

    + +

    Skupine

    + +

    Tu lahko skupini uporabnikov dovolite ali omejite dostop do trenutnega albuma. S spremembo dovoljenja +skupine, uporabnikom, ki so člani te skupine dovolite ali omejite dostop do albuma.

    + +

    Uporabniki

    + +

    Dovoljenja za dostop do albuma lahko določite tudi vsakemu posameznemu uporabniku. Uporabniku, ki že ima dostop preko skupine lahko tu preko izjem onemogočite dostop do albuma.

    \ No newline at end of file diff --git a/sources/language/sl_SI/help/help_misc.html b/sources/language/sl_SI/help/help_misc.html new file mode 100644 index 0000000..f69be21 --- /dev/null +++ b/sources/language/sl_SI/help/help_misc.html @@ -0,0 +1,9 @@ +

    Ko ste ustvarili svojo galerijo jo lahko nastavite za obiskovalce +

      +
    • Željeni privzeti prikaz v Administracija » Konfiguracija » Možnosti na zavihku Nastavitve gosta
      • +
    • Privzeto preobleko - temo v Administracija » Konfiguracija » Teme
      • +
    • Privzet jezik v Administracija » Konfiguracija » Jeziki
      • +
    + Privzeto, bo vsak nov uporabnik podedoval te lastnosti ob registraciji. +

    +

    V primeru dodatnih vprašanj, vas Piwigo skupnost pozdravlja na svojem forumu.

    \ No newline at end of file diff --git a/sources/language/sl_SI/install.lang.php b/sources/language/sl_SI/install.lang.php index 1b66192..f5e9ff4 100755 --- a/sources/language/sl_SI/install.lang.php +++ b/sources/language/sl_SI/install.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -21,13 +21,13 @@ // | USA. | // +-----------------------------------------------------------------------+ -$lang['PHP 5 is required'] = 'Zahtevan je PHP 5'; +$lang['PHP 5 is required'] = 'Zahtevan je PHP 5.2'; $lang['Password [confirm]'] = 'Geslo [potrdi]'; -$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo bo poskušal preklopiti vaše nastavitve na PHP 5 z ustvarjanjem ali urejanjem .htacceess datoteke'; -$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo ni mogel nastaviti PHP 5.'; +$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo bo poskušal preklopiti vaše nastavitve na PHP 5.2 z ustvarjanjem ali urejanjem .htacceess datoteke'; +$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo ni mogel nastaviti PHP 5.2'; $lang['Sorry!'] = 'Oprostite!'; $lang['Start Install'] = 'Začni namestitev'; -$lang['Try to configure PHP 5'] = 'Poskušam nastaviti PHP 5'; +$lang['Try to configure PHP 5'] = 'Poskušam nastaviti PHP 5.2'; $lang['User'] = 'Uporabnik'; $lang['Visitors will be able to contact site administrator with this mail'] = 'Obiskovalci bodo lahko ta elektronski naslov uporabljali za kontakt s skrbnikom spletne strani '; $lang['Welcome to my photo gallery'] = 'Dobrodošli v moji foto galeriji'; @@ -58,11 +58,10 @@ $lang['user password given by your host provider'] = 'geslo uporabnika pridoblje $lang['verification'] = 'preverjanje'; $lang['webmaster login can\'t contain characters \' or "'] = 'prijavno ime skrbnika ne sme vsebovati znakov \' ali "'; $lang['database tables names will be prefixed with it (enables you to manage better your tables)'] = 'imena tabel v podatkovni bazi bodo imela predpono. (omogoča lažje upravljanje tabel)'; -$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Posvetujte se z vašim ponudnikom gostovanja kako bi lahko sami prešli na zahtevano PHP 5 različico.'; +$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Posvetujte se z vašim ponudnikom gostovanja kako bi lahko sami prešli na zahtevano PHP 5.2 različico.'; $lang['also given by your host provider'] = 'tudi pridobljeno od vašega ponudnika gostovanja'; $lang['Need help ? Ask your question on Piwigo message board.'] = 'Potrebujete dodatno pomoč? Zastavite vprašanje na Piwigo oglasni deski.'; $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'Upoštevajte da lahko sami spremenite nastavitve in nato ponovno zaženete Piwigo.'; $lang['An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning : database.inc.php must only contain what is in the textarea, no line return or space character)'] = 'Druga rešitev je, da kopirate besedilo v polje zgoraj in ga prilepite v datoteko "local/config/database.inc.php" (Opozorilo: database.inc.php mora vsebovati le to kar je v besedilnem polju, brez znakov prehoda v novo vrstico(line return)ali znakov za presledke)'; $lang['Keep it confidential, it enables you to access administration panel'] = 'Varno shranite, omogoča vam dostop do administratorske nadzorne plošče!'; -$lang['localhost or other, supplied by your host provider'] = 'localhost ali drug naslov ki ga imate pri svojem ponudniku gostovanja'; -?> \ No newline at end of file +$lang['localhost or other, supplied by your host provider'] = 'localhost ali drug naslov ki ga imate pri svojem ponudniku gostovanja'; \ No newline at end of file diff --git a/sources/language/sl_SI/upgrade.lang.php b/sources/language/sl_SI/upgrade.lang.php index ec5abab..e226bad 100755 --- a/sources/language/sl_SI/upgrade.lang.php +++ b/sources/language/sl_SI/upgrade.lang.php @@ -1,24 +1,24 @@ release %s (or equivalent).'] = 'Ta stran predlaga, da nadgradite podatkovno bazo vaše Piwigo različice na novejšo različico. Čarovnik nadgradnje je zaznal, da trenutno uporabljate različico %s (ali enakovredno).'; $lang['Upgrade'] = 'Nadgradi'; $lang['Upgrade from version %s to %s'] = 'Nadgradi iz različice %s na različico %s'; -$lang['Upgrade informations'] = 'Informacije nadgradnje'; +$lang['Upgrade informations'] = 'Povzetek posodobitve'; $lang['User permissions and group permissions have been erased'] = 'Dovoljenja uporabnikov in skupin so bila izbrisana'; $lang['You do not have access rights to run upgrade'] = 'Nimate dovoljenja za izvedbo nadgradnje'; $lang['total SQL time'] = 'skupen SQL čas'; @@ -36,5 +36,4 @@ $lang['total upgrade time'] = 'skupen čas nadgradnje'; $lang['In %s, before ?>, insert:'] = 'V %s, pred ?>, vstavi:'; $lang['Only administrator can run upgrade: please sign in below.'] = 'Nadgradnjo lahko opravi le Administrator. Prosimo prijavite se spodaj:'; $lang['As a precaution, following themes have been deactivated. You must check for themes upgrade before reactiving them:'] = 'Kot previdnostni ukrep so sledeče preobleke onemogočene. Preveriti morate posodobitve za te preobleke in jih nato ponovno omogočiti:'; -$lang['All sub-albums of private albums become private'] = 'Vsi pod-albumi zasebnega albuma postanejo zasebni'; -?> \ No newline at end of file +$lang['All sub-albums of private albums become private'] = 'Vsi pod-albumi zasebnega albuma postanejo zasebni'; \ No newline at end of file diff --git a/sources/language/sr_RS/admin.lang.php b/sources/language/sr_RS/admin.lang.php index 9166a5f..b917948 100644 --- a/sources/language/sr_RS/admin.lang.php +++ b/sources/language/sr_RS/admin.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -981,4 +981,13 @@ $lang['based on'] = 'на основу'; $lang['between %s and %s MB'] = 'између %s и %s MB'; $lang['date & time'] = 'датум и време'; $lang['file name'] = 'назив датотеке'; -$lang['width & height'] = 'ширина и висина'; \ No newline at end of file +$lang['width & height'] = 'ширина и висина'; +$lang['Y Repeat'] = 'Понављање по y'; +$lang['No user is permitted to see this private album'] = 'Ниједном кориснику није дозвољено да види овај лични албум'; +$lang['No recipient selected'] = 'Није одабран прималац'; +$lang['Edit user'] = 'Измени корисника'; +$lang['Delete %d orphan photos'] = 'Обриши %d слике без родитеља'; +$lang['Each email sent will contain its own automatic authentication key on links, valid for %s.'] = 'Свако послато е-писмо ће садржати сопствени кључ за пријаву на адресу, важи %s.'; +$lang['For security reason, authentication keys do not work for administrators.'] = 'Из безбедоносних разлога, кључеви за пријаву не раде за администраторе.'; +$lang['Orphans'] = 'Без родитеља'; +$lang['Recipients'] = 'Примаоци'; \ No newline at end of file diff --git a/sources/language/sr_RS/common.lang.php b/sources/language/sr_RS/common.lang.php index d57c231..63633ef 100644 --- a/sources/language/sr_RS/common.lang.php +++ b/sources/language/sr_RS/common.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -22,7 +22,7 @@ // +-----------------------------------------------------------------------+ /* Language Name: Српски [SR] -Version: 2.7.2 +Version: 2.8.2 Language URI: http://piwigo.org/ext/extension_view.php?eid=458 Author: Piwigo team Author URI: http://piwigo.org @@ -426,4 +426,5 @@ $lang['Photo title'] = 'Наслов фотографије'; $lang['Apply on properties'] = 'Примени на особине'; $lang['Album name, A → Z'] = 'Назив албума, А → Ш'; $lang['Album name, Z → A'] = 'Назив албума, Ш → А'; -$lang['Link: %s'] = 'Веза: %s'; \ No newline at end of file +$lang['Link: %s'] = 'Веза: %s'; +$lang['Your authentication key is no longer valid.'] = 'Ваш кључ за проверу идентитета није више важећи.'; \ No newline at end of file diff --git a/sources/language/sr_RS/index.php b/sources/language/sr_RS/index.php index c8de97f..0b96c3e 100644 --- a/sources/language/sr_RS/index.php +++ b/sources/language/sr_RS/index.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/language/sr_RS/install.lang.php b/sources/language/sr_RS/install.lang.php index 744ea55..3f4750f 100644 --- a/sources/language/sr_RS/install.lang.php +++ b/sources/language/sr_RS/install.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -46,14 +46,14 @@ $lang['Password [confirm]'] = 'Лозинка[потврди]'; $lang['verification'] = 'Провера'; $lang['Need help ? Ask your question on Piwigo message board.'] = 'Потребна Вам је помоц? Питајте на Piwigo табли за поруке.'; $lang['Visitors will be able to contact site administrator with this mail'] = 'Посетиоци ће бити у могућности да са ове електронске адресе контактирају администратора странице'; -$lang['PHP 5 is required'] = 'PHP 5 је неопходан'; +$lang['PHP 5 is required'] = 'PHP 5.2 је неопходан'; $lang['It appears your webhost is currently running PHP %s.'] = 'Изгледа да Ваш сервер тренутно користи PHP %s.'; -$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'ПиВиГо може покушати да промени Вашу конфигурацију на PHP 5 формирањем или мењањем .htaccess датотеке.'; +$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'ПиВиГо може покушати да промени Вашу конфигурацију на PHP 5.2 формирањем или мењањем .htaccess датотеке.'; $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'Имајте у виду да можете сами изменити Вашу конфигурацију рестартовати Piwigo после тога.'; -$lang['Try to configure PHP 5'] = 'Покушајте да подестите PHP 5'; +$lang['Try to configure PHP 5'] = 'Покушајте да подестите PHP 5.2'; $lang['Sorry!'] = 'Жао нам је!'; -$lang['Piwigo was not able to configure PHP 5.'] = 'ПиВиГо није успео да подеси PHP 5.'; -$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Требало би да се обартите подршци Вашег хостинг провајдера за упутство како да промените на PHP 5 сами.'; +$lang['Piwigo was not able to configure PHP 5.'] = 'ПиВиГо није успео да подеси PHP 5.2'; +$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Требало би да се обартите подршци Вашег хостинг провајдера за упутство како да промените на PHP 5.2 сами.'; $lang['Hope to see you back soon.'] = 'Надамо се да се ускоро поново видимо.'; $lang['Congratulations, Piwigo installation is completed'] = 'Честитамо, ПиВиГо инсталација је завршена'; $lang['An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning : database.inc.php must only contain what is in the textarea, no line return or space character)'] = 'Алтернативно решење је да копирате текст из кутије изнад и налепите у датотеку "local/config/database.inc.php" (Упозорење : database.inc.php мора садржати само текст из кутије, без линије или празних карактера)'; diff --git a/sources/language/sr_RS/upgrade.lang.php b/sources/language/sr_RS/upgrade.lang.php index b3336cd..b9ed6d7 100644 --- a/sources/language/sr_RS/upgrade.lang.php +++ b/sources/language/sr_RS/upgrade.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/language/sv_SE/admin.lang.php b/sources/language/sv_SE/admin.lang.php index 0f43a4b..08d1b2a 100644 --- a/sources/language/sv_SE/admin.lang.php +++ b/sources/language/sv_SE/admin.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -981,4 +981,13 @@ $lang['width & height'] = 'bredd & höjd'; $lang['Activate it now'] = 'Aktivera den nu'; $lang['Allow users to add a link to their website'] = 'Tillåter användare att länka till sin egen hemsida'; $lang['Empty caddie'] = 'Töm korgen'; -$lang['Impossible to deactivate the default theme.'] = 'Det går inte att inaktivera standardtema. Gör först ett annat tema till standardtema.'; \ No newline at end of file +$lang['Impossible to deactivate the default theme.'] = 'Det går inte att inaktivera standardtema. Gör först ett annat tema till standardtema.'; +$lang['Y Repeat'] = 'Y Upprepa'; +$lang['Recipients'] = 'Mottagare'; +$lang['Orphans'] = 'Övergivet'; +$lang['No user is permitted to see this private album'] = 'Ingen användare tillåts se detta privata album'; +$lang['No recipient selected'] = 'Ingen mottagare vald'; +$lang['For security reason, authentication keys do not work for administrators.'] = 'Av säkerhetsskäl fungerar inte autentiseringsnycklar för administratörer.'; +$lang['Edit user'] = 'Ändra användare'; +$lang['Each email sent will contain its own automatic authentication key on links, valid for %s.'] = 'Varje epost som sänds kommer att innehålla sina egna automatiska autentiseringsnycklar som länkar, giltiga i %s.'; +$lang['Delete %d orphan photos'] = 'Radera %d övergivna foton'; \ No newline at end of file diff --git a/sources/language/sv_SE/common.lang.php b/sources/language/sv_SE/common.lang.php index fdb82c4..c246893 100644 --- a/sources/language/sv_SE/common.lang.php +++ b/sources/language/sv_SE/common.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -22,7 +22,7 @@ // +-----------------------------------------------------------------------+ /* Language Name: Svenska [SE] -Version: 2.7.1 +Version: 2.8.2 Language URI: http://piwigo.org/ext/extension_view.php?eid=451 Author: Piwigo team Author URI: http://piwigo.org @@ -425,4 +425,5 @@ $lang['Photo description'] = 'Fotots beskrivning'; $lang['Photo title'] = 'Fotots titel'; $lang['Album name, A → Z'] = 'Albumnam, A → Ö'; $lang['Album name, Z → A'] = 'Albumnamn, Ö → A'; -$lang['Link: %s'] = 'Länk: %s'; \ No newline at end of file +$lang['Link: %s'] = 'Länk: %s'; +$lang['Your authentication key is no longer valid.'] = 'Din autenticeringsnyckel är inte längre giltig.'; \ No newline at end of file diff --git a/sources/language/sv_SE/help/index.php b/sources/language/sv_SE/help/index.php index c8de97f..0b96c3e 100644 --- a/sources/language/sv_SE/help/index.php +++ b/sources/language/sv_SE/help/index.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/language/sv_SE/help/photos_add_ftp.html b/sources/language/sv_SE/help/photos_add_ftp.html index 028058f..9486556 100755 --- a/sources/language/sv_SE/help/photos_add_ftp.html +++ b/sources/language/sv_SE/help/photos_add_ftp.html @@ -43,11 +43,20 @@ galleries |-- video-from-plane.avi +-- pwg_representative +-- video-from-plane.jpg ++-- photoshoot + |-- img0001.jpg + |-- img0002.jpg + +-- pwg_format + |-- img0001.cr2 + |-- img0001.cmyk.jpg + |-- img0001.zip + |-- img0002.cr2 + +-- img0002.cmyk.jpg
    • -
  • Förutom "pwg_representative" (se förklaring nedan) så skapar varje katalog i "galleries" ett eget album. Det finns ingen begränsning på hur många under album som går att skapa.
    • +
  • Förutom "pwg_representative" and "pwg_format" (se förklaring nedan) så skapar varje katalog i "galleries" ett eget album. Det finns ingen begränsning på hur många under album som går att skapa.
  • >I grunden representeras varje objekt av en fil. En fil kan vara ett Piwigo objekt om filändelsen är med i file_ext @@ -60,6 +69,8 @@ galleries Du kan om du vill associera en "thumbnail" fil som visar istället för ikonen. (se video.avi i exemplet ovan).
    • +
  • Multiple formats: a photo can be available in several formats. In this example, we have 3 additional formats for img0001.jpg. You can activate this feature with $conf['enable_formats'] = true; in your local configuration and define a list of formats, like $conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');
    • +
  • Varning: Katalog och filnamn får bara bestå av bokstäver och dessa tecken "-", "_" or ".". Inga mellanslag eller accentuerade bokstäver.
    • @@ -68,4 +79,4 @@ galleries Synkronisera - \ No newline at end of file + diff --git a/sources/language/sv_SE/install.lang.php b/sources/language/sv_SE/install.lang.php index 10f5ecc..9013244 100644 --- a/sources/language/sv_SE/install.lang.php +++ b/sources/language/sv_SE/install.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -46,14 +46,14 @@ $lang['Password [confirm]'] = 'Lösenord [bekräfta]'; $lang['verification'] = 'verifiering'; $lang['Need help ? Ask your question on Piwigo message board.'] = 'Behöver du hjälp? Ställ din fråga på Piwigo message board.'; $lang['Visitors will be able to contact site administrator with this mail'] = 'Besökare kommer att kunna kontakta sidans administratör med denna e-mail adress'; -$lang['PHP 5 is required'] = 'PHP 5 krävs'; +$lang['PHP 5 is required'] = 'PHP 5.2 krävs'; $lang['It appears your webhost is currently running PHP %s.'] = 'Ditt webbhotell använder just nu PHP %s.'; -$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo kan kanske komma att ändra dina inställningar i PHP 5 genom att skapa eller ändra en .htaccess fil.'; +$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo kan kanske komma att ändra dina inställningar i PHP 5.2 genom att skapa eller ändra en .htaccess fil.'; $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'Notera att du kan ändra dina inställningar förutsatt att du startar om Piwigo efteråt.'; -$lang['Try to configure PHP 5'] = 'Försök att konfigurera PHP 5'; +$lang['Try to configure PHP 5'] = 'Försök att konfigurera PHP 5.2'; $lang['Sorry!'] = 'Ursäkta!'; -$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo kunde inte konfigurera PHP 5.'; -$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Vi rekomenderar att du kontaktar leverantören för ditt webbhotell för att se hur du kan ändra till PHP 5.'; +$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo kunde inte konfigurera PHP 5.2'; +$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Vi rekomenderar att du kontaktar leverantören för ditt webbhotell för att se hur du kan ändra till PHP 5.2'; $lang['Hope to see you back soon.'] = 'Välkommen tillbaka snart igen.'; $lang['Congratulations, Piwigo installation is completed'] = 'Gratulerar, Piwigo installationen är klar'; $lang['An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning : database.inc.php must only contain what is in the textarea, no line return or space character)'] = 'En alternativ lösning är att kopiera texten ovan och klistra in i filen "local/config/database.inc.php" (Varning : database.inc.php får enbart innehålla texten från textarean, inga radbrytare eller mellanrum)'; @@ -64,5 +64,4 @@ $lang['Just another Piwigo gallery'] = 'Ännu ett Piwigo galleri'; $lang['Welcome to my photo gallery'] = 'Välkommen till mitt fotogalleri'; $lang['Welcome to your new installation of Piwigo!'] = 'Välkomment till din nya installation av Piwigo!'; $lang['Don\'t hesitate to consult our forums for any help : %s'] = 'Tveka inte att kontakta våra forum för hjälp: %s'; -$lang['localhost or other, supplied by your host provider'] = 'localhost eller det värdnams som du valt eller tilldelats av din webhotells leverantör/server'; -?> \ No newline at end of file +$lang['localhost or other, supplied by your host provider'] = 'localhost eller det värdnams som du valt eller tilldelats av din webhotells leverantör/server'; \ No newline at end of file diff --git a/sources/language/sv_SE/upgrade.lang.php b/sources/language/sv_SE/upgrade.lang.php index 0d698dd..036adff 100644 --- a/sources/language/sv_SE/upgrade.lang.php +++ b/sources/language/sv_SE/upgrade.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -30,8 +30,8 @@ $lang['Statistics'] = 'Statistik'; $lang['total upgrade time'] = 'total uppgraderings tid'; $lang['total SQL time'] = 'Total SQL tid'; $lang['SQL queries'] = 'SQL-frågor'; -$lang['Upgrade informations'] = 'Uppgraderings information'; -$lang['Perform a maintenance check in [Administration>Tools>Maintenance] if you encounter any problem.'] = 'Gör en underhållskontroll i mynyn [Administration> Verktyg> Underhåll] om du stöter på några problem. .'; +$lang['Upgrade informations'] = 'Uppgraderingsinformation'; +$lang['Perform a maintenance check in [Administration>Tools>Maintenance] if you encounter any problem.'] = 'Gör en underhållskontroll i menyn [Administration> Verktyg> Underhåll] om du stöter på några problem.'; $lang['As a precaution, following plugins have been deactivated. You must check for plugins upgrade before reactiving them:'] = 'Som en försiktighetsåtgärd, har följande insticksmoduler avaktiverats, Du måste kontrollera alla plugins uppgraderingar före återaktivering av dem:'; $lang['Only administrator can run upgrade: please sign in below.'] = 'Endast en administratör kan köra uppgraderingen: Logga in nedan.'; $lang['You do not have access rights to run upgrade'] = 'Du har inte behörighet att köra uppgradering'; @@ -40,5 +40,3 @@ $lang['User permissions and group permissions have been erased'] = 'Användare o $lang['Only thumbnails prefix and webmaster mail address have been saved from previous configuration'] = 'miniatyrbilder Endast prefix och webmaster postadress har sparats från tidigare konfiguration'; $lang['In %s, before ?>, insert:'] = 'I %s, innan ?>, infoga:'; $lang['As a precaution, following themes have been deactivated. You must check for themes upgrade before reactiving them:'] = 'Som en försiktighetsåtgärd, har följande teman har avaktiverats. Du måste kolla tema uppgraderingar innan du aktivera dem:'; - -?> \ No newline at end of file diff --git a/sources/language/ta_IN/admin.lang.php b/sources/language/ta_IN/admin.lang.php index 40546dd..cb7ad31 100755 --- a/sources/language/ta_IN/admin.lang.php +++ b/sources/language/ta_IN/admin.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/language/ta_IN/common.lang.php b/sources/language/ta_IN/common.lang.php index ca3d4c0..9159a7a 100644 --- a/sources/language/ta_IN/common.lang.php +++ b/sources/language/ta_IN/common.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -22,7 +22,7 @@ // +-----------------------------------------------------------------------+ /* Language Name: தமிழ் [IN] -Version: 2.7.0 +Version: 2.8.2 Language URI: http://piwigo.org/ext/extension_view.php?eid=638 Author: Piwigo team Author URI: http://piwigo.org diff --git a/sources/language/ta_IN/install.lang.php b/sources/language/ta_IN/install.lang.php index 6b24e74..286cb0b 100755 --- a/sources/language/ta_IN/install.lang.php +++ b/sources/language/ta_IN/install.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -48,7 +48,7 @@ $lang['localhost or other, supplied by your host provider'] = 'localhost அல $lang['please enter your password again'] = 'தயவுசெய்து மறுபடியும் உங்களுடைய கடவுச்சொல்லை உள்ளிடவும்'; $lang['Don\'t hesitate to consult our forums for any help : %s'] = 'ஆலோசனை தயங்க வேண்டாம் நம்முடைய கருத்துக்களம் எந்தவொரு உதவிக்கு.:% s'; -$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'நீங்கள் புரவன் வழங்குநரிடம் ஆதரவு பார்க்கவும் மற்றும் பார்க்க வேண்டும் எப்படி நீங்கள் PHP 5 மூலம் மாற்றலாம்.'; +$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'நீங்கள் புரவன் வழங்குநரிடம் ஆதரவு பார்க்கவும் மற்றும் பார்க்க வேண்டும் எப்படி நீங்கள் PHP 5.2 மூலம் மாற்றலாம்.'; $lang['You can download the config file and upload it to local/config directory of your installation.'] = 'நீங்கள் கட்டமைப்பு கோப்பினை பதிவிறக்கம் செய்யலாம் மற்றும் பதிவேற்றலாம் அது உங்களுடைய local/config நிறுவலின் கோப்பகத்தில்'; $lang['also given by your host provider'] = 'மேலும் வழங்கப்பட்டஉங்களுடைய புரவன் வழங்குநரிடம்'; @@ -58,15 +58,14 @@ $lang['Welcome to your new installation of Piwigo!'] = 'வரவேற்கி உங்களுடைய புதிய Piwigo நிறுவல்! செய்ய'; $lang['Welcome to my photo gallery'] = 'வரவேற்கிறேன் என்னுடைய புகைப்படம் கேலரிக்கு'; -$lang['Try to configure PHP 5'] = 'PHP 5 கட்டமைக்க முயற்சிக்கவும்'; +$lang['Try to configure PHP 5'] = 'PHP 5.2 கட்டமைக்க முயற்சிக்கவும்'; $lang['Visitors will be able to contact site administrator with this mail'] = 'பார்வையாளர்கள் இந்த மின்னஞ்சலை பயன்படுத்தி தளத்தின் நிர்வாகியை தொடர்புகொள்ளவும்'; $lang['User'] = 'பயனர்'; $lang['Sorry!'] = 'வருந்துகிறேன்!'; $lang['Start Install'] = 'நிறுவலை தொடங்கு'; $lang['Password ']['confirm'] = 'கடவுச்சொல்லை [உறுதிப்படுத்தவும்].'; -$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo PHP 5 கட்டமைக்க முடியவில்லை'; +$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo PHP 5.2 கட்டமைக்க முடியவில்லை'; $lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo முயற்சி செய்யலாம் -ஒரு. htaccess கோப்பு உருவாக்குவதில் அல்லது மாற்றியமைப்பதன் மூலம் PHP 5 உங்கள் கட்டமைப்பு மாற'; -$lang['PHP 5 is required'] = 'PHP 5 தேவைப்படுகிறது'; -$lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'குறிப்பு நீங்களே உங்கள் கட்டமைப்பை மாற்ற செய்யலாம், மேலும் Piwigo மீண்டும் துவக்கவும்'; -?> \ No newline at end of file +ஒரு. htaccess கோப்பு உருவாக்குவதில் அல்லது மாற்றியமைப்பதன் மூலம் PHP 5.2 உங்கள் கட்டமைப்பு மாற'; +$lang['PHP 5 is required'] = 'PHP 5.2 தேவைப்படுகிறது'; +$lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'குறிப்பு நீங்களே உங்கள் கட்டமைப்பை மாற்ற செய்யலாம், மேலும் Piwigo மீண்டும் துவக்கவும்'; \ No newline at end of file diff --git a/sources/language/ta_IN/upgrade.lang.php b/sources/language/ta_IN/upgrade.lang.php index 3b3f844..15de809 100755 --- a/sources/language/ta_IN/upgrade.lang.php +++ b/sources/language/ta_IN/upgrade.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/language/th_TH/admin.lang.php b/sources/language/th_TH/admin.lang.php index 33d9dbf..75acc89 100644 --- a/sources/language/th_TH/admin.lang.php +++ b/sources/language/th_TH/admin.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -21,9 +21,6 @@ // | USA. | // +-----------------------------------------------------------------------+ - - - $lang[' and %d virtual'] = " และ %d"; $lang[' and %d virtuals'] = " และ %d"; $lang['%d album including'] = "%d อัลบั้มที่กำลังรวม"; @@ -959,4 +956,39 @@ $lang['Password updated'] = 'อัพเดตรหัสผ่าน'; $lang['Update user'] = 'อัพเดตผู้ใช้'; $lang['Upload in progress'] = 'การอัปโหลดอยู่ในระหว่างดำเนินการ'; $lang['Activate it now'] = 'เปิดใช้งานตอนนี้'; -$lang['Mail theme'] = 'รูปแบบธีมอีเมล'; \ No newline at end of file +$lang['Mail theme'] = 'รูปแบบธีมอีเมล'; +$lang['file name'] = 'ชื่อไฟล์'; +$lang['date & time'] = 'วันที่ และ เวลา'; +$lang['based on'] = 'พื้นฐานระบบรันบน'; +$lang['Impossible to deactivate the default theme.'] = 'เป็นไปไม่ได้ที่จะยกเลิกการใช้งานรูปแบบเริ่มต้น'; +$lang['Mail address is mandatory for registration'] = 'อีเมลนี้มีผลบังคับใช้สำหรับการลงทะเบียน'; +$lang['No and unlock sub-albums'] = 'ไม่มีและปลดล็อคอัลบั้มย่อย'; +$lang['No user selected of %d users'] = 'ไม่มีผู้ใช้งานที่ถูกเลือก %d ผู้ใช้งาน'; +$lang['No user selected, no action possible.'] = 'ไม่มีผู้ใช้งานที่ถูกเลือก, ไม่มีการดำเนินการใดที่เป็นไปได้'; +$lang['Registered on %s, %s.'] = 'ลงทะเบียนเมื่อ on %s, %s.'; +$lang['Select at least one tag'] = 'เลือกอย่างน้อ 1 แท็ก'; +$lang['The settings for the guest are from the %s user'] = 'การตั้งค่าสำหรับผู้มาเยี่ยมชม %s ผู้ใช้งาน'; +$lang['between %s and %s MB'] = 'ระหว่าง %s และ %s MB'; +$lang['on the %d selected users'] = 'จำนวน %d ผู้ใช้งานที่ถูกเลือก'; +$lang['No matching user found'] = 'ไม่ตรงกับผู้ใช้งานที่พบ'; +$lang['Empty caddie'] = 'ล้างแคดดี้'; +$lang['width & height'] = 'กว้าง & สูง'; +$lang['%d of %d users selected'] = 'ผู้ใช้งานจำนวน %d จาก %d คน ที่ถูกเลือก'; +$lang['User %s added'] = 'ผู้ใช้ %s ได้ถูกเพิ่ม'; +$lang['User %s updated'] = 'ผู้ใช้ %s ได้ถูกอัพเดต'; +$lang['Users modified'] = 'ผู้ใช้ได้รับการปรับปรุงแล้ว'; +$lang['Showing %s to %s of %s users'] = 'กำลังแสดง %s ถึง %s จาก %s ผู้ใช้งาน'; +$lang['Show %s users'] = 'แสดง %s ผู้ใช้งาน'; +$lang['Last visit on %s, %s.'] = 'เข้าเยี่ยมชมล่าสุดเมื่อ %s, %s.'; +$lang['Allow users to add a link to their website'] = 'อนุญาตให้ผู้ใช้งานเพิ่มลิ้งค์ที่เชื่อมโยงไปยังเว็บไซต์ของเขาเอง'; +$lang['All %d users are selected'] = 'ทั้งหมด %d คนที่ถูกเลือก'; +$lang['(filtered from %s total users)'] = '(ได้ถูกกรองจาก %s ผู้ใช้งานทั้งหมด)'; +$lang['Edit user'] = 'แก้ไขผู้ใช้งาน'; +$lang['No recipient selected'] = 'ไม่มีผู้รับที่คุณเลือก'; +$lang['No user is permitted to see this private album'] = 'ผู้ใช้ไม่ได้รับอนุญาตให้ดูอัลบั้มส่วนตัวนี้'; +$lang['Recipients'] = 'ผู้รับ'; +$lang['Y Repeat'] = 'ทำซ้ำในแนวตั้ง'; +$lang['Delete %d orphan photos'] = 'ลบ %d รูปออร์แฟนส์'; +$lang['Each email sent will contain its own automatic authentication key on links, valid for %s.'] = 'แต่ละอีเมลที่ส่งจะมีการตรวจสอบที่สำคัญของตัวเองโดยอัตโนมัติในการเชื่อมโยงที่ถูกต้อง,สำหรับ %s.'; +$lang['For security reason, authentication keys do not work for administrators.'] = 'ด้วยเหตุผลด้านความปลอดภัยปุ่มตรวจสอบไม่ทำงานสำหรับผู้ดูแลระบบ'; +$lang['Orphans'] = 'ออร์แฟนส์'; \ No newline at end of file diff --git a/sources/language/th_TH/common.lang.php b/sources/language/th_TH/common.lang.php index 1cb9f12..b7cd6f1 100644 --- a/sources/language/th_TH/common.lang.php +++ b/sources/language/th_TH/common.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -22,7 +22,7 @@ // +-----------------------------------------------------------------------+ /* Language Name: ภาษาไทย [TH] -Version: 2.7.1 +Version: 2.8.2 Language URI: http://piwigo.org/ext/extension_view.php?eid=519 Author: Piwigo team Author URI: http://piwigo.org @@ -35,7 +35,6 @@ $lang_info['code'] = "th"; $lang_info['plupload_code'] = "th_TH"; $lang_info['zero_plural'] = "1"; - $lang['%d album updated'] = '%d อัลบั้มได้อัพเดตแล้ว'; $lang['%d albums updated'] = '%d อัลบั้มที่ได้อัพเดตแล้ว'; $lang['%d comment to validate'] = "%d ความเห็นรอการตรวจสอบ"; @@ -426,4 +425,5 @@ $lang['Apply on properties'] = 'นำไปใช้กับคุณสมบ $lang['Link: %s'] = 'ลิ้งค์: %s'; $lang['No results for'] = 'ไม่มีผลลัพธ์การค้นหาสำหรับ'; $lang['Photo description'] = 'รายละเอียดรูปภาพ'; -$lang['Photo title'] = 'ชื่อรูปภาพ'; \ No newline at end of file +$lang['Photo title'] = 'ชื่อรูปภาพ'; +$lang['Your authentication key is no longer valid.'] = 'รหัสในการตรวจสอบสิทธิ์ของคุณไม่ถูกต้อง'; diff --git a/sources/language/th_TH/install.lang.php b/sources/language/th_TH/install.lang.php index 2f3d477..f9fc868 100644 --- a/sources/language/th_TH/install.lang.php +++ b/sources/language/th_TH/install.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -46,14 +46,14 @@ $lang['Password [confirm]'] = "รหัสผ่าน [ยืนยัน]"; $lang['verification'] = "การยืนยัน"; $lang['Need help ? Ask your question on Piwigo message board.'] = "ต้องการความช่วยเหลือ? โปรดถามคำถามไว้ได้ที่ บอร์ดข้อความของ Piwigo."; $lang['Visitors will be able to contact site administrator with this mail'] = "ผู้เยี่ยมชมจะสามารถที่จะใช้อีเมลนี้ เพื่อติดต่อกับผู้ดูแลระบบได้"; -$lang['PHP 5 is required'] = "PHP 5 จำเป็นต้องมี"; +$lang['PHP 5 is required'] = 'PHP 5.2 จำเป็นต้องมี'; $lang['It appears your webhost is currently running PHP %s.'] = "มันจะแสดงบนเวิร์ฟเวอร์ที่คุณใช้งานอยู่ ซึ่งคุณใช้งานอยู่บน PHP %s."; -$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = "Piwigo อาจจะลองปรับการตั้งค่าของคุณไปยัง PHP 5 โดยการสร้างหรือแก้ไขปรับแต่งไฟล์ .htaccess."; +$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo อาจจะลองปรับการตั้งค่าของคุณไปยัง PHP 5.2 โดยการสร้างหรือแก้ไขปรับแต่งไฟล์ .htaccess.'; $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = "จำไว้ว่า คุณสามารถเปลี่ยนแปลงการตั้งค่าในภายหลังได้ด้วยตนเอง."; -$lang['Try to configure PHP 5'] = "ลองตั้งค่า PHP 5 ใหม่"; +$lang['Try to configure PHP 5'] = 'ลองตั้งค่า PHP 5.2 ใหม่'; $lang['Sorry!'] = "เสียใจ!"; -$lang['Piwigo was not able to configure PHP 5.'] = "Piwigo ไม่สามารถตั้งค่า PHP 5. ได้"; -$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = "คุณควรติดต่อไปยังผู้ให้บริการเซิร์ฟเวอร์ของคุณเพื่อสอบถามว่า เซิร์ฟเวอร์ดังกล่าวนี้สนับสนุนการทำงานของ PHP 5 หรือว่าคุณสามารถสลับไปใช้งาน PHP 5 ด้วยตนเอง ได้หรือไม่อย่างไร."; +$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo ไม่สามารถตั้งค่า PHP 5.2 ได้'; +$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'คุณควรติดต่อไปยังผู้ให้บริการเซิร์ฟเวอร์ของคุณเพื่อสอบถามว่า เซิร์ฟเวอร์ดังกล่าวนี้สนับสนุนการทำงานของ PHP 5.2 หรือว่าคุณสามารถสลับไปใช้งาน PHP 5 ด้วยตนเอง ได้หรือไม่อย่างไร.'; $lang['Hope to see you back soon.'] = "หวังว่าจะได้เจอคุณเร็วๆ นี้."; $lang['Congratulations, Piwigo installation is completed'] = 'ยินดีด้วย, การติดตั้ง Piwigo ได้ดำเนินการเสร็จเรียบร้อยแล้ว'; $lang['An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning : database.inc.php must only contain what is in the textarea, no line return or space character)'] = 'คัดลอกข้อความในกล่องข้อความด้านล่าง เพื่อนำไปวางในไฟล์ "local/config/database.inc.php" (ข้อควรระวัง : ไฟล์ database.inc.php จะต้องเป็นข้อความที่ได้คัดลอกจากภายในกล่องข้อความเท่านั้น, จะต้องไม่มีบรรทัดเกิน หรืออักขระว่าง)'; @@ -64,5 +64,4 @@ $lang['Just another Piwigo gallery'] = 'เพียงแค่ Piwigo แก $lang['Welcome to my photo gallery'] = 'ยินดีต้อนรับสู่แกลลอรี่รูปภาพของฉัน'; $lang['Don\'t hesitate to consult our forums for any help : %s'] = 'อย่าลังเลที่จะปรึกษาหรือโพสคำถามในฟอรั่มของเรา เพื่อขอความช่วยเหลือใดๆ :%s'; $lang['Welcome to your new installation of Piwigo!'] = 'ยินดีต้อนรับสู่การติดตั้งใหม่ของ Piwigo!'; -$lang['localhost or other, supplied by your host provider'] = 'localhost หรืออื่น ๆ ที่จัดทำโดยผู้ให้บริการโฮสต์ของคุณ'; -?> \ No newline at end of file +$lang['localhost or other, supplied by your host provider'] = 'localhost หรืออื่น ๆ ที่จัดทำโดยผู้ให้บริการโฮสต์ของคุณ'; \ No newline at end of file diff --git a/sources/language/th_TH/upgrade.lang.php b/sources/language/th_TH/upgrade.lang.php index d7c538d..31743e6 100644 --- a/sources/language/th_TH/upgrade.lang.php +++ b/sources/language/th_TH/upgrade.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/language/tr_TR/admin.lang.php b/sources/language/tr_TR/admin.lang.php index f13af7c..a62575d 100644 --- a/sources/language/tr_TR/admin.lang.php +++ b/sources/language/tr_TR/admin.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/language/tr_TR/common.lang.php b/sources/language/tr_TR/common.lang.php index aaf6d13..10b5ee2 100644 --- a/sources/language/tr_TR/common.lang.php +++ b/sources/language/tr_TR/common.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -22,7 +22,7 @@ // +-----------------------------------------------------------------------+ /* Language Name: Türkçe [TR] -Version: 2.7.0 +Version: 2.8.2 Language URI: http://piwigo.org/ext/extension_view.php?eid=436 Author: Piwigo team Author URI: http://piwigo.org @@ -425,4 +425,5 @@ $lang['Apply on properties'] = 'Niteliklerine uygula'; $lang['Album name, A → Z'] = 'Albüm adı, A → Z'; $lang['Album name, Z → A'] = ' Albüm adı, Z → A'; -$lang['Link: %s'] = 'Bağlantı: %s'; \ No newline at end of file +$lang['Link: %s'] = 'Bağlantı: %s'; +$lang['Your authentication key is no longer valid.'] = 'Kimlik doğrulama anahtarınız artık geçerli değil.'; \ No newline at end of file diff --git a/sources/language/tr_TR/help/photos_add_ftp.html b/sources/language/tr_TR/help/photos_add_ftp.html index fdb96cd..78048e5 100755 --- a/sources/language/tr_TR/help/photos_add_ftp.html +++ b/sources/language/tr_TR/help/photos_add_ftp.html @@ -41,11 +41,20 @@ galleries |-- video-from-plane.avi +-- pwg_representative +-- video-from-plane.jpg ++-- photoshoot + |-- img0001.jpg + |-- img0002.jpg + +-- pwg_format + |-- img0001.cr2 + |-- img0001.cmyk.jpg + |-- img0001.zip + |-- img0002.cr2 + +-- img0002.cmyk.jpg -
  • Except for "pwg_representative" (see explanations below), each directory under "galleries" produces a album. There is no limit on deepness.
    • +
  • Except for "pwg_representative" and "pwg_format" (see explanations below), each directory under "galleries" produces a album. There is no limit on deepness.
  • Basically, an element is represented by a file. A file can be a Piwigo element if its extension is among file_ext @@ -54,10 +63,12 @@ galleries be a picture if its extension is among picture_ext configuration parameter possibilities.
    • -
  • No photo elements (video, sounds, file texts, whatever you want...) are represented by default by an icon corresponding to the filename +
  • Non photo elements (video, sounds, file texts, whatever you want...) are represented by default by an icon corresponding to the filename extension. Optionally, you can associate a thumbnail and a representative file (see video.avi in the example above).
    • +
  • Multiple formats: a photo can be available in several formats. In this example, we have 3 additional formats for img0001.jpg. You can activate this feature with $conf['enable_formats'] = true; in your local configuration and define a list of formats, like $conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');
    • +
  • Warning: the name of directories and files must contain only letters, figures, "-", "_" or ".". No blank space, nor accentuated characters.
  • Once photos are correctly placed in the @@ -65,4 +76,4 @@ galleries Synchronize
    • - \ No newline at end of file + diff --git a/sources/language/tr_TR/install.lang.php b/sources/language/tr_TR/install.lang.php index 8589d91..d6b78fd 100644 --- a/sources/language/tr_TR/install.lang.php +++ b/sources/language/tr_TR/install.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -46,14 +46,14 @@ $lang['Password [confirm]'] = 'Şifre [kabul]'; $lang['verification'] = 'doğrulama'; $lang['Need help ? Ask your question on Piwigo message board.'] = 'Yardım ihtiyacınız var? Sorularınızı Piwigo forumda sorabilirsiniz.'; $lang['Visitors will be able to contact site administrator with this mail'] = 'Ziyaretçilerin site yöneticisi ile bağlantıya geçmesi için bu e-posta adresini kullanabileceklerdir.'; -$lang['PHP 5 is required'] = 'PHP 5 gereklidir'; +$lang['PHP 5 is required'] = 'PHP 5.2 gereklidir'; $lang['It appears your webhost is currently running PHP %s.'] = 'Web sunucunuz şu anda PHP %s çalıştırıyor görünüyor.'; -$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo .htaccess dosyası oluşturarak veya değiştirerek ayarlarınızı PHP 5 \'e geçirmeyi deneyebilir.'; +$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo .htaccess dosyası oluşturarak veya değiştirerek ayarlarınızı PHP 5.2 \'e geçirmeyi deneyebilir.'; $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'Not: Yapılandırmayı kendiniz değiştirip sonrasında Piwigo\'yu tekrar başlatabilirsiniz.'; -$lang['Try to configure PHP 5'] = 'PHP 5 yapılandırmasını dene'; +$lang['Try to configure PHP 5'] = 'PHP 5.2 yapılandırmasını dene'; $lang['Sorry!'] = 'Üzgünüm!'; -$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo, PHP 5 yapılandırmasını başaramadı.'; -$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Barındırma sağlayıcınızın desteğini alarak, kendinizin PHP 5\'e nasıl geçebileceğinizi öğrenin.'; +$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo, PHP 5.2 yapılandırmasını başaramadı.'; +$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Barındırma sağlayıcınızın desteğini alarak, kendinizin PHP 5.2\'e nasıl geçebileceğinizi öğrenin.'; $lang['Hope to see you back soon.'] = 'Yakında tekrar görüşmek dileğiyle.'; $lang['Congratulations, Piwigo installation is completed'] = 'Tebrikler, Piwigo kurulumu tamamlandı.'; $lang['An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning : database.inc.php must only contain what is in the textarea, no line return or space character)'] = 'Diğer çözüm aşağıdaki kutudaki yazıyı kopyalayın ve "local/config/database.inc.php" dosyası içine pasteleyin.(Uyarı : database.inc.php sadece yazı içermeli hiçbir ifade veya boşluk karakteri içermemelidir)'; @@ -65,5 +65,4 @@ $lang['Welcome to my photo gallery'] = 'Fotoğraf galerime hoş geldiniz'; $lang['Don\'t hesitate to consult our forums for any help : %s'] = 'Herhangi bir sebeple yardım gerektiğinde, forumlarımıza danışmakta tereddüt etmeyin: %s'; $lang['Welcome to your new installation of Piwigo!'] = 'Piwigo\'nunuzun yeni kurulumuna hoşgeldiniz!'; $lang['Password ']['confirm'] = 'Şifre [doğrula]'; -$lang['localhost or other, supplied by your host provider'] = 'localhost veya diğer, bulundurma hizmeti sağlayıcınız tarafından verilen'; -?> \ No newline at end of file +$lang['localhost or other, supplied by your host provider'] = 'localhost veya diğer, bulundurma hizmeti sağlayıcınız tarafından verilen'; \ No newline at end of file diff --git a/sources/language/tr_TR/upgrade.lang.php b/sources/language/tr_TR/upgrade.lang.php index d570610..5a8f458 100644 --- a/sources/language/tr_TR/upgrade.lang.php +++ b/sources/language/tr_TR/upgrade.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/language/uk_UA/admin.lang.php b/sources/language/uk_UA/admin.lang.php index 419ca84..c048343 100644 --- a/sources/language/uk_UA/admin.lang.php +++ b/sources/language/uk_UA/admin.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -978,4 +978,13 @@ $lang['between %s and %s MB'] = 'між %s і %s МБ'; $lang['date & time'] = 'дата і час'; $lang['file name'] = 'ім’я файлу'; $lang['width & height'] = 'ширина і висота'; -$lang['Upload in progress'] = 'Завантаження триває'; \ No newline at end of file +$lang['Upload in progress'] = 'Завантаження триває'; +$lang['Delete %d orphan photos'] = 'Видалення %d одиночних фото'; +$lang['Each email sent will contain its own automatic authentication key on links, valid for %s.'] = 'Кожен е-mail містить свій власний ключ ідентифікації по посиланню, дійсний для %s.'; +$lang['Edit user'] = 'Редагування користувача'; +$lang['For security reason, authentication keys do not work for administrators.'] = 'З причини безпеки, ключі ідентифікації не працюють для адміністраторів.'; +$lang['No recipient selected'] = 'Отримувач не вибраний'; +$lang['No user is permitted to see this private album'] = 'Жодному користувачу не дозволено бачити цей приватний альбом'; +$lang['Orphans'] = 'Одиночні'; +$lang['Recipients'] = 'Одержувачі'; +$lang['Y Repeat'] = 'Повторення Y'; \ No newline at end of file diff --git a/sources/language/uk_UA/common.lang.php b/sources/language/uk_UA/common.lang.php index 0e61073..6955bdf 100644 --- a/sources/language/uk_UA/common.lang.php +++ b/sources/language/uk_UA/common.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -22,7 +22,7 @@ // +-----------------------------------------------------------------------+ /* Language Name: Українська [UA] -Version: 2.7.0 +Version: 2.8.2 Language URI: http://piwigo.org/ext/extension_view.php?eid=523 Author: Piwigo team Author URI: http://piwigo.org @@ -426,4 +426,5 @@ $lang['Photo description'] = 'Опис фотографії'; $lang['Photo title'] = 'Назва фотографії'; $lang['Album name, A → Z'] = 'Назва альбому, А → Я'; $lang['Album name, Z → A'] = 'Назва альбому, Я → А'; -$lang['Link: %s'] = 'Посилання: %s'; \ No newline at end of file +$lang['Link: %s'] = 'Посилання: %s'; +$lang['Your authentication key is no longer valid.'] = 'Ваш ключ аутентифікації більше не дійсний.'; \ No newline at end of file diff --git a/sources/language/uk_UA/help/photos_add_ftp.html b/sources/language/uk_UA/help/photos_add_ftp.html index 7b1eee2..980efa0 100755 --- a/sources/language/uk_UA/help/photos_add_ftp.html +++ b/sources/language/uk_UA/help/photos_add_ftp.html @@ -1,70 +1,81 @@ -
    - Швидкий старт - -
      -
    1. Створіть директорію на вашому комп'ютері.
      2. - -
    2. Скопіюйте кілька зображень всередину цієї директорії, змініть їх розмір для веб-дисплея. Попередження: ім'я директорії і файлів повинне містити тільки листи, фігури, "-", "_" or ".". Без пробілів і акцентованих символів.
      3. - -
    3. З клієнтом FTP, копіюйте ваші директорії в директорії "Галереї" вашої Piwigo.
      4. - -
    4. Увійдіть до своєї галереї та перейдіть до Адміністрування і натисніть на велику кнопку синхронізації.
      5. -
    - -

    Вітаємо! Ви успішно створили перший альбом галереї.

    -
    - -
    - Організація директорій і файлів - -
      - -
    • - -

      Директорії альбому знаходяться в директорії Piwigo -"galleries". Тут слідує дерево каталогів дуже маленької галереї(але -користується багатьма особливостями):

      - - 
      -galleries
-|-- wedding
-|   |-- celebration
-|   |   |-- arrival
-|   |   |   |-- paul-alone.jpg
-|   |   |   +-- sarah-alone.jpg
-|   |   +-- departure
-|   |       +-- paul-and-sarah.jpg
-|   +-- party
-|       |-- dancers001.jpg
-|       |-- dancers002.jpg
-|       +-- dancers003.jpg
-+-- honeymoon
-    |-- hotel.png
-    |-- video-from-plane.avi
-    +-- pwg_representative
-        +-- video-from-plane.jpg
-
      - -
      • - -
    • За винятком "pwg_representative" (див. пояснення нижче), в кожній директорії в розділі "galleries" виступає як альбом. Немає ніяких обмежень на глибину директорій.
      • - -
    • В основному, файл представлений елементом. Файл може бути на -Piwigo елементом, якщо його розширення, серед file_ext - можливостей параметра конфігурації (див. файл include/config_default.inc.php). Файл може -бути зображенням, якщо його розширення серед picture_ext - можливостей параметра конфігурації.
      • - -
    • Немає елементів зображень (відео, звук, файл текстів, все, що ви хочете...) представлених за замовчуванням значок відповідає імені файлу -розширення. За бажанням, можна пов'язати мініатюру і представника -файлу (див. video.avi у наведеному вище прикладі).
      • - -
    • Попередження: ім'я директорії і файлів повинне містити тільки листи, фігури, "-", "_" or ".". Без пробілів і акцентованих символів.
      • - -
    • Як тільки фотографії правильно розташовані в -директорії, перейдіть: Адміністрування » Інструменти » - Синхронізація
      • - -
    -
    \ No newline at end of file +
    + Швидкий старт + +
      +
    1. Створіть директорію на вашому комп'ютері.
      2. + +
    2. Скопіюйте кілька зображень всередину цієї директорії, змініть їх розмір для веб-дисплея. Попередження: ім'я директорії і файлів повинне містити тільки листи, фігури, "-", "_" or ".". Без пробілів і акцентованих символів.
      3. + +
    3. З клієнтом FTP, копіюйте ваші директорії в директорії "Галереї" вашої Piwigo.
      4. + +
    4. Увійдіть до своєї галереї та перейдіть до Адміністрування і натисніть на велику кнопку синхронізації.
      5. +
    + +

    Вітаємо! Ви успішно створили перший альбом галереї.

    +
    + +
    + Організація директорій і файлів + +
      + +
    • + +

      Директорії альбому знаходяться в директорії Piwigo +"galleries". Тут слідує дерево каталогів дуже маленької галереї(але +користується багатьма особливостями):

      + + 
      +galleries
+|-- wedding
+|   |-- celebration
+|   |   |-- arrival
+|   |   |   |-- paul-alone.jpg
+|   |   |   +-- sarah-alone.jpg
+|   |   +-- departure
+|   |       +-- paul-and-sarah.jpg
+|   +-- party
+|       |-- dancers001.jpg
+|       |-- dancers002.jpg
+|       +-- dancers003.jpg
++-- honeymoon
+    |-- hotel.png
+    |-- video-from-plane.avi
+    +-- pwg_representative
+        +-- video-from-plane.jpg
++-- photoshoot
+    |-- img0001.jpg
+    |-- img0002.jpg
+    +-- pwg_format
+        |-- img0001.cr2
+        |-- img0001.cmyk.jpg
+        |-- img0001.zip
+        |-- img0002.cr2
+        +-- img0002.cmyk.jpg
+
      + +
      • + +
    • За винятком "pwg_representative" and "pwg_format" (див. пояснення нижче), в кожній директорії в розділі "galleries" виступає як альбом. Немає ніяких обмежень на глибину директорій.
      • + +
    • В основному, файл представлений елементом. Файл може бути на +Piwigo елементом, якщо його розширення, серед file_ext + можливостей параметра конфігурації (див. файл include/config_default.inc.php). Файл може +бути зображенням, якщо його розширення серед picture_ext + можливостей параметра конфігурації.
      • + +
    • Немає елементів зображень (відео, звук, файл текстів, все, що ви хочете...) представлених за замовчуванням значок відповідає імені файлу +розширення. За бажанням, можна пов'язати мініатюру і представника +файлу (див. video.avi у наведеному вище прикладі).
      • + +
    • Multiple formats: a photo can be available in several formats. In this example, we have 3 additional formats for img0001.jpg. You can activate this feature with $conf['enable_formats'] = true; in your local configuration and define a list of formats, like $conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');
      • + +
    • Попередження: ім'я директорії і файлів повинне містити тільки листи, фігури, "-", "_" or ".". Без пробілів і акцентованих символів.
      • + +
    • Як тільки фотографії правильно розташовані в +директорії, перейдіть: Адміністрування » Інструменти » + Синхронізація
      • + +
    +
    diff --git a/sources/language/uk_UA/install.lang.php b/sources/language/uk_UA/install.lang.php index b88a39a..3e3b58e 100644 --- a/sources/language/uk_UA/install.lang.php +++ b/sources/language/uk_UA/install.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -47,13 +47,13 @@ $lang['Keep it confidential, it enables you to access administration panel'] = ' $lang['Need help ? Ask your question on Piwigo message board.'] = 'Потрібна допомога? Задайте питання на форумі Piwigo.'; $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'Зверніть увагу, ви можете змінити свою конфігурацію і перезавантажити собі Piwigo після цього.'; $lang['Password [confirm]'] = 'Пароль [підтвердження]'; -$lang['PHP 5 is required'] = 'Потрібен PHP 5'; -$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo можуть спробувати перемкнути конфігурацію PHP 5 шляхом створення або зміни .htaccess файлу.'; -$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo не зміг налаштувати PHP 5.'; +$lang['PHP 5 is required'] = 'Потрібен PHP 5.2'; +$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo можуть спробувати перемкнути конфігурацію PHP 5.2 шляхом створення або зміни .htaccess файлу.'; +$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo не зміг налаштувати PHP 5.2'; $lang['please enter your password again'] = 'введіть пароль ще раз'; $lang['Sorry!'] = 'Вибачте!'; $lang['Start Install'] = 'Початок встановлення'; -$lang['Try to configure PHP 5'] = 'Спробуйте налаштувати PHP 5'; +$lang['Try to configure PHP 5'] = 'Спробуйте налаштувати PHP 5.2'; $lang['user login given by your host provider'] = 'лоґін користувача дізнайтесь у вашого хостинг-провайдера'; $lang['user password given by your host provider'] = 'лоґін користувача дізнайтесь у Вашого хостинг-провайдера'; $lang['verification'] = 'перевірка'; @@ -62,7 +62,6 @@ $lang['webmaster login can\'t contain characters \' or "'] = 'лоґін веб- $lang['Welcome to my photo gallery'] = 'Ласкаво просимо в фотогалерею'; $lang['Welcome to your new installation of Piwigo!'] = 'Ласкаво просимо у ваш новий встановлений Piwigo!'; $lang['You can download the config file and upload it to local/config directory of your installation.'] = 'Ви можете завантажити конфігураційний файл і завантажити його до local/config каталогу встановлення.'; -$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Ви повинні звернутися в службу підтримки вашого хостинг-провайдера і подивитися, як ви можете переключитися на PHP 5 самостійно.'; +$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Ви повинні звернутися в службу підтримки вашого хостинг-провайдера і подивитися, як ви можете переключитися на PHP 5.2 самостійно.'; $lang['User'] = 'Користувач'; -$lang['localhost or other, supplied by your host provider'] = 'локальний хост або будь-який інший, наданий вашим провайдером'; -?> \ No newline at end of file +$lang['localhost or other, supplied by your host provider'] = 'локальний хост або будь-який інший, наданий вашим провайдером'; \ No newline at end of file diff --git a/sources/language/uk_UA/upgrade.lang.php b/sources/language/uk_UA/upgrade.lang.php index e958360..21094b5 100644 --- a/sources/language/uk_UA/upgrade.lang.php +++ b/sources/language/uk_UA/upgrade.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/language/vi_VN/admin.lang.php b/sources/language/vi_VN/admin.lang.php index 40a5b58..316f6dc 100644 --- a/sources/language/vi_VN/admin.lang.php +++ b/sources/language/vi_VN/admin.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -979,4 +979,5 @@ $lang['based on'] = 'dựa trên'; $lang['between %s and %s MB'] = 'giữa %s và %s MB'; $lang['date & time'] = 'ngày tháng & thời gian'; $lang['file name'] = 'tên file'; -$lang['width & height'] = 'chiều rộng & chiều cao'; \ No newline at end of file +$lang['width & height'] = 'chiều rộng & chiều cao'; +$lang['Upload in progress'] = 'Đang trong quá trình tải lên '; \ No newline at end of file diff --git a/sources/language/vi_VN/common.lang.php b/sources/language/vi_VN/common.lang.php index f25961d..09e6e0c 100644 --- a/sources/language/vi_VN/common.lang.php +++ b/sources/language/vi_VN/common.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -22,7 +22,7 @@ // +-----------------------------------------------------------------------+ /* Language Name: Tiếng Việt [VN] -Version: 2.7.0 +Version: 2.8.2 Language URI: http://piwigo.org/ext/extension_view.php?eid=437 Author: Piwigo team Author URI: http://piwigo.org @@ -35,7 +35,7 @@ $lang_info['direction'] = 'ltr'; $lang_info['code'] = 'vn'; $lang_info['zero_plural'] = true; -$lang['%d Kb'] = '%d Kb'; +$lang['%d Kb'] = '%d KB'; $lang['%d album updated'] = '%d đề mục đã được cập nhật'; $lang['%d albums updated'] = '%d đề mục đã được cập nhật'; $lang['%d comment to validate'] = '%d lời bình cần xác nhận'; @@ -48,17 +48,17 @@ $lang['%d hit'] = '%d lần xem'; $lang['%d hits'] = '%d lần xem'; $lang['%d new photo'] = '%d hình mới'; $lang['%d new photos'] = '%d hình mới'; -$lang['%d new user'] = '%d thành viên mới'; -$lang['%d new users'] = '%d thành viên mới'; -$lang['About'] = 'Thông tin về Piwgo'; +$lang['%d new user'] = '%d người dùng mới'; +$lang['%d new users'] = '%d người dùng mới'; +$lang['About'] = 'Giới thiệu'; $lang['All tags'] = 'Tất cả các tags'; -$lang['Any tag'] = 'Tất cả các tag'; +$lang['Any tag'] = 'Bát kỳ tag nào'; $lang['At least one listed rule must be satisfied.'] = 'Ít nhất một điều khoản nêu trên phải được đáp ứng.'; $lang['Author'] = 'Tác giả'; $lang['Albums'] = 'Đề mục'; $lang['Album'] = 'Đề mục'; -$lang['Close this window'] = 'Đóng'; -$lang['Complete RSS feed (photos, comments)'] = 'Cung cấp bản tin RSS đầy đủ (gồm hình ảnh và lời bình)'; +$lang['Close this window'] = 'Đóng cửa sổ này'; +$lang['Complete RSS feed (photos, comments)'] = 'Hoàn tất tin RSS (hình ảnh, bình luận)'; $lang['Confirm Password'] = 'Xác nhận lại mật khẩu'; $lang['Connection settings'] = 'Thiết lập cài đặt'; $lang['Login'] = 'Đăng nhập'; @@ -67,26 +67,26 @@ $lang['Create a new account'] = 'Tạo tài khoản mới'; $lang['Created on'] = 'Khởi tạo vào'; $lang['Creation date'] = 'Ngày khởi tạo'; $lang['Current password is wrong'] = 'Mật khởi hiện tại bị sai'; -$lang['Dimensions'] = 'Độ phân giải'; +$lang['Dimensions'] = 'Kích thước'; $lang['Display'] = 'Hiển thị'; $lang['Each listed rule must be satisfied.'] = 'Mỗi điều khoản nêu trên phải được đáp ứng.'; $lang['Email address'] = 'Địa chỉ email'; -$lang['Enter your personnal informations'] = 'Nhập thông tin của bạn'; +$lang['Enter your personnal informations'] = 'Nhập thông tin cá nhân'; $lang['Error sending email'] = 'Lỗi gởi email'; $lang['File name'] = 'Tên file'; -$lang['File'] = 'Tệp tin'; +$lang['File'] = 'File'; $lang['Filesize'] = 'Kích thước file'; -$lang['Filter and display'] = 'Lọc và hiển thị ảnh'; -$lang['Filter'] = 'Lọc'; +$lang['Filter and display'] = 'Bộ lọc và hiển thị'; +$lang['Filter'] = 'Bộ lọc'; $lang['Forgot your password?'] = 'Bạn quên mật khẩu?'; -$lang['Go through the gallery as a visitor'] = 'Xem gallery như một khách thăm quan'; +$lang['Go through the gallery as a visitor'] = 'Xem gallery với vai trò khách'; $lang['Help'] = 'Trợ giúp'; $lang['Identification'] = 'Định danh'; $lang['Photos only RSS feed'] = 'Chỉ cung cấp hình ảnh trên bản tin RSS'; $lang['Keyword'] = 'Từ khoá'; $lang['Links'] = 'Liên kết'; $lang['N/A'] = 'Không có'; -$lang['New on %s'] = 'hình mới ở %s'; +$lang['New on %s'] = 'Hình mới ở %s'; $lang['Notification'] = 'Thông báo'; $lang['Number of items'] = 'Số lượng hình'; $lang['Original dimensions'] = 'Độ phân giải gốc'; @@ -118,7 +118,7 @@ $lang['Username'] = 'Tên đăng nhập'; $lang['Visits'] = 'Thăm quan'; $lang['Webmaster'] = 'Quản trị'; $lang['Week %d'] = 'Tuần %d'; -$lang['About Piwigo'] = 'Thông tin về Piwigo'; +$lang['About Piwigo'] = 'Giới thiệu Piwigo'; $lang['You are not authorized to access the requested page'] = 'Bạn không được phép truy cập vào trang này'; $lang['add this photo to your favorites'] = 'thêm hình này vào danh sách ưa thích của mình'; $lang['Administration'] = 'Điều hành viên'; @@ -139,21 +139,21 @@ $lang['View'] = 'Xem'; $lang['chronology_monthly_calendar'] = 'Lịch hằng tháng'; $lang['chronology_monthly_list'] = 'Danh sách hằng tháng'; $lang['chronology_weekly_list'] = 'Danh sách hằng tuần'; -$lang['Click here if your browser does not automatically forward you'] = 'Nhắp chuột vào đây nếu trình duyệt web không tự động chuyển trang'; +$lang['Click here if your browser does not automatically forward you'] = 'Nhắp chuột vào đây nếu trình duyệt không tự động chuyển trang'; $lang['comment date'] = 'ngày bình luận'; $lang['Comment'] = 'Bình luận'; $lang['Your comment has been registered'] = 'Lời bình của bạn đã được đăng ký'; -$lang['Anti-flood system : please wait for a moment before trying to post another comment'] = 'Hệ thống bảo vệ DDOS: vui lòng đợi trong giây lát trước khi gởi lời bình khác'; +$lang['Anti-flood system : please wait for a moment before trying to post another comment'] = 'Hệ thống bảo mật: vui lòng đợi trong giây lát trước khi gởi lời bình khác'; $lang['Your comment has NOT been registered because it did not pass the validation rules'] = 'Lời bình của bạn KHÔNG thể gửi được vì nó không đáp ứng được các điều khoản'; $lang['An administrator must authorize your comment before it is visible.'] = 'Lời bình của bạn phải được quản trị viên xác nhận trước khi nó hiển thị trên gallery.'; $lang['This login is already used by another user'] = 'Tài khoản đã được đăng ký trước đây'; -$lang['Comments'] = 'Lời bình'; +$lang['Comments'] = 'Bình luận'; $lang['Add a comment'] = 'Thêm lời bình'; $lang['created after %s (%s)'] = 'đã tạo sau %s (%s)'; $lang['created before %s (%s)'] = 'đã tạo trước %s (%s)'; $lang['created between %s (%s) and %s (%s)'] = 'đã tạo giữa %s (%s) và %s (%s)'; $lang['created on %s'] = 'đã tạo vào %s'; -$lang['Customize'] = 'Tuỳ chọn'; +$lang['Customize'] = 'Tùy chọn'; $lang['Your Gallery Customization'] = 'Tuỳ chọn cho Gallery của bạn '; $lang['day'][0] = 'Chủ Nhật'; $lang['day'][1] = 'Thứ Hai'; @@ -164,9 +164,9 @@ $lang['day'][5] = 'Thứ Sáu'; $lang['day'][6] = 'Thứ Bảy'; $lang['Default'] = 'Mặc định'; $lang['delete this photo from your favorites'] = 'xoá hình này từ danh sách ưa thích của bạn'; -$lang['Delete'] = 'Xoá bỏ'; +$lang['Delete'] = 'Xóa'; $lang['descending'] = 'từ trên xuống'; -$lang['Download'] = 'Tải về'; +$lang['Download'] = 'tải về'; $lang['Download this file'] = 'tải về file này'; $lang['edit'] = 'biên tập'; $lang['wrong date'] = 'sai ngày tháng'; @@ -211,7 +211,7 @@ $lang['month'][6] = 'Tháng Sáu'; $lang['month'][7] = 'Tháng Bảy'; $lang['month'][8] = 'Tháng Tám'; $lang['month'][9] = 'Tháng Chín'; -$lang['Most visited'] = 'Hình được xem nhiều nhất'; +$lang['Most visited'] = 'Được xem nhiều nhất'; $lang['display most visited photos'] = 'hiển thị những hình được xem nhiều nhất'; $lang['Unknown identifier'] = 'Định danh không xác định'; $lang['New password'] = 'Mật khẩu mới'; @@ -223,7 +223,7 @@ $lang['Photos posted within the last %d days.'] = 'Các thành phần được g $lang['password updated'] = 'mật khẩu đã được cập nhật'; $lang['Recent period must be a positive integer value'] = 'Chu kỳ gần đây phải có giá trị là số nguyên dương'; /* DEPRECATED USED IN comments.php FOR image_id ? */ $lang['photo'] = 'hình ảnh'; -$lang['Click on the photo to see it in high definition'] = 'Click lên hình để xem ở định dạng cao'; +$lang['Click on the photo to see it in high definition'] = 'Click lên hình để xem ở độ phân giải cao'; $lang['Show file metadata'] = 'Hiển thị metadata của hình'; $lang['Powered by'] = 'Sản phẩm của'; $lang['Preferences'] = 'Tuỳ chọn thêm'; @@ -247,13 +247,13 @@ $lang['representative'] = 'đại diện'; $lang['Search for Author'] = 'Tìm kiếm theo tác giả'; $lang['Search in albums'] = 'Tìm kiếm trong các đề mục'; $lang['Search by date'] = 'Tìm kiếm theo ngày tháng'; -$lang['Date'] = 'Ngày tháng'; +$lang['Date'] = 'Ngày'; $lang['End-Date'] = 'Ngày kết thúc'; $lang['Kind of date'] = 'Kiểu ngày tháng'; $lang['Search for words'] = 'Tìm kiếm theo từ'; $lang['Search for all terms'] = 'Tìm kiếm tất cả các mục '; $lang['Search for any term'] = 'Tìm kiếm mọi mục'; -$lang['Empty query. No criteria has been entered.'] = 'Truy vấn xác định. Không có từ khoá nào được nhập'; +$lang['Empty query. No criteria has been entered.'] = 'Truy vấn rỗng. Không có từ khoá nào được nhập.'; $lang['Search results'] = 'Kết quả tìm kiếm'; $lang['Search in sub-albums'] = 'Tìm kiếm trong các mục nhỏ'; $lang['searched words : %s'] = 'những từ khoá được tìm kiếm : %s'; @@ -269,21 +269,21 @@ $lang['display only recently posted photos'] = 'chỉ hiển thị những hình $lang['return to the display of all photos'] = 'trở lại hiển thị tất cả các hình'; $lang['the beginning'] = 'bắt đầu'; $lang['Thumbnails'] = 'Hình nhỏ'; -$lang['Menu'] = 'Trình đơn'; +$lang['Menu'] = 'Menu'; $lang['A comment on your site'] = 'Một lời bình trên trang của bạn'; $lang['today'] = 'hôm nay'; $lang['Update your rating'] = 'Cập nhật xếp hạng của bạn'; $lang['the username must be given'] = 'Phải có tên của thành viên'; $lang['useful when password forgotten'] = 'có ích khi bị mất mật khẩu'; $lang['Quick search'] = 'Tìm kiếm nhanh'; -$lang['Connected user: %s'] = 'Thành viên kết nối: %s'; -$lang['IP: %s'] = 'Địa chỉ IP: %s'; +$lang['Connected user: %s'] = 'người dùng đã kết nối: %s'; +$lang['IP: %s'] = 'IP: %s'; $lang['Browser: %s'] = 'Trình duyệt: %s'; $lang['Author: %s'] = 'Tác giả: %s'; $lang['Comment: %s'] = 'Bình luận: %s'; $lang['Comment by %s'] = 'Bình luận bởi %s'; $lang['User: %s'] = 'Tài khoản: %s'; -$lang['Email: %s'] = 'Địa chỉ email: %s'; +$lang['Email: %s'] = 'Email: %s'; $lang['Admin: %s'] = 'Quản trị: %s'; $lang['Registration of %s'] = 'Mục đăng ký của %s'; $lang['Album: %s'] = 'Đề mục: %s'; @@ -292,12 +292,12 @@ $lang['this email address is already in use'] = 'đã có thành viên sử dụ $lang['Album results for'] = 'Kết quả đề mục cho'; $lang['Tag results for'] = 'Kết quả tag cho'; $lang['from %s to %s'] = 'từ %s đến %s'; -$lang['Play of slideshow'] = 'Bật trình chiếu'; +$lang['Play of slideshow'] = 'Trình chiếu'; $lang['Pause of slideshow'] = 'Tạm dừng trình chiếu'; $lang['Repeat the slideshow'] = 'Lặp lại trình chiếu'; $lang['Not repeat the slideshow'] = 'Không lặp lại trình chiếu'; $lang['Reduce diaporama speed'] = 'Giảm tốc độ xem hình tự động'; -$lang['Accelerate diaporama speed'] = 'Tăng tốc độ xem hình tự động'; +$lang['Accelerate diaporama speed'] = 'Tăng tốc độ trình chiếu'; $lang['Submit'] = 'Chấp nhận'; $lang['Yes'] = 'Có'; $lang['No'] = 'Không'; @@ -317,15 +317,15 @@ $lang['delete all photos from your favorites'] = 'xoá tất cả hình từ dan $lang['Sent by'] = 'Được gởi bởi'; $lang['Are you sure?'] = 'Bạn có chắc không?'; $lang['Cookies are blocked or not supported by your browser. You must enable cookies to connect.'] = 'Cookies đã bị chặn lại hoặc không được trình duyệt web trên máy bạn hỗ trợ. Bạn phải mở cookie để tiếp tục.'; -$lang['Edit a comment'] = 'Biên tập một lời bình'; -$lang['(!) This comment requires validation'] = '(!) Lời bình này yêu cầu sự xác nhận'; +$lang['Edit a comment'] = 'Sửa lời bình'; +$lang['(!) This comment requires validation'] = '(!) Lời bình này cần phải xác nhận'; $lang['Welcome'] = 'Xin chào'; $lang['Welcome to your Piwigo photo gallery!'] = 'Chào mừng bạn đến gallery Piwigo trực tuyến của mình!'; $lang['... or browse your empty gallery'] = '... hoặc duyệt gallery chưa có hình của bạn'; -$lang['... or please deactivate this message, I will find my way by myself'] = '... hoặc vui lòng vô hiệu hóa thông điệp này, tôi tự tìm cách giải quyết riêng'; -$lang['Hello %s, your Piwigo photo gallery is empty!'] = 'Xin chào %s, gallery Piwigo của bạn hiện tại vẫn chưa có tấm hình nào!'; -$lang['I want to add photos'] = 'Tôi muốn thêm hình vào gallery'; -$lang['Manage this user comment: %s'] = 'Quản lý lời bình của thành viên này: %s'; +$lang['... or please deactivate this message, I will find my way by myself'] = '... hoặc vui lòng vô hiệu hóa thông báo này, tôi sẽ tự giải quyết'; +$lang['Hello %s, your Piwigo photo gallery is empty!'] = 'Xin chào %s, gallery của bạn hiện chưa có hình ảnh nào!'; +$lang['I want to add photos'] = 'Tôi muốn thêm ảnh'; +$lang['Manage this user comment: %s'] = 'Quản lý lời bình của người dùng này: %s'; $lang['Email address is missing. Please specify an email address.'] = 'Còn thiếu địa chỉ email. Vui lòng cho biết một địa chỉ email.'; $lang['This author modified following comment:'] = 'Tác giả này đã soạn lại lời bình sau:'; $lang['This author removed the comment with id %d'] = 'Tác giả này đã xóa bỏ lời bình có ID là %d'; @@ -333,7 +333,7 @@ $lang['show tag cloud'] = 'hiển thị thẻ mây'; $lang['html tags are not allowed in login'] = 'thẻ html không được phép dùng để đăng nhập'; $lang['The number of photos per page must be a not null scalar'] = 'Số hình trên mỗi trang phải là số nguyên khác 0'; $lang['Number of photos per page'] = 'Số hình trên mỗi trang'; -$lang['%d rates'] = '%d hạng'; +$lang['%d rates'] = '%d đánh giá'; $lang['Rating score'] = 'Bảng xếp hạng'; $lang['Invalid username or email'] = 'Tên người dùng hoặc địa chỉ email không hợp lệ'; $lang['Password reset is not allowed for this user'] = 'Không được phép đặt lại mật khẩu cho người dùng này'; @@ -341,21 +341,21 @@ $lang['User "%s" has no email address, password reset is not possible'] = 'Ngư $lang['Someone requested that the password be reset for the following user account:'] = 'Có người yêu cầu đặt lại mật khẩu cho những người dùng sau:'; $lang['Username "%s" on gallery %s'] = 'Người dùng "%s" trên thư viện hình %s'; $lang['To reset your password, visit the following address:'] = 'Để đặt lại mật khẩu, hãy vào những địa chỉ sau:'; -$lang['If this was a mistake, just ignore this email and nothing will happen.'] = 'Nếu đây là do nhầm lẫn, thì chỉ việc bỏ qua bỏ qua email này và không có việc gì sẽ xảy ra.'; +$lang['If this was a mistake, just ignore this email and nothing will happen.'] = 'Nếu có nhầm lẫn, hãy bỏ qua bỏ qua email này.'; $lang['Password Reset'] = 'Cài đặt lại mật khẩu'; -$lang['Check your email for the confirmation link'] = 'Kiểm tra email để nhận liên kết xác nhận'; -$lang['Invalid key'] = 'Key không hợp lệ'; +$lang['Check your email for the confirmation link'] = 'Kiểm tra email để nhận xác nhận liên kết'; +$lang['Invalid key'] = 'Khóa không hợp lệ'; $lang['The passwords do not match'] = 'Mật khẩu không trùng'; $lang['Your password has been reset'] = 'Mật khẩu của bạn đã được đặt lại'; $lang['Return to home page'] = 'Trở lại trang chủ'; $lang['Please enter your username or email address.'] = 'Vui lòng nhập tên người dùng và địa chỉ email.'; $lang['You will receive a link to create a new password via email.'] = 'Bạn sẽ nhận được một liên kết để tạo mật khẩu mới qua email.'; $lang['Username or email'] = 'Người dùng hoặc email'; -$lang['Change my password'] = 'Đổi mật khẩu của tôi'; +$lang['Change my password'] = 'Đổi mật khẩu'; $lang['Enter your new password below.'] = 'Nhập mật khẩu mới của bạn ở dưới.'; -$lang['EXIF Metadata'] = 'Lý lịch dữ liệu EXIF'; -$lang['IPTC Metadata'] = 'Lý lịch dữ liệu IPTC'; -$lang['Edit'] = 'Biên tập'; +$lang['EXIF Metadata'] = 'Dữ liệu EXIF'; +$lang['IPTC Metadata'] = 'Dữ liệu IPTC'; +$lang['Edit'] = 'Sửa'; $lang['Hello %s,'] = 'Xin chào %s,'; $lang['Send my connection settings by email'] = 'Gởi thiết lập kết nối của tôi qua email'; $lang['Successfully registered, you will soon receive an email with your connection settings. Welcome!'] = 'Đã đăng ký thành công, bạn sẽ nhận được ngay email kèm theo thiết lập kết nối. Xin chào mừng!'; @@ -373,7 +373,7 @@ $lang['Thank you for registering at %s!'] = 'Cảm ơn bạn đã đăng ký t $lang['Here are your connection settings'] = 'Đây là thiết lập kết nối của bạn'; $lang['Password: %s'] = 'Mật khẩu: %s'; $lang['Username: %s'] = 'Tên đăng nhập: %s'; -$lang['If you think you\'ve received this email in error, please contact us at %s'] = 'Nếu bạn nghĩ bạn đã nhận nhầm emai, vui lòng liên hệ với chúng tôi qua %s'; +$lang['If you think you\'ve received this email in error, please contact us at %s'] = 'Nếu bạn nghĩ bạn đã nhận nhầm email, vui lòng liên hệ với chúng tôi qua %s'; $lang['Show oldest comments first'] = 'Hiển thị những lời bình trước nhất đầu tiên'; $lang['Show latest comments first'] = 'Hiển thị những lời bình mới nhất đầu tiên'; $lang['Photo sizes'] = 'Kích thước ảnh'; @@ -381,26 +381,26 @@ $lang['View in'] = 'Xem ảnh ở'; $lang['Mobile'] = 'Di động'; $lang['2small'] = 'XXS - nhỏ'; $lang['xsmall'] = 'XS - cực nhỏ'; -$lang['Desktop'] = 'Desktop'; -$lang['File name, A → Z'] = 'Tên tệp tin, A → Z'; -$lang['File name, Z → A'] = 'Tên tệp tin, Z → A'; -$lang['Photo title, A → Z'] = 'Tựa đề ảnh, A → Z'; -$lang['Photo title, Z → A'] = 'Tựa đề ảnh, Z → A'; -$lang['Date created, new → old'] = 'Ngày tháng khởi tạo, mới → cũ'; -$lang['Date created, old → new'] = 'Ngày tháng khởi tạo, cũ → mới'; -$lang['Date posted, new → old'] = 'Ngày tháng gởi ảnh, mới→ cũ'; -$lang['Date posted, old → new'] = 'Ngày tháng gởi ảnh, cũ → mới'; +$lang['Desktop'] = 'Màn hình'; +$lang['File name, A → Z'] = 'Tên file, A → Z'; +$lang['File name, Z → A'] = 'Tên file, Z → A'; +$lang['Photo title, A → Z'] = 'Tiêu đề ảnh, A → Z'; +$lang['Photo title, Z → A'] = 'Tiêu đề ảnh, Z → A'; +$lang['Date created, new → old'] = 'Ngày khởi tạo, mới → cũ'; +$lang['Date created, old → new'] = 'Ngày khởi tạo, cũ → mới'; +$lang['Date posted, new → old'] = 'Ngày gởi ảnh, mới→ cũ'; +$lang['Date posted, old → new'] = 'Ngày gởi ảnh, cũ → mới'; $lang['Rating score, high → low'] = 'Tỉ lệ xếp hạng, cao → thấp'; $lang['Rating score, low → high'] = 'Tỉ lệ xếp hạng, thấp → cao'; $lang['Visits, high → low'] = 'Số lần xem, cao → thấp'; $lang['Visits, low → high'] = 'Số lần xem, thấp → cao'; $lang['Numeric identifier, 1 → 9'] = 'Ký hiệu nhận dạng số học, 1 → 9'; $lang['Numeric identifier, 9 → 1'] = 'Ký hiệu nhận dạng số học, 9 → 1'; -$lang['Manual sort order'] = 'Sắp xếp vị trí thủ công'; +$lang['Manual sort order'] = 'Sắp xếp thủ công'; -$lang['%d rate'] = 'xếp hạng %d'; +$lang['%d rate'] = '%d đánh giá'; $lang['Bad request'] = 'Yêu cầu không hợp lệ'; -$lang['Forbidden'] = 'Bị hạn chế truy cập'; +$lang['Forbidden'] = 'Cấm'; $lang['Page not found'] = 'Không tìm thấy trang'; $lang['Permalink for album not found'] = 'Không tìm thấy liên kết cho album'; $lang['Piwigo encountered a non recoverable error'] = 'Piwigo gặp lỗi ngoài tầm kiểm soát'; @@ -413,7 +413,7 @@ $lang['Your website URL is invalid'] = 'Địa chỉ trang web không bình thư $lang['mandatory'] = 'bắt buộc'; $lang['Email'] = 'Email'; $lang['First Page'] = 'Trang đầu'; -$lang['Go back to the album'] = 'Quay trở lại album'; +$lang['Go back to the album'] = 'Quay trở lại đề mục'; $lang['Last Page'] = 'Trang cuối'; $lang['Password is missing. Please enter the password.'] = 'Thiếu mật khẩu. Vui lòng nhập mật khẩu.'; $lang['Password confirmation is missing. Please confirm the chosen password.'] = 'Xác nhận mật khẩu bị thiếu. Vui lòng xác nhận lại mật khẩu đã chọn.'; @@ -422,7 +422,8 @@ $lang['Theme'] = 'Chủ đề'; $lang['Apply on properties'] = 'Áp dụng cho thuộc tính'; $lang['No results for'] = 'Không tìm thấy kết quả cho'; $lang['Photo description'] = 'Mô tả hình ảnh'; -$lang['Photo title'] = 'Tiêu đề hình ảnh'; +$lang['Photo title'] = 'Tiêu đề ảnh'; $lang['Album name, A → Z'] = 'Tên album, A → Z'; $lang['Album name, Z → A'] = 'Tên album, Z → A'; -$lang['Link: %s'] = 'Liên kết: %s'; \ No newline at end of file +$lang['Link: %s'] = 'Liên kết: %s'; +$lang['Your authentication key is no longer valid.'] = 'Khóa xác thực của bạn không còn hợp lệ nữa.'; \ No newline at end of file diff --git a/sources/language/vi_VN/help/help_misc.html b/sources/language/vi_VN/help/help_misc.html new file mode 100644 index 0000000..19eb065 --- /dev/null +++ b/sources/language/vi_VN/help/help_misc.html @@ -0,0 +1,9 @@ +

    Một khi đã tạo gallery bạn có thể cấu hình lại sao cho phù hợp với đối tượng khách xem của mình +

      +
    • Hiển thị mặc định như bạn muốn trong in Quản trị » Cấu hình » Tùy chọn tab Thiết lạp cho khách
      • +
    • Chủ đề mặc định trong Quản trị » Cấu hình » Chủ đề
      • +
    • The default language in Administration » Configuration » Languages
      • +
    + Mặc định thì mỗi người dùng sẽ kế thừa các thuộc tính này khi đăng ký. +

    +

    Nếu còn thắc mắc gì, cộng đồng Piwigo sẽ chào đón bạn tại diễn đàn.

    \ No newline at end of file diff --git a/sources/language/vi_VN/help/index.php b/sources/language/vi_VN/help/index.php index c8de97f..0b96c3e 100644 --- a/sources/language/vi_VN/help/index.php +++ b/sources/language/vi_VN/help/index.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/language/vi_VN/install.lang.php b/sources/language/vi_VN/install.lang.php index cc457fc..cda76ce 100644 --- a/sources/language/vi_VN/install.lang.php +++ b/sources/language/vi_VN/install.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -46,13 +46,13 @@ $lang['Password [confirm]'] = 'Mật khẩu [xác nhận]'; $lang['verification'] = 'xác nhận'; $lang['Need help ? Ask your question on Piwigo message board.'] = 'Cần trợ giúp ? Hãy gởi thắc mắc của bạn tại diễn đàn của Piwigo.'; $lang['Visitors will be able to contact site administrator with this mail'] = 'Khách tham quan có thể liên lạc với Quản trị thông qua địa chỉ thư điện tử này.'; -$lang['PHP 5 is required'] = 'Phải có PHP 5 '; +$lang['PHP 5 is required'] = 'Phải có PHP 5.2 '; $lang['It appears your webhost is currently running PHP %s.'] = 'Do máy chủ web của bạn đang chạy phiên bản PHP %s.'; -$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo sẽ thử chuyển cấu hình của bạn sang PHP 5 bằng cách tạo ra hoặc biên tập một file .htaccess.'; +$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo sẽ thử chuyển cấu hình của bạn sang PHP 5.2 bằng cách tạo ra hoặc biên tập một file .htaccess.'; $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'Chú ý rằng bạn có thể tự thay đổi cấu hình và khởi động lại Piwigo sau đó.'; -$lang['Try to configure PHP 5'] = ' Thử cấu hình PHP 5'; +$lang['Try to configure PHP 5'] = ' Thử cấu hình PHP 5.2'; $lang['Sorry!'] = 'Rất tiếc!'; -$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo không thể cấu hình cho PHP 5.'; +$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo không thể cấu hình cho PHP 5.2'; $lang["You may referer to your hosting provider's support and see how you could switch to PHP 5 by yourself."] = "Bạn nên yêu cầu hỗ trợ từ nhà cung cấp máy chủ và tìm hiểu xem nếu có thể tự chuyển được sang phiên bản PHP 5."; $lang['Hope to see you back soon.'] = 'Hi vọng nhận được phản hồi của bạn sớm.'; $lang['Congratulations, Piwigo installation is completed'] = 'Xin chúc mừng, việc cài đặt Piwigo đã hoàn tất'; @@ -65,4 +65,4 @@ $lang['Welcome to my photo gallery'] = 'Chào mừng bạn đến với thư vi $lang['Welcome to your new installation of Piwigo!'] = 'Chào mừng bạn đến với bản cài đặt mới của Piwigo!'; $lang['Don\'t hesitate to consult our forums for any help : %s'] = 'Đừng do dự thảo luận tại diễn đàn của chúng tôi để được trợ giúp: %s'; $lang['localhost or other, supplied by your host provider'] = 'localhost hoặc tên máy chủ cấp bởi nhà cung cấp host'; -?> \ No newline at end of file +$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = 'Bạn nên yêu cầu hỗ trợ từ nhà cung cấp máy chủ và tìm hiểu xem nếu có thể tự chuyển được sang phiên bản PHP 5.2'; \ No newline at end of file diff --git a/sources/language/vi_VN/upgrade.lang.php b/sources/language/vi_VN/upgrade.lang.php index 7cc0fca..9bdde8c 100644 --- a/sources/language/vi_VN/upgrade.lang.php +++ b/sources/language/vi_VN/upgrade.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/language/wo_SN/common.lang.php b/sources/language/wo_SN/common.lang.php index 766318d..d1ec827 100644 --- a/sources/language/wo_SN/common.lang.php +++ b/sources/language/wo_SN/common.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -22,7 +22,7 @@ // +-----------------------------------------------------------------------+ /* Language Name: Wolof [SN] -Version: 2.6.0 +Version: 2.8.2 Language URI: http://piwigo.org/ext/extension_view.php?eid=737 Author: Piwigo team Author URI: http://piwigo.org diff --git a/sources/language/zh_CN/admin.lang.php b/sources/language/zh_CN/admin.lang.php index 8492428..92a4f66 100644 --- a/sources/language/zh_CN/admin.lang.php +++ b/sources/language/zh_CN/admin.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -669,7 +669,7 @@ $lang['Apply action'] = '执行操作'; $lang['automatic order'] = '自动排序'; $lang['Batch Manager'] = '批量管理'; $lang['Choose an action'] = '选择一项操作'; -$lang['Delete orphan tags'] = '删除未被关联的标签'; +$lang['Delete orphan tags'] = '删除未关联任何图片的标签'; $lang['delete photo'] = '删除图片'; $lang['Duplicates'] = '副本'; $lang['include child albums'] = '包含子相册'; @@ -678,7 +678,7 @@ $lang['No photo in the current set.'] = '当前集合没有图片。'; $lang['No photo selected, %d photos in current set'] = '没有图片被选中，当前集合中有 %d 张图片'; $lang['No photo selected, no action possible.'] = '没有图片被选中，不能执行任何操作。'; $lang['on the %d selected photos'] = '于此 %d 张所选图片'; -$lang['Orphan tags deleted'] = '无关联图片的标签已被删除'; +$lang['Orphan tags deleted'] = '未关联任何图片的标签已被删除'; $lang['Refresh photo set'] = '刷新图片集'; $lang['Remove all filters'] = '删除所有过滤器'; $lang['remove author'] = '删除作者'; @@ -694,7 +694,7 @@ $lang['The whole set'] = '整个集合'; $lang['Type here the author name'] = '在此输入作者名称'; $lang['Type here the title'] = '在此输入标题'; $lang['Week starts on'] = '星期起始于'; -$lang['You have %d orphan tags: %s.'] = '您有 %d 个无关联图片的标签：%s。'; +$lang['You have %d orphan tags: %s.'] = '您有 %d 个未关联任何图片的标签：%s。'; $lang['Remove from caddie'] = '从标记图片库中移除'; $lang['Themes which need upgrade'] = '需更新的主题'; $lang['Languages which need upgrade'] = '需要更新的语言'; @@ -987,4 +987,13 @@ $lang['between %s and %s MB'] = '在 %s 和 %s MB 之间'; $lang['date & time'] = '日期与时间'; $lang['file name'] = '文件名'; $lang['width & height'] = '宽度&高度'; -$lang['Upload in progress'] = '正在上传'; \ No newline at end of file +$lang['Upload in progress'] = '正在上传'; +$lang['Each email sent will contain its own automatic authentication key on links, valid for %s.'] = '每封发出的email中的链接将包含自动生成的唯一验证密钥，有效期 %s。'; +$lang['For security reason, authentication keys do not work for administrators.'] = '出于安全原因，验证密钥对管理员不起作用。'; +$lang['Edit user'] = '编辑用户'; +$lang['No recipient selected'] = '未选择收件人'; +$lang['No user is permitted to see this private album'] = '没有用户被允许查看该非公开相册'; +$lang['Recipients'] = '收件人'; +$lang['Y Repeat'] = 'Y轴平铺'; +$lang['Delete %d orphan photos'] = '删除 %d 没有任何关联的图片'; +$lang['Orphans'] = '没有任何关联'; \ No newline at end of file diff --git a/sources/language/zh_CN/common.lang.php b/sources/language/zh_CN/common.lang.php index b7f58cc..42ba2f9 100644 --- a/sources/language/zh_CN/common.lang.php +++ b/sources/language/zh_CN/common.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -22,7 +22,7 @@ // +-----------------------------------------------------------------------+ /* Language Name: 简体中文 [CN] -Version: 2.7.0 +Version: 2.8.2 Language URI: http://piwigo.org/ext/extension_view.php?eid=438 Author: Piwigo team Author URI: http://piwigo.org @@ -428,4 +428,5 @@ $lang['Photo description'] = '相片描述'; $lang['Photo title'] = '相片标题'; $lang['Album name, A → Z'] = '相册名称， A → Z'; $lang['Album name, Z → A'] = '相册名称， Z → A'; -$lang['Link: %s'] = '链接： %s'; \ No newline at end of file +$lang['Link: %s'] = '链接： %s'; +$lang['Your authentication key is no longer valid.'] = '您的认证密钥已失效。'; \ No newline at end of file diff --git a/sources/language/zh_CN/help/photos_add_ftp.html b/sources/language/zh_CN/help/photos_add_ftp.html index eb2231a..1702be8 100644 --- a/sources/language/zh_CN/help/photos_add_ftp.html +++ b/sources/language/zh_CN/help/photos_add_ftp.html @@ -25,38 +25,33 @@

    相册文件夹均放在 Piwigo 的 "galleries" 文件夹里。以下的文件夹树里有一个很小的相册（但使用了很多功能）：

    -.
-|-- admin
-|-- doc
-|-- galleries
-|   |-- category-1
-|   |   |-- category-1.1
-|   |   |   |-- category-1.1.1
-|   |   |   |   |-- category-1.1.1.1
-|   |   |   |   |   |-- pwg_high
-|   |   |   |   |   |   +-- wedding.jpg
-|   |   |   |   |   |-- thumbnail
-|   |   |   |   |   |   +-- TN-wedding.jpg
-|   |   |   |   |   +-- wedding.jpg
-|   |   |   |   +-- category-1.1.1.2
-|   |   |   +-- category-1.1.2
-|   |   |-- category-1.2
-|   |   |   |-- pookie.jpg
-|   |   |   +-- thumbnail
-|   |   |       +-- TN-pookie.jpg
-|   |   +-- category-1.3
-|   +-- category-2
-|       |-- piglet.gif
-|       |-- pwg_representative
-|       |   +-- video.jpg
-|       |-- thumbnail
-|       |   +-- TN-piglet.jpg
-|       +-- video.avi
-|-- include
-|-- install
-|-- language
-|-- template
-+-- tool
    +galleries +|-- wedding +| |-- celebration +| | |-- arrival +| | | |-- paul-alone.jpg +| | | +-- sarah-alone.jpg +| | +-- departure +| | +-- paul-and-sarah.jpg +| +-- party +| |-- dancers001.jpg +| |-- dancers002.jpg +| +-- dancers003.jpg ++-- honeymoon +| |-- hotel.png +| |-- video-from-plane.avi +| +-- pwg_representative +| +-- video-from-plane.jpg ++-- photoshoot + |-- img0001.jpg + |-- img0002.jpg + +-- pwg_format + |-- img0001.cr2 + |-- img0001.cmyk.jpg + |-- img0001.zip + |-- img0002.cr2 + +-- img0002.cmyk.jpg + @@ -70,6 +65,8 @@
  • 非图片元素 (如视频，声频，文本文件，一切你想到的...) 均以文件扩展名的默认图标显示。或者，你可以用一张缩略图来代表这个文件 (参见 video.avi 的例子)。
    • +
  • Multiple formats: a photo can be available in several formats. In this example, we have 3 additional formats for img0001.jpg. You can activate this feature with $conf['enable_formats'] = true; in your local configuration and define a list of formats, like $conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');
    • +
  • 注意: 文件名和文件夹必须以字母、数字、 "-"、 "_" 或者 "." 组成。没有空格，没有特别的符号。
  • 一旦文件、缩略图都放到其正确的位置后，进入 : 后台管理 » 工具 » @@ -78,19 +75,3 @@ -
    - 缩略图 -
      - -
    • 每个图片必须要有一张缩略图。
      • - -
    • 缩略图保存在相册文件夹里名为 "thumbnail" 的子文件夹。缩略图文件名与图片的文件名一致，将会以 TN- 为前缀
      • - -
    • 建议: 使用外部工具来创建缩略图。
      • - -
    • 你可以使用后台管理 » 图片 » 缩略图 页面来创建缩略图。即使这是不被推荐的（考虑到图片品质，网络服务器资源读取等问题）。
      • - -
    • 分配给所有相册文件夹写权限。
      • - -
    -
    diff --git a/sources/language/zh_CN/install.lang.php b/sources/language/zh_CN/install.lang.php index b991589..6a4eec4 100644 --- a/sources/language/zh_CN/install.lang.php +++ b/sources/language/zh_CN/install.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -46,13 +46,13 @@ $lang['Password [confirm]'] = '密码 [ 确认 ]'; $lang['verification'] = '验证'; $lang['Need help ? Ask your question on Piwigo message board.'] = '需要帮助吗？请到Piwigo论坛提出您的问题。'; $lang['Visitors will be able to contact site administrator with this mail'] = '访问者将可通过此email跟站长取得联系'; -$lang['PHP 5 is required'] = '必须PHP 5版本'; +$lang['PHP 5 is required'] = '必须PHP 5.2版本'; $lang['It appears your webhost is currently running PHP %s.'] = '你主机PHP版本好像是PHP %s.'; -$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo会尝试创建或修改.htaccess文件以将您的设置转换到PHP 5。'; +$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo会尝试创建或修改.htaccess文件以将您的设置转换到PHP 5.2。'; $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = '注意：你也可以自己修改设置PHP然后重新启动Piwigo。'; -$lang['Try to configure PHP 5'] = '尝试配置PHP 5'; +$lang['Try to configure PHP 5'] = '尝试配置PHP 5.2'; $lang['Sorry!'] = '对不起!'; -$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo不能设置PHP 5。'; +$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo不能设置PHP 5.2。'; $lang["You may referer to your hosting provider's support and see how you could switch to PHP 5 by yourself."] = '你应该联系你的主机管理员并向其请教如何设置PHP 5.'; $lang['Hope to see you back soon.'] = '希望不久后能再见到你。'; $lang['Congratulations, Piwigo installation is completed'] = '恭喜，Piwigo 已安装完成'; @@ -64,6 +64,5 @@ $lang['Welcome to my photo gallery'] = '欢迎来到我的相册'; $lang['Just another Piwigo gallery'] = '另一个崭新的Piwigo图库'; $lang['Don\'t hesitate to consult our forums for any help : %s'] = '欢迎来我们的论坛咨询任何Piwigo相关问题：%s'; $lang['Welcome to your new installation of Piwigo!'] = '欢迎安装Piwigo！'; -$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = '您需要联系您的主机供应商的技术支持，向其咨询如何自行转换为PHP 5。'; -$lang['localhost or other, supplied by your host provider'] = '由你的服务器提供商提供本地服务器或者其他的'; -?> \ No newline at end of file +$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = '您需要联系您的主机供应商的技术支持，向其咨询如何自行转换为PHP 5.2。'; +$lang['localhost or other, supplied by your host provider'] = '由你的服务器提供商提供本地服务器或者其他的'; \ No newline at end of file diff --git a/sources/language/zh_CN/upgrade.lang.php b/sources/language/zh_CN/upgrade.lang.php index 05f0882..d88dec9 100644 --- a/sources/language/zh_CN/upgrade.lang.php +++ b/sources/language/zh_CN/upgrade.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/language/zh_HK/admin.lang.php b/sources/language/zh_HK/admin.lang.php index ea5d0e0..b6e310f 100755 --- a/sources/language/zh_HK/admin.lang.php +++ b/sources/language/zh_HK/admin.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -437,7 +437,6 @@ $lang['new'] = '新增'; $lang['no write access'] = '沒有寫入權限'; $lang['none'] = '沒有寫入權限'; $lang['nothing'] = '沒有寫入權限'; -$lang['number of miniaturized photos'] = '數量的縮略圖建立'; $lang['on'] = '在'; $lang['on the %d selected photos'] = '在%d張已選相片上'; $lang['on the %d selected users'] = '%d的選定用戶'; @@ -497,7 +496,6 @@ $lang['You have %d orphan tags: %s.'] = '您已 %d 無關聯標籤: %s。'; $lang['You have specified $conf[\'order_by\'] in your local configuration file, this parameter in deprecated, please remove it or rename it into $conf[\'order_by_custom\'] !'] = '你已在本地設定檔選用 $conf[\'order_by\']，造成參數矛盾，請將它移除或重新命名為 $conf[\'order_by_custom\']！'; $lang['You have subscribed to receiving notifications by mail.'] = '你開通了郵件通知功能。'; $lang['You have unsubscribed from receiving notifications by mail.'] = '你取消了你的郵件通知功能。'; -$lang['You might go to plugin list to install and activate it.'] = '在插件列表中安裝和啟動插件。'; $lang['You need to confirm deletion'] = '您必須確認刪除。'; $lang['You need to upgrade your system to take full advantage of the application else the application will not work correctly, or not at all'] = '你應該升級你的系統，以充分利用該應用程序，否則應用程序可能無法正常工作，或者不是。'; $lang['Your configuration settings are saved'] = '你的設定已儲存'; @@ -830,7 +828,6 @@ $lang['Number of albums per page'] = '每頁相本數量'; $lang['Number of comments per page'] = '每頁評論數量'; $lang['Number of downloads'] = '下載次數'; $lang['Number of rates'] = '投票數'; -$lang['Number of thumbnails to create'] = '縮略圖數'; $lang['Numeric identifier : %d'] = '數字識別碼: %d'; $lang['Obsolete Plugins'] = '廢棄的插件'; $lang['On your Linux, simply install Shotwell with your package manager and the activate Piwigo publishing option.'] = '在Linux下，只需安裝Shotwell套件和啟用 Piwigo發佈選項。'; @@ -911,7 +908,6 @@ $lang['Lock'] = '上鎖'; $lang['Lock albums'] = '鎖定相冊'; $lang['Lock gallery'] = '鎖定圖庫'; $lang['Locked'] = '鎖定'; -$lang['Mail address is obligatory for all users'] = '每個用戶必須提供郵箱地址'; $lang['Mail content'] = '郵件內容'; $lang['Mail sent to %s [%s].'] = '已發送至 %s [%s].'; $lang['Mail theme'] = '郵件主題'; @@ -968,4 +964,27 @@ $lang['Invert'] = '反轉'; $lang['Close user details'] = '關閉用戶詳細信息'; $lang['Open user details'] = '打開用戶詳細信息'; $lang['close'] = '關閉'; -?> \ No newline at end of file +$lang['Activate it now'] = '立即激活'; +$lang['Allow users to add a link to their website'] = '允許用戶添加一個鏈接到他們的網站'; +$lang['Empty caddie'] = '清空盒子'; +$lang['Impossible to deactivate the default theme.'] = '無法停用默認主題。'; +$lang['Mail address is mandatory for registration'] = '登記必須要有郵件地址'; +$lang['No and unlock sub-albums'] = '否及解開子相冊'; +$lang['The settings for the guest are from the %s user'] = '訪客的設定是跟從用戶%s '; +$lang['Upload in progress'] = '正在上傳'; +$lang['based on'] = '基於'; +$lang['between %s and %s MB'] = ' +%s 和 %s MB之間'; +$lang['date & time'] = '日期和時間'; +$lang['file name'] = '檔案名稱'; +$lang['width & height'] = '寬度和高度'; +$lang['Delete %d orphan photos'] = '刪除%d個孤兒照片'; +$lang['Each email sent will contain its own automatic authentication key on links, valid for %s.'] = '每封電子郵件將包含自動認證密鑰的鏈接，有效%s。'; +$lang['Edit user'] = '編輯用戶'; +$lang['For security reason, authentication keys do not work for administrators.'] = '出於安全原因，認證密鑰對管理員工作不起作用。'; +$lang['No recipient selected'] = ' +沒有選擇收件人'; +$lang['No user is permitted to see this private album'] = '沒有用戶被允許看到這個私人相冊'; +$lang['Orphans'] = '孤兒'; +$lang['Recipients'] = '收件人'; +$lang['Y Repeat'] = 'Y 重複'; \ No newline at end of file diff --git a/sources/language/zh_HK/common.lang.php b/sources/language/zh_HK/common.lang.php index b126eae..e1ae224 100644 --- a/sources/language/zh_HK/common.lang.php +++ b/sources/language/zh_HK/common.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -22,7 +22,7 @@ // +-----------------------------------------------------------------------+ /* Language Name: 中文 (香港) [HK] -Version: 2.7.0 +Version: 2.8.2 Language URI: http://piwigo.org/ext/extension_view.php?eid=614 Author: Piwigo team Author URI: http://piwigo.org @@ -425,4 +425,5 @@ $lang['Apply on properties'] = '套用於屬性'; $lang['No results for'] = '沒有結果'; $lang['Photo description'] = '相片描述'; $lang['Photo title'] = '相片標題'; -$lang['Link: %s'] = '連結: %s'; \ No newline at end of file +$lang['Link: %s'] = '連結: %s'; +$lang['Your authentication key is no longer valid.'] = '您的認證密鑰已失效。'; \ No newline at end of file diff --git a/sources/language/zh_HK/index.php b/sources/language/zh_HK/index.php index c8de97f..0b96c3e 100644 --- a/sources/language/zh_HK/index.php +++ b/sources/language/zh_HK/index.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/language/zh_HK/install.lang.php b/sources/language/zh_HK/install.lang.php index 4a451e0..c51fbef 100755 --- a/sources/language/zh_HK/install.lang.php +++ b/sources/language/zh_HK/install.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -30,19 +30,19 @@ $lang['verification'] = '驗證'; $lang['webmaster login can\'t contain characters \' or "'] = '網站管理員登錄名稱不能包含字符\'或"'; $lang['Need help ? Ask your question on Piwigo message board.'] = '需要幫助嗎？你可以在Piwigo 留言板提出問題。'; $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = '注意：你可以更改設定，然後重新啟動Piwigo。'; -$lang['PHP 5 is required'] = '需要PHP5'; +$lang['PHP 5 is required'] = '需要PHP5.2'; $lang['Password ']['confirm'] = '密碼[確認]'; -$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo嘗試建立或修改您的.htaccess檔案, 來設定系統使用PHP5。'; -$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo的無法設定使用PHP5。'; +$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo嘗試建立或修改您的.htaccess檔案, 來設定系統使用PHP5.2。'; +$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo的無法設定使用PHP5.2。'; $lang['Sorry!'] = '對不起！'; $lang['Start Install'] = '開始安裝'; -$lang['Try to configure PHP 5'] = '嘗試設定PHP5'; +$lang['Try to configure PHP 5'] = '嘗試設定PHP5.2'; $lang['User'] = '用戶'; $lang['Visitors will be able to contact site administrator with this mail'] = '訪客可以使用這個電子郵件與網站管理員聯繫'; $lang['Welcome to my photo gallery'] = '歡迎來到我的相簿'; $lang['Welcome to your new installation of Piwigo!'] = '歡迎來到你新安裝的Piwigo！'; $lang['You can download the config file and upload it to local/config directory of your installation.'] = '您可以下載設定檔案，並裝它上傳到local/config目錄中安裝。'; -$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = '請聯繫你的網站託管服務提供商，看看你怎麼可以自己切換到PHP 5。'; +$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = '請聯繫你的網站託管服務提供商，看看你怎麼可以自己切換到PHP 5.2。'; $lang['also given by your host provider'] = '也可由網站託管服務提供商幫助設定'; $lang['Admin configuration'] = '管理員設定'; $lang['An alternate solution is to copy the text in the box above and paste it into the file "local/config/database.inc.php" (Warning : database.inc.php must only contain what is in the textarea, no line return or space character)'] = '另一種解決方案是將上面框中的文字複製，並貼到檔案 "local/config/database.inc.php"上 （警告：database.inc.php只可以包括文字框內容,不可以有，或空格字符）'; @@ -64,5 +64,4 @@ $lang['It appears your webhost is currently running PHP %s.'] = '目前您的網 $lang['It will be shown to the visitors. It is necessary for website administration'] = '這是必要的網站管理,因它會顯示給所有訪客。'; $lang['Just another Piwigo gallery'] = '只是另一個Piwigo相簿'; $lang['Keep it confidential, it enables you to access administration panel'] = '請保密，它使您能夠訪問管理面板'; -$lang['localhost or other, supplied by your host provider'] = '本地主機或其它，由你的主機提供商提供'; -?> \ No newline at end of file +$lang['localhost or other, supplied by your host provider'] = '本地主機或其它，由你的主機提供商提供'; \ No newline at end of file diff --git a/sources/language/zh_HK/upgrade.lang.php b/sources/language/zh_HK/upgrade.lang.php index 3306f66..95563c9 100755 --- a/sources/language/zh_HK/upgrade.lang.php +++ b/sources/language/zh_HK/upgrade.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/language/zh_TW/admin.lang.php b/sources/language/zh_TW/admin.lang.php index 140d15b..c1a338f 100644 --- a/sources/language/zh_TW/admin.lang.php +++ b/sources/language/zh_TW/admin.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/language/zh_TW/common.lang.php b/sources/language/zh_TW/common.lang.php index b7cb9ba..a190c7b 100644 --- a/sources/language/zh_TW/common.lang.php +++ b/sources/language/zh_TW/common.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -22,7 +22,7 @@ // +-----------------------------------------------------------------------+ /* Language Name: 中文 (繁體) [TW] -Version: 2.7.0 +Version: 2.8.2 Language URI: http://piwigo.org/ext/extension_view.php?eid=524 Author: Piwigo team Author URI: http://piwigo.org diff --git a/sources/language/zh_TW/help/photos_add_ftp.html b/sources/language/zh_TW/help/photos_add_ftp.html index 8835276..9042bc8 100755 --- a/sources/language/zh_TW/help/photos_add_ftp.html +++ b/sources/language/zh_TW/help/photos_add_ftp.html @@ -43,11 +43,20 @@ |-- video-from-plane.avi +-- pwg_representative +-- video-from-plane.jpg ++-- photoshoot + |-- img0001.jpg + |-- img0002.jpg + +-- pwg_format + |-- img0001.cr2 + |-- img0001.cmyk.jpg + |-- img0001.zip + |-- img0002.cr2 + +-- img0002.cmyk.jpg
    • -
  • Except for "pwg_representative" (see explanations below), each directory under "galleries" produces a album. There is no limit on deepness.
    • +
  • Except for "pwg_representative" and "pwg_format" (see explanations below), each directory under "galleries" produces a album. There is no limit on deepness.
  • Basically, an element is represented by a file. A file can be a Piwigo element if its extension is among file_ext @@ -56,10 +65,12 @@ be a picture if its extension is among picture_ext configuration parameter possibilities.
    • -
  • No photo elements (video, sounds, file texts, whatever you want...) are represented by default by an icon corresponding to the filename +
  • Non photo elements (video, sounds, file texts, whatever you want...) are represented by default by an icon corresponding to the filename extension. Optionally, you can associate a thumbnail and a representative file (see video.avi in the example above).
    • +
  • Multiple formats: a photo can be available in several formats. In this example, we have 3 additional formats for img0001.jpg. You can activate this feature with $conf['enable_formats'] = true; in your local configuration and define a list of formats, like $conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');
    • +
  • 警告: ​​目錄和文件的名稱必須包含字母，數字，“ - ”，“_”或“.”。不能空白，及特殊字符。
  • 一旦照片被放置在正確的 @@ -68,18 +79,3 @@ - - - - 每個目錄下的“畫廊”除為“pwg_representative”（見下面的說明），
  • 產生一個專輯。有沒有深度的限制。 - -
  • 基本上，一個元素表示的一個文件。一個文件就可以了 - Piwigo的元素，如果其擴展名之間的 file_ext - 配置參數的可能性（請參閱<跨度 - 類=“文件名”> / config_default.inc.php 文件）。一個文件可以 - 是一個圖片，如果其擴展名之間的 picture_ext - 配置參數的可能性。 - -
  • 沒有照片元素（視頻，聲音，文件文本，無論你想...）默認情況下，文件名對應一個圖標代表 - 擴展名。或者，您可以將一個縮略圖，並代表 - 文件（見video.avi在上面的例子）。 diff --git a/sources/language/zh_TW/install.lang.php b/sources/language/zh_TW/install.lang.php index cdc0ce4..b0095ac 100644 --- a/sources/language/zh_TW/install.lang.php +++ b/sources/language/zh_TW/install.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -46,13 +46,13 @@ $lang['Password [confirm]'] = '密碼 [ 確認 ]'; $lang['verification'] = '核實'; $lang['Need help ? Ask your question on Piwigo message board.'] = '需要幫助？ 請到Piwigo論壇提出你的問題.'; $lang['Visitors will be able to contact site administrator with this mail'] = '遊客通過此Email跟你聯繫'; -$lang['PHP 5 is required'] = '必須PHP 5版本'; +$lang['PHP 5 is required'] = '必須PHP 5.2版本'; $lang['It appears your webhost is currently running PHP %s.'] = '你主機PHP版本好像是PHP %s.'; -$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo試著創建或修改.htaccess文件來轉換到PHP 5。'; +$lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo試著創建或修改.htaccess文件來轉換到PHP 5.2。'; $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = '注意；你也可以自己修改設置PHP然後重新啟動Piwigo。'; -$lang['Try to configure PHP 5'] = '試試配置PHP 5'; +$lang['Try to configure PHP 5'] = '試試配置PHP 5.2'; $lang['Sorry!'] = '對不起!'; -$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo不能設置PHP 5.'; +$lang['Piwigo was not able to configure PHP 5.'] = 'Piwigo不能設置PHP 5.2'; $lang["You may referer to your hosting provider's support and see how you could switch to PHP 5 by yourself."] = '你應該聯繫你的主機管理員並向其請教如何設置PHP 5.'; $lang['Hope to see you back soon.'] = '希望下次再見到你...'; $lang['Congratulations, Piwigo installation is completed'] = '恭喜，Piwigo 已安裝完成。'; @@ -65,4 +65,4 @@ $lang['Welcome to my photo gallery'] = '歡迎進入我的相片集'; $lang['Welcome to your new installation of Piwigo!'] = '歡迎安裝Piwigo!'; $lang['Don\'t hesitate to consult our forums for any help : %s'] = '如有任何問題，請至我們的論壇提出：%s '; $lang['localhost or other, supplied by your host provider'] = '本地主機或其它，由你的主機提供商提供'; -?> \ No newline at end of file +$lang['You may referer to your hosting provider\'s support and see how you could switch to PHP 5 by yourself.'] = '你應該聯繫你的主機管理員並向其請教如何設置PHP 5.2'; \ No newline at end of file diff --git a/sources/language/zh_TW/upgrade.lang.php b/sources/language/zh_TW/upgrade.lang.php index 883b7f6..dd6c07e 100644 --- a/sources/language/zh_TW/upgrade.lang.php +++ b/sources/language/zh_TW/upgrade.lang.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/local/config/index.php b/sources/local/config/index.php index c8de97f..0b96c3e 100644 --- a/sources/local/config/index.php +++ b/sources/local/config/index.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/local/css/index.php b/sources/local/css/index.php index c8de97f..0b96c3e 100644 --- a/sources/local/css/index.php +++ b/sources/local/css/index.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/local/index.php b/sources/local/index.php index c8de97f..0b96c3e 100644 --- a/sources/local/index.php +++ b/sources/local/index.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/local/language/index.php b/sources/local/language/index.php index c8de97f..0b96c3e 100644 --- a/sources/local/language/index.php +++ b/sources/local/language/index.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/nbm.php b/sources/nbm.php index e76c341..e36b955 100644 --- a/sources/nbm.php +++ b/sources/nbm.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/notification.php b/sources/notification.php index 192348a..ffd52b8 100644 --- a/sources/notification.php +++ b/sources/notification.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/password.php b/sources/password.php index 5bc94c0..5a96ea1 100644 --- a/sources/password.php +++ b/sources/password.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -260,6 +260,8 @@ function reset_password() array('user_id' => $user_id) ); + deactivate_user_auth_keys($user_id); + $page['infos'][] = l10n('Your password has been reset'); $page['infos'][] = ''.l10n('Login').''; diff --git a/sources/picture.php b/sources/picture.php index 94c2b3e..37d65a1 100644 --- a/sources/picture.php +++ b/sources/picture.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -532,7 +532,8 @@ while ($row = pwg_db_fetch_assoc($result)) } else { // not a pic - need download link - $row['download_url'] = $row['element_url'] = get_element_url($row);; + $row['element_url'] = get_element_url($row); + $row['download_url'] = get_action_url($row['id'], 'e', true); } } @@ -662,6 +663,46 @@ foreach (array('first','previous','next','last', 'current') as $which_image) if ($conf['picture_download_icon'] and !empty($picture['current']['download_url'])) { $template->append('current', array('U_DOWNLOAD' => $picture['current']['download_url']), true); + + if ($conf['enable_formats']) + { + $query = ' +SELECT * + FROM '.IMAGE_FORMAT_TABLE.' + WHERE image_id = '.$picture['current']['id'].' +;'; + $formats = query2array($query); + + // let's add the original as a format among others. It will just have a + // specific download URL + array_unshift( + $formats, + array( + 'download_url' => $picture['current']['download_url'], + 'ext' => get_extension($picture['current']['file']), + 'filesize' => $picture['current']['filesize'], + ) + ); + + foreach ($formats as &$format) + { + if (!isset($format['download_url'])) + { + $format['download_url'] = 'action.php?format='.$format['format_id'].'&download'; + } + + $format['label'] = strtoupper($format['ext']); + $lang_key = 'format '.strtoupper($format['ext']); + if (isset($lang[$lang_key])) + { + $format['label'] = $lang[$lang_key]; + } + + $format['filesize'] = sprintf('%.1fMB', $format['filesize']/1024); + } + + $template->append('current', array('formats' => $formats), true); + } } diff --git a/sources/plugins/AdminTools/include/events.inc.php b/sources/plugins/AdminTools/include/events.inc.php index d11d59b..244e480 100644 --- a/sources/plugins/AdminTools/include/events.inc.php +++ b/sources/plugins/AdminTools/include/events.inc.php @@ -32,7 +32,7 @@ function admintools_add_public_controller() } } else if ($conf['AdminTools']['public_quick_edit'] and - script_basename() == 'picture' and $picture['current']['added_by'] == $user['id'] + script_basename() == 'picture' and $picture['current']['added_by'] == $user['id'] and !is_a_guest() ) { // only "edit" button for photo owner } @@ -245,6 +245,11 @@ function admintools_save_picture() return; } + if (is_a_guest()) + { + return; + } + $query = 'SELECT added_by FROM '. IMAGES_TABLE .' WHERE id = '. $page['image_id'] .';'; list($added_by) = pwg_db_fetch_row(pwg_query($query)); diff --git a/sources/plugins/AdminTools/language/de_DE/plugin.lang.php b/sources/plugins/AdminTools/language/de_DE/plugin.lang.php index 0177b4b..04f510b 100755 --- a/sources/plugins/AdminTools/language/de_DE/plugin.lang.php +++ b/sources/plugins/AdminTools/language/de_DE/plugin.lang.php @@ -32,8 +32,8 @@ $lang['Show SQL queries'] = 'SQL-Abfrage anzeigen'; $lang['View as'] = 'Anzeigen als'; $lang['Viewing as %s.'] = 'Aktueller Benutzer: %s'; $lang['Saved'] = 'Gespeichert'; -$lang['Closed icon position'] = 'Position des geschlossenen Icons'; -$lang['Give access to quick edit to photo owners even if they are not admin'] = 'Zugriff zum schnellen Editieren für Bildereigentümer erlauben, obwohl sie kein Administrator sind.'; +$lang['Closed icon position'] = 'Position des geschlossenen Symbolbildes'; +$lang['Give access to quick edit to photo owners even if they are not admin'] = 'Zugriff zum schnellen Editieren für Bildeigentümer erlauben, auch wenn sie keine Administratoren-Berechtigungen haben.'; $lang['Open toolbar by default'] = 'Die Werkzeugleiste standardmässig öffnen'; $lang['left'] = 'links'; $lang['right'] = 'rechts'; \ No newline at end of file diff --git a/sources/plugins/AdminTools/language/el_GR/plugin.lang.php b/sources/plugins/AdminTools/language/el_GR/plugin.lang.php index 665728d..c68397d 100755 --- a/sources/plugins/AdminTools/language/el_GR/plugin.lang.php +++ b/sources/plugins/AdminTools/language/el_GR/plugin.lang.php @@ -27,14 +27,13 @@ $lang['Save visit in history'] = 'Αποθήκευση επίσκεψης στη $lang['Save'] = 'Αποθήκευση'; $lang['Revert'] = 'Επαναφορά'; $lang['Quick edit'] = 'Γρήγορη επεξεργασία'; -$lang['Debug languages'] = 'Γλώσσες αποσφάτωσης'; -$lang['Debug template'] = 'Πρότυπο αποσφάτωσης'; +$lang['Debug languages'] = 'Γλώσσες αποσφαλμάτωσης'; +$lang['Debug template'] = 'Πρότυπο αποσφαλμάτωσης'; $lang['Properties page'] = 'Ιδιότητες σελίδας'; $lang['Combine JS&CSS'] = 'Συνδυάστε JS&CSS'; $lang['Saved'] = 'Αποθηκεύτηκε'; $lang['right'] = 'δεξιά'; $lang['left'] = 'αριστερά'; $lang['Open toolbar by default'] = 'Ανοικτή γραμμή εργαλείων από προεπιλογή'; -$lang['Give access to quick edit to photo owners even if they are not admin'] = 'Δώστε πρόσβαση σε γρήγορη επεξεργασία στους ιδιοκτήτες φωτογραφιών, ακόμη και αν δεν το διαχειριστές '; -$lang['Closed icon position'] = 'Θέση Κλειστού εικονονίδιου'; -?> \ No newline at end of file +$lang['Give access to quick edit to photo owners even if they are not admin'] = 'Δώστε πρόσβαση για γρήγορη επεξεργασία στους ιδιοκτήτες των φωτογραφιών, ακόμη και αν δεν είναι διαχειριστές '; +$lang['Closed icon position'] = 'Θέση Κλειστού εικονονίδιου'; \ No newline at end of file diff --git a/sources/plugins/AdminTools/language/ja_JP/plugin.lang.php b/sources/plugins/AdminTools/language/ja_JP/plugin.lang.php index b72fee1..c6f85b5 100644 --- a/sources/plugins/AdminTools/language/ja_JP/plugin.lang.php +++ b/sources/plugins/AdminTools/language/ja_JP/plugin.lang.php @@ -1,24 +1,24 @@ %s.'] = '%sとして閲覧中'; +$lang['Open toolbar by default'] = 'デフォルトでツールバーを開く'; +$lang['Debug languages'] = 'デバッグ時の言語'; +$lang['Combine JS&CSS'] = 'JSとCSSを結合する'; +$lang['Give access to quick edit to photo owners even if they are not admin'] = '写真のオーナ（持ち主）に、quick editの権限をadmin権限がなくても与える'; +$lang['Closed icon position'] = 'クローズアイコンの位置'; \ No newline at end of file diff --git a/sources/plugins/AdminTools/language/mn_MN/plugin.lang.php b/sources/plugins/AdminTools/language/mn_MN/plugin.lang.php index 505c16f..2d0b490 100755 --- a/sources/plugins/AdminTools/language/mn_MN/plugin.lang.php +++ b/sources/plugins/AdminTools/language/mn_MN/plugin.lang.php @@ -30,4 +30,10 @@ $lang['left'] = 'зүүн'; $lang['right'] = 'баруун'; $lang['Closed icon position'] = 'Хаагдсан дүрслэлийн байршил'; $lang['Show SQL queries'] = 'SQL query хүсэлтийг харуулах'; -$lang['Save visit in history'] = 'Хандалтыг бүртгэж хадгалах'; \ No newline at end of file +$lang['Save visit in history'] = 'Хандалтыг бүртгэж хадгалах'; +$lang['Open toolbar by default'] = 'Засварлах багажыг нээлттэй байлгах '; +$lang['Viewing as %s.'] = '%s маягаар харах'; +$lang['Give access to quick edit to photo owners even if they are not admin'] = 'Зургийн эзэд админ эрхгүй байсан ч засвар хийх боломжтой'; +$lang['Properties page'] = 'Дэлгэрэнгүй үзүүлэлт'; +$lang['Debug languages'] = 'Хэлийг засах'; +$lang['Debug template'] = 'Загварыг засах'; \ No newline at end of file diff --git a/sources/plugins/AdminTools/language/nb_NO/plugin.lang.php b/sources/plugins/AdminTools/language/nb_NO/plugin.lang.php index f3ef67d..5a8d427 100755 --- a/sources/plugins/AdminTools/language/nb_NO/plugin.lang.php +++ b/sources/plugins/AdminTools/language/nb_NO/plugin.lang.php @@ -24,7 +24,7 @@ $lang['Combine JS&CSS'] = 'Kombiner JS&CSS'; $lang['Debug languages'] = 'Feilsøkingspråk'; $lang['Debug template'] = 'Feilsøking tema'; $lang['Properties page'] = 'Egenskapersiden'; -$lang['Quick edit'] = 'Rask endring'; +$lang['Quick edit'] = 'Hurtigredigering'; $lang['Revert'] = 'Omgjøre'; $lang['Save'] = 'Lagre'; $lang['Save visit in history'] = 'Lagre besøkshistorie'; @@ -33,8 +33,7 @@ $lang['Show SQL queries'] = 'Vis SQL spørringer'; $lang['View as'] = 'Se alle'; $lang['Viewing as %s.'] = 'Se som %s.'; $lang['Closed icon position'] = 'Låst ikonposisjon'; -$lang['Give access to quick edit to photo owners even if they are not admin'] = 'Gi tilgang til hurtigredigering av bildeeier, selv om de ikke er admin'; +$lang['Give access to quick edit to photo owners even if they are not admin'] = 'Gi tilgang til bildets eier for hurtigredigering, selv om de ikke er admin'; $lang['Open toolbar by default'] = 'Åpne verktøy automatisk'; $lang['left'] = 'venstre'; -$lang['right'] = 'høyre'; -?> \ No newline at end of file +$lang['right'] = 'høyre'; \ No newline at end of file diff --git a/sources/plugins/AdminTools/main.inc.php b/sources/plugins/AdminTools/main.inc.php index 5928dd5..258d4b6 100644 --- a/sources/plugins/AdminTools/main.inc.php +++ b/sources/plugins/AdminTools/main.inc.php @@ -1,7 +1,7 @@ \ No newline at end of file +$lang['locfiledit_webmaster_only'] = 'Nur Webmaster können lokale Dateien erstellen oder verändern.'; \ No newline at end of file diff --git a/sources/plugins/LocalFilesEditor/main.inc.php b/sources/plugins/LocalFilesEditor/main.inc.php index ad7f95e..3f33af4 100644 --- a/sources/plugins/LocalFilesEditor/main.inc.php +++ b/sources/plugins/LocalFilesEditor/main.inc.php @@ -23,7 +23,7 @@ /* Plugin Name: LocalFiles Editor -Version: 2.7.1 +Version: 2.8.2 Description: Edit local files from administration panel Plugin URI: http://piwigo.org/ext/extension_view.php?eid=144 Author: Piwigo team @@ -67,4 +67,4 @@ function localfiles_css_link_prefilter($content, &$smarty) add_event_handler('get_admin_plugin_menu_links', 'localfiles_admin_menu'); add_event_handler('loc_begin_admin', 'localfiles_css_link'); -?> \ No newline at end of file +?> diff --git a/sources/plugins/TakeATour/admin.php b/sources/plugins/TakeATour/admin.php index 1f3d44d..c0dea33 100644 --- a/sources/plugins/TakeATour/admin.php +++ b/sources/plugins/TakeATour/admin.php @@ -5,10 +5,19 @@ if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!'); global $template, $conf, $user, $page; load_language('plugin.lang', PHPWG_PLUGINS_PATH .'TakeATour/'); + +$tat_28url = 'http://'; +if (substr($user['language'],0,2) == 'fr') +{ + $tat_28url.= 'fr.'; +} +$tat_28url.= 'piwigo.org/releases/2.8.0'; + $template->assign( array( 'F_ACTION' => get_root_url().'admin.php', - 'pwg_token' => get_pwg_token() + 'pwg_token' => get_pwg_token(), + 'TAT_28URL' => $tat_28url, ) ); diff --git a/sources/plugins/TakeATour/css/bootstrap-tour-standalone.css b/sources/plugins/TakeATour/css/bootstrap-tour-standalone.css index 25b338b..a554af8 100644 --- a/sources/plugins/TakeATour/css/bootstrap-tour-standalone.css +++ b/sources/plugins/TakeATour/css/bootstrap-tour-standalone.css @@ -1,21 +1,24 @@ -/* =========================================================== -# bootstrap-tour - v0.9.3 -# http://bootstraptour.com -# ============================================================== -# Copyright 2012-2013 Ulrich Sossou -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -*/ +/* ======================================================================== + * bootstrap-tour - v0.10.1 + * http://bootstraptour.com + * ======================================================================== + * Copyright 2012-2013 Ulrich Sossou + * + * ======================================================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ======================================================================== + */ + /*! * Bootstrap v3.1.0 (http://getbootstrap.com) * Copyright 2011-2014 Twitter, Inc. @@ -33,14 +36,16 @@ white-space: nowrap; padding: 6px 12px; font-size: 14px; - line-height: 1.428571429; + line-height: 1.42857143; border-radius: 4px; -webkit-user-select: none; -moz-user-select: none; -ms-user-select: none; user-select: none; } -.btn:focus { +.btn:focus, +.btn:active:focus, +.btn.active:focus { outline: thin dotted; outline: 5px auto -webkit-focus-ring-color; outline-offset: -2px; @@ -76,14 +81,14 @@ fieldset[disabled] .btn { .btn-default:focus, .btn-default:active, .btn-default.active, -.open .dropdown-toggle.btn-default { +.open > .dropdown-toggle.btn-default { color: #333333; - background-color: #ebebeb; + background-color: #e6e6e6; border-color: #adadad; } .btn-default:active, .btn-default.active, -.open .dropdown-toggle.btn-default { +.open > .dropdown-toggle.btn-default { background-image: none; } .btn-default.disabled, @@ -108,54 +113,320 @@ fieldset[disabled] .btn-default.active { color: #ffffff; background-color: #333333; } -.btn-sm { +.btn-primary { + color: #ffffff; + background-color: #428bca; + border-color: #357ebd; +} +.btn-primary:hover, +.btn-primary:focus, +.btn-primary:active, +.btn-primary.active, +.open > .dropdown-toggle.btn-primary { + color: #ffffff; + background-color: #3071a9; + border-color: #285e8e; +} +.btn-primary:active, +.btn-primary.active, +.open > .dropdown-toggle.btn-primary { + background-image: none; +} +.btn-primary.disabled, +.btn-primary[disabled], +fieldset[disabled] .btn-primary, +.btn-primary.disabled:hover, +.btn-primary[disabled]:hover, +fieldset[disabled] .btn-primary:hover, +.btn-primary.disabled:focus, +.btn-primary[disabled]:focus, +fieldset[disabled] .btn-primary:focus, +.btn-primary.disabled:active, +.btn-primary[disabled]:active, +fieldset[disabled] .btn-primary:active, +.btn-primary.disabled.active, +.btn-primary[disabled].active, +fieldset[disabled] .btn-primary.active { + background-color: #428bca; + border-color: #357ebd; +} +.btn-primary .badge { + color: #428bca; + background-color: #ffffff; +} +.btn-success { + color: #ffffff; + background-color: #5cb85c; + border-color: #4cae4c; +} +.btn-success:hover, +.btn-success:focus, +.btn-success:active, +.btn-success.active, +.open > .dropdown-toggle.btn-success { + color: #ffffff; + background-color: #449d44; + border-color: #398439; +} +.btn-success:active, +.btn-success.active, +.open > .dropdown-toggle.btn-success { + background-image: none; +} +.btn-success.disabled, +.btn-success[disabled], +fieldset[disabled] .btn-success, +.btn-success.disabled:hover, +.btn-success[disabled]:hover, +fieldset[disabled] .btn-success:hover, +.btn-success.disabled:focus, +.btn-success[disabled]:focus, +fieldset[disabled] .btn-success:focus, +.btn-success.disabled:active, +.btn-success[disabled]:active, +fieldset[disabled] .btn-success:active, +.btn-success.disabled.active, +.btn-success[disabled].active, +fieldset[disabled] .btn-success.active { + background-color: #5cb85c; + border-color: #4cae4c; +} +.btn-success .badge { + color: #5cb85c; + background-color: #ffffff; +} +.btn-info { + color: #ffffff; + background-color: #5bc0de; + border-color: #46b8da; +} +.btn-info:hover, +.btn-info:focus, +.btn-info:active, +.btn-info.active, +.open > .dropdown-toggle.btn-info { + color: #ffffff; + background-color: #31b0d5; + border-color: #269abc; +} +.btn-info:active, +.btn-info.active, +.open > .dropdown-toggle.btn-info { + background-image: none; +} +.btn-info.disabled, +.btn-info[disabled], +fieldset[disabled] .btn-info, +.btn-info.disabled:hover, +.btn-info[disabled]:hover, +fieldset[disabled] .btn-info:hover, +.btn-info.disabled:focus, +.btn-info[disabled]:focus, +fieldset[disabled] .btn-info:focus, +.btn-info.disabled:active, +.btn-info[disabled]:active, +fieldset[disabled] .btn-info:active, +.btn-info.disabled.active, +.btn-info[disabled].active, +fieldset[disabled] .btn-info.active { + background-color: #5bc0de; + border-color: #46b8da; +} +.btn-info .badge { + color: #5bc0de; + background-color: #ffffff; +} +.btn-warning { + color: #ffffff; + background-color: #f0ad4e; + border-color: #eea236; +} +.btn-warning:hover, +.btn-warning:focus, +.btn-warning:active, +.btn-warning.active, +.open > .dropdown-toggle.btn-warning { + color: #ffffff; + background-color: #ec971f; + border-color: #d58512; +} +.btn-warning:active, +.btn-warning.active, +.open > .dropdown-toggle.btn-warning { + background-image: none; +} +.btn-warning.disabled, +.btn-warning[disabled], +fieldset[disabled] .btn-warning, +.btn-warning.disabled:hover, +.btn-warning[disabled]:hover, +fieldset[disabled] .btn-warning:hover, +.btn-warning.disabled:focus, +.btn-warning[disabled]:focus, +fieldset[disabled] .btn-warning:focus, +.btn-warning.disabled:active, +.btn-warning[disabled]:active, +fieldset[disabled] .btn-warning:active, +.btn-warning.disabled.active, +.btn-warning[disabled].active, +fieldset[disabled] .btn-warning.active { + background-color: #f0ad4e; + border-color: #eea236; +} +.btn-warning .badge { + color: #f0ad4e; + background-color: #ffffff; +} +.btn-danger { + color: #ffffff; + background-color: #d9534f; + border-color: #d43f3a; +} +.btn-danger:hover, +.btn-danger:focus, +.btn-danger:active, +.btn-danger.active, +.open > .dropdown-toggle.btn-danger { + color: #ffffff; + background-color: #c9302c; + border-color: #ac2925; +} +.btn-danger:active, +.btn-danger.active, +.open > .dropdown-toggle.btn-danger { + background-image: none; +} +.btn-danger.disabled, +.btn-danger[disabled], +fieldset[disabled] .btn-danger, +.btn-danger.disabled:hover, +.btn-danger[disabled]:hover, +fieldset[disabled] .btn-danger:hover, +.btn-danger.disabled:focus, +.btn-danger[disabled]:focus, +fieldset[disabled] .btn-danger:focus, +.btn-danger.disabled:active, +.btn-danger[disabled]:active, +fieldset[disabled] .btn-danger:active, +.btn-danger.disabled.active, +.btn-danger[disabled].active, +fieldset[disabled] .btn-danger.active { + background-color: #d9534f; + border-color: #d43f3a; +} +.btn-danger .badge { + color: #d9534f; + background-color: #ffffff; +} +.btn-link { + color: #428bca; + font-weight: normal; + cursor: pointer; + border-radius: 0; +} +.btn-link, +.btn-link:active, +.btn-link[disabled], +fieldset[disabled] .btn-link { + background-color: transparent; + -webkit-box-shadow: none; + box-shadow: none; +} +.btn-link, +.btn-link:hover, +.btn-link:focus, +.btn-link:active { + border-color: transparent; +} +.btn-link:hover, +.btn-link:focus { + color: #2a6496; + text-decoration: underline; + background-color: transparent; +} +.btn-link[disabled]:hover, +fieldset[disabled] .btn-link:hover, +.btn-link[disabled]:focus, +fieldset[disabled] .btn-link:focus { + color: #777777; + text-decoration: none; +} +.btn-lg, +.btn-group-lg > .btn { + padding: 10px 16px; + font-size: 18px; + line-height: 1.33; + border-radius: 6px; +} +.btn-sm, +.btn-group-sm > .btn { padding: 5px 10px; font-size: 12px; line-height: 1.5; border-radius: 3px; } -.fade { - opacity: 0; - -webkit-transition: opacity 0.15s linear; - transition: opacity 0.15s linear; +.btn-xs, +.btn-group-xs > .btn { + padding: 1px 5px; + font-size: 12px; + line-height: 1.5; + border-radius: 3px; } -.fade.in { - opacity: 1; -} -.collapse { - display: none; -} -.collapse.in { +.btn-block { display: block; + width: 100%; } -.collapsing { - position: relative; - height: 0; - overflow: hidden; - -webkit-transition: height 0.35s ease; - transition: height 0.35s ease; +.btn-block + .btn-block { + margin-top: 5px; } -.btn-group { +input[type="submit"].btn-block, +input[type="reset"].btn-block, +input[type="button"].btn-block { + width: 100%; +} +.btn-group, +.btn-group-vertical { position: relative; display: inline-block; vertical-align: middle; } -.btn-group > .btn { +.btn-group > .btn, +.btn-group-vertical > .btn { position: relative; float: left; } .btn-group > .btn:hover, +.btn-group-vertical > .btn:hover, .btn-group > .btn:focus, +.btn-group-vertical > .btn:focus, .btn-group > .btn:active, -.btn-group > .btn.active { +.btn-group-vertical > .btn:active, +.btn-group > .btn.active, +.btn-group-vertical > .btn.active { z-index: 2; } -.btn-group > .btn:focus { - outline: none; +.btn-group > .btn:focus, +.btn-group-vertical > .btn:focus { + outline: 0; } -.btn-group .btn + .btn { +.btn-group .btn + .btn, +.btn-group .btn + .btn-group, +.btn-group .btn-group + .btn, +.btn-group .btn-group + .btn-group { margin-left: -1px; } +.btn-toolbar { + margin-left: -5px; +} +.btn-toolbar .btn-group, +.btn-toolbar .input-group { + float: left; +} +.btn-toolbar > .btn, +.btn-toolbar > .btn-group, +.btn-toolbar > .input-group { + margin-left: 5px; +} .btn-group > .btn:not(:first-child):not(:last-child):not(.dropdown-toggle) { border-radius: 0; } @@ -166,15 +437,129 @@ fieldset[disabled] .btn-default.active { border-bottom-right-radius: 0; border-top-right-radius: 0; } -.btn-group > .btn:last-child:not(:first-child) { +.btn-group > .btn:last-child:not(:first-child), +.btn-group > .dropdown-toggle:not(:first-child) { border-bottom-left-radius: 0; border-top-left-radius: 0; } +.btn-group > .btn-group { + float: left; +} +.btn-group > .btn-group:not(:first-child):not(:last-child) > .btn { + border-radius: 0; +} +.btn-group > .btn-group:first-child > .btn:last-child, +.btn-group > .btn-group:first-child > .dropdown-toggle { + border-bottom-right-radius: 0; + border-top-right-radius: 0; +} +.btn-group > .btn-group:last-child > .btn:first-child { + border-bottom-left-radius: 0; + border-top-left-radius: 0; +} +.btn-group .dropdown-toggle:active, +.btn-group.open .dropdown-toggle { + outline: 0; +} +.btn-group > .btn + .dropdown-toggle { + padding-left: 8px; + padding-right: 8px; +} +.btn-group > .btn-lg + .dropdown-toggle { + padding-left: 12px; + padding-right: 12px; +} +.btn-group.open .dropdown-toggle { + -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); + box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); +} +.btn-group.open .dropdown-toggle.btn-link { + -webkit-box-shadow: none; + box-shadow: none; +} +.btn .caret { + margin-left: 0; +} +.btn-lg .caret { + border-width: 5px 5px 0; + border-bottom-width: 0; +} +.dropup .btn-lg .caret { + border-width: 0 5px 5px; +} +.btn-group-vertical > .btn, +.btn-group-vertical > .btn-group, +.btn-group-vertical > .btn-group > .btn { + display: block; + float: none; + width: 100%; + max-width: 100%; +} +.btn-group-vertical > .btn-group > .btn { + float: none; +} +.btn-group-vertical > .btn + .btn, +.btn-group-vertical > .btn + .btn-group, +.btn-group-vertical > .btn-group + .btn, +.btn-group-vertical > .btn-group + .btn-group { + margin-top: -1px; + margin-left: 0; +} +.btn-group-vertical > .btn:not(:first-child):not(:last-child) { + border-radius: 0; +} +.btn-group-vertical > .btn:first-child:not(:last-child) { + border-top-right-radius: 4px; + border-bottom-right-radius: 0; + border-bottom-left-radius: 0; +} +.btn-group-vertical > .btn:last-child:not(:first-child) { + border-bottom-left-radius: 4px; + border-top-right-radius: 0; + border-top-left-radius: 0; +} +.btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn { + border-radius: 0; +} +.btn-group-vertical > .btn-group:first-child:not(:last-child) > .btn:last-child, +.btn-group-vertical > .btn-group:first-child:not(:last-child) > .dropdown-toggle { + border-bottom-right-radius: 0; + border-bottom-left-radius: 0; +} +.btn-group-vertical > .btn-group:last-child:not(:first-child) > .btn:first-child { + border-top-right-radius: 0; + border-top-left-radius: 0; +} +.btn-group-justified { + display: table; + width: 100%; + table-layout: fixed; + border-collapse: separate; +} +.btn-group-justified > .btn, +.btn-group-justified > .btn-group { + float: none; + display: table-cell; + width: 1%; +} +.btn-group-justified > .btn-group .btn { + width: 100%; +} +.btn-group-justified > .btn-group .dropdown-menu { + left: auto; +} +[data-toggle="buttons"] > .btn > input[type="radio"], +[data-toggle="buttons"] > .btn > input[type="checkbox"] { + position: absolute; + z-index: -1; + opacity: 0; + filter: alpha(opacity=0); +} .popover { position: absolute; top: 0; left: 0; - z-index: 1010; + z-index: 1060; display: none; max-width: 276px; padding: 1px; @@ -289,7 +674,6 @@ fieldset[disabled] .btn-default.active { border-left-color: #ffffff; bottom: -10px; } - .tour-backdrop { position: fixed; top: 0; @@ -299,14 +683,19 @@ fieldset[disabled] .btn-default.active { z-index: 1100; background-color: #000; opacity: 0.8; + filter: alpha(opacity=80); } .tour-step-backdrop { position: relative; z-index: 1101; background: inherit; } +.tour-step-backdrop > td { + position: relative; + z-index: 1101; +} .tour-step-background { - position: absolute; + position: absolute !important; z-index: 1100; background: inherit; border-radius: 6px; diff --git a/sources/plugins/TakeATour/js/custom-bootstrap-tour-standalone.js b/sources/plugins/TakeATour/js/custom-bootstrap-tour-standalone.js index 28308b8..cab870c 100644 --- a/sources/plugins/TakeATour/js/custom-bootstrap-tour-standalone.js +++ b/sources/plugins/TakeATour/js/custom-bootstrap-tour-standalone.js @@ -1,1301 +1,1388 @@ -/* =========================================================== -# bootstrap-tour - v0.9.3 -# http://bootstraptour.com -# ============================================================== -# Copyright 2012-2013 Ulrich Sossou -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -*/ -/* ======================================================================== - * Bootstrap: transition.js v3.1.1 - * http://getbootstrap.com/javascript/#transitions - * ======================================================================== - * Copyright 2011-2014 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) - * ======================================================================== */ - - -+function ($) { - 'use strict'; - - // CSS TRANSITION SUPPORT (Shoutout: http://www.modernizr.com/) - // ============================================================ - - function transitionEnd() { - var el = document.createElement('bootstrap') - - var transEndEventNames = { - 'WebkitTransition' : 'webkitTransitionEnd', - 'MozTransition' : 'transitionend', - 'OTransition' : 'oTransitionEnd otransitionend', - 'transition' : 'transitionend' - } - - for (var name in transEndEventNames) { - if (el.style[name] !== undefined) { - return { end: transEndEventNames[name] } - } - } - - return false // explicit for ie8 ( ._.) - } - - // http://blog.alexmaccaw.com/css-transitions - $.fn.emulateTransitionEnd = function (duration) { - var called = false, $el = this - $(this).one($.support.transition.end, function () { called = true }) - var callback = function () { if (!called) $($el).trigger($.support.transition.end) } - setTimeout(callback, duration) - return this - } - - $(function () { - $.support.transition = transitionEnd() - }) - -}(jQuery); - -/* ======================================================================== - * Bootstrap: tooltip.js v3.1.1 - * http://getbootstrap.com/javascript/#tooltip - * Inspired by the original jQuery.tipsy by Jason Frame - * ======================================================================== - * Copyright 2011-2014 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) - * ======================================================================== */ - - -+function ($) { - 'use strict'; - - // TOOLTIP PUBLIC CLASS DEFINITION - // =============================== - - var Tooltip = function (element, options) { - this.type = - this.options = - this.enabled = - this.timeout = - this.hoverState = - this.$element = null - - this.init('tooltip', element, options) - } - - Tooltip.DEFAULTS = { - animation: true, - placement: 'top', - selector: false, - template: '
    ', - trigger: 'hover focus', - title: '', - delay: 0, - html: false, - container: false - } - - Tooltip.prototype.init = function (type, element, options) { - this.enabled = true - this.type = type - this.$element = $(element) - this.options = this.getOptions(options) - - var triggers = this.options.trigger.split(' ') - - for (var i = triggers.length; i--;) { - var trigger = triggers[i] - - if (trigger == 'click') { - this.$element.on('click.' + this.type, this.options.selector, $.proxy(this.toggle, this)) - } else if (trigger != 'manual') { - var eventIn = trigger == 'hover' ? 'mouseenter' : 'focusin' - var eventOut = trigger == 'hover' ? 'mouseleave' : 'focusout' - - this.$element.on(eventIn + '.' + this.type, this.options.selector, $.proxy(this.enter, this)) - this.$element.on(eventOut + '.' + this.type, this.options.selector, $.proxy(this.leave, this)) - } - } - - this.options.selector ? - (this._options = $.extend({}, this.options, { trigger: 'manual', selector: '' })) : - this.fixTitle() - } - - Tooltip.prototype.getDefaults = function () { - return Tooltip.DEFAULTS - } - - Tooltip.prototype.getOptions = function (options) { - options = $.extend({}, this.getDefaults(), this.$element.data(), options) - - if (options.delay && typeof options.delay == 'number') { - options.delay = { - show: options.delay, - hide: options.delay - } - } - - return options - } - - Tooltip.prototype.getDelegateOptions = function () { - var options = {} - var defaults = this.getDefaults() - - this._options && $.each(this._options, function (key, value) { - if (defaults[key] != value) options[key] = value - }) - - return options - } - - Tooltip.prototype.enter = function (obj) { - var self = obj instanceof this.constructor ? - obj : $(obj.currentTarget)[this.type](this.getDelegateOptions()).data('bs.' + this.type) - - clearTimeout(self.timeout) - - self.hoverState = 'in' - - if (!self.options.delay || !self.options.delay.show) return self.show() - - self.timeout = setTimeout(function () { - if (self.hoverState == 'in') self.show() - }, self.options.delay.show) - } - - Tooltip.prototype.leave = function (obj) { - var self = obj instanceof this.constructor ? - obj : $(obj.currentTarget)[this.type](this.getDelegateOptions()).data('bs.' + this.type) - - clearTimeout(self.timeout) - - self.hoverState = 'out' - - if (!self.options.delay || !self.options.delay.hide) return self.hide() - - self.timeout = setTimeout(function () { - if (self.hoverState == 'out') self.hide() - }, self.options.delay.hide) - } - - Tooltip.prototype.show = function () { - var e = $.Event('show.bs.' + this.type) - - if (this.hasContent() && this.enabled) { - this.$element.trigger(e) - - if (e.isDefaultPrevented()) return - var that = this; - - var $tip = this.tip() - - this.setContent() - - if (this.options.animation) $tip.addClass('fade') - - var placement = typeof this.options.placement == 'function' ? - this.options.placement.call(this, $tip[0], this.$element[0]) : - this.options.placement - - var autoToken = /\s?auto?\s?/i - var autoPlace = autoToken.test(placement) - if (autoPlace) placement = placement.replace(autoToken, '') || 'top' - - $tip - .detach() - .css({ top: 0, left: 0, display: 'block' }) - .addClass(placement) - - this.options.container ? $tip.appendTo(this.options.container) : $tip.insertAfter(this.$element) - - var pos = this.getPosition() - var actualWidth = $tip[0].offsetWidth - var actualHeight = $tip[0].offsetHeight - - if (autoPlace) { - var $parent = this.$element.parent() - - var orgPlacement = placement - var docScroll = document.documentElement.scrollTop || document.body.scrollTop - var parentWidth = this.options.container == 'body' ? window.innerWidth : $parent.outerWidth() - var parentHeight = this.options.container == 'body' ? window.innerHeight : $parent.outerHeight() - var parentLeft = this.options.container == 'body' ? 0 : $parent.offset().left - - placement = placement == 'bottom' && pos.top + pos.height + actualHeight - docScroll > parentHeight ? 'top' : - placement == 'top' && pos.top - docScroll - actualHeight < 0 ? 'bottom' : - placement == 'right' && pos.right + actualWidth > parentWidth ? 'left' : - placement == 'left' && pos.left - actualWidth < parentLeft ? 'right' : - placement - - $tip - .removeClass(orgPlacement) - .addClass(placement) - } - - var calculatedOffset = this.getCalculatedOffset(placement, pos, actualWidth, actualHeight) - - this.applyPlacement(calculatedOffset, placement) - this.hoverState = null - - var complete = function() { - that.$element.trigger('shown.bs.' + that.type) - } - - $.support.transition && this.$tip.hasClass('fade') ? - $tip - .one($.support.transition.end, complete) - .emulateTransitionEnd(150) : - complete() - } - } - - Tooltip.prototype.applyPlacement = function (offset, placement) { - var replace - var $tip = this.tip() - var width = $tip[0].offsetWidth - var height = $tip[0].offsetHeight - - // manually read margins because getBoundingClientRect includes difference - var marginTop = parseInt($tip.css('margin-top'), 10) - var marginLeft = parseInt($tip.css('margin-left'), 10) - - // we must check for NaN for ie 8/9 - if (isNaN(marginTop)) marginTop = 0 - if (isNaN(marginLeft)) marginLeft = 0 - - offset.top = offset.top + marginTop - offset.left = offset.left + marginLeft - - // $.fn.offset doesn't round pixel values - // so we use setOffset directly with our own function B-0 - $.offset.setOffset($tip[0], $.extend({ - using: function (props) { - $tip.css({ - top: Math.round(props.top), - left: Math.round(props.left) - }) - } - }, offset), 0) - - $tip.addClass('in') - - // check to see if placing tip in new offset caused the tip to resize itself - var actualWidth = $tip[0].offsetWidth - var actualHeight = $tip[0].offsetHeight - - if (placement == 'top' && actualHeight != height) { - replace = true - offset.top = offset.top + height - actualHeight - } - - if (/bottom|top/.test(placement)) { - var delta = 0 - - if (offset.left < 0) { - delta = offset.left * -2 - offset.left = 0 - - $tip.offset(offset) - - actualWidth = $tip[0].offsetWidth - actualHeight = $tip[0].offsetHeight - } - - this.replaceArrow(delta - width + actualWidth, actualWidth, 'left') - } else { - this.replaceArrow(actualHeight - height, actualHeight, 'top') - } - - if (replace) $tip.offset(offset) - } - - Tooltip.prototype.replaceArrow = function (delta, dimension, position) { - this.arrow().css(position, delta ? (50 * (1 - delta / dimension) + '%') : '') - } - - Tooltip.prototype.setContent = function () { - var $tip = this.tip() - var title = this.getTitle() - - $tip.find('.tooltip-inner')[this.options.html ? 'html' : 'text'](title) - $tip.removeClass('fade in top bottom left right') - } - - Tooltip.prototype.hide = function () { - var that = this - var $tip = this.tip() - var e = $.Event('hide.bs.' + this.type) - - function complete() { - if (that.hoverState != 'in') $tip.detach() - that.$element.trigger('hidden.bs.' + that.type) - } - - this.$element.trigger(e) - - if (e.isDefaultPrevented()) return - - $tip.removeClass('in') - - $.support.transition && this.$tip.hasClass('fade') ? - $tip - .one($.support.transition.end, complete) - .emulateTransitionEnd(150) : - complete() - - this.hoverState = null - - return this - } - - Tooltip.prototype.fixTitle = function () { - var $e = this.$element - if ($e.attr('title') || typeof($e.attr('data-original-title')) != 'string') { - $e.attr('data-original-title', $e.attr('title') || '').attr('title', '') - } - } - - Tooltip.prototype.hasContent = function () { - return this.getTitle() - } - - Tooltip.prototype.getPosition = function () { - var el = this.$element[0] - return $.extend({}, (typeof el.getBoundingClientRect == 'function') ? el.getBoundingClientRect() : { - width: el.offsetWidth, - height: el.offsetHeight - }, this.$element.offset()) - } - - Tooltip.prototype.getCalculatedOffset = function (placement, pos, actualWidth, actualHeight) { - return placement == 'bottom' ? { top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2 } : - placement == 'top' ? { top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2 } : - placement == 'left' ? { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth } : - /* placement == 'right' */ { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width } - } - - Tooltip.prototype.getTitle = function () { - var title - var $e = this.$element - var o = this.options - - title = $e.attr('data-original-title') - || (typeof o.title == 'function' ? o.title.call($e[0]) : o.title) - - return title - } - - Tooltip.prototype.tip = function () { - return this.$tip = this.$tip || $(this.options.template) - } - - Tooltip.prototype.arrow = function () { - return this.$arrow = this.$arrow || this.tip().find('.tooltip-arrow') - } - - Tooltip.prototype.validate = function () { - if (!this.$element[0].parentNode) { - this.hide() - this.$element = null - this.options = null - } - } - - Tooltip.prototype.enable = function () { - this.enabled = true - } - - Tooltip.prototype.disable = function () { - this.enabled = false - } - - Tooltip.prototype.toggleEnabled = function () { - this.enabled = !this.enabled - } - - Tooltip.prototype.toggle = function (e) { - var self = e ? $(e.currentTarget)[this.type](this.getDelegateOptions()).data('bs.' + this.type) : this - self.tip().hasClass('in') ? self.leave(self) : self.enter(self) - } - - Tooltip.prototype.destroy = function () { - clearTimeout(this.timeout) - this.hide().$element.off('.' + this.type).removeData('bs.' + this.type) - } - - - // TOOLTIP PLUGIN DEFINITION - // ========================= - - var old = $.fn.tooltip - - $.fn.tooltip = function (option) { - return this.each(function () { - var $this = $(this) - var data = $this.data('bs.tooltip') - var options = typeof option == 'object' && option - - if (!data && option == 'destroy') return - if (!data) $this.data('bs.tooltip', (data = new Tooltip(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.tooltip.Constructor = Tooltip - - - // TOOLTIP NO CONFLICT - // =================== - - $.fn.tooltip.noConflict = function () { - $.fn.tooltip = old - return this - } - -}(jQuery); - -/* ======================================================================== - * Bootstrap: popover.js v3.1.1 - * http://getbootstrap.com/javascript/#popovers - * ======================================================================== - * Copyright 2011-2014 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) - * ======================================================================== */ - - -+function ($) { - 'use strict'; - - // POPOVER PUBLIC CLASS DEFINITION - // =============================== - - var Popover = function (element, options) { - this.init('popover', element, options) - } - - if (!$.fn.tooltip) throw new Error('Popover requires tooltip.js') - - Popover.DEFAULTS = $.extend({}, $.fn.tooltip.Constructor.DEFAULTS, { - placement: 'right', - trigger: 'click', - content: '', - template: '

    ' - }) - - - // NOTE: POPOVER EXTENDS tooltip.js - // ================================ - - Popover.prototype = $.extend({}, $.fn.tooltip.Constructor.prototype) - - Popover.prototype.constructor = Popover - - Popover.prototype.getDefaults = function () { - return Popover.DEFAULTS - } - - Popover.prototype.setContent = function () { - var $tip = this.tip() - var title = this.getTitle() - var content = this.getContent() - - $tip.find('.popover-title')[this.options.html ? 'html' : 'text'](title) - $tip.find('.popover-content')[ // we use append for html objects to maintain js events - this.options.html ? (typeof content == 'string' ? 'html' : 'append') : 'text' - ](content) - - $tip.removeClass('fade top bottom left right in') - - // IE8 doesn't accept hiding via the `:empty` pseudo selector, we have to do - // this manually by checking the contents. - if (!$tip.find('.popover-title').html()) $tip.find('.popover-title').hide() - } - - Popover.prototype.hasContent = function () { - return this.getTitle() || this.getContent() - } - - Popover.prototype.getContent = function () { - var $e = this.$element - var o = this.options - - return $e.attr('data-content') - || (typeof o.content == 'function' ? - o.content.call($e[0]) : - o.content) - } - - Popover.prototype.arrow = function () { - return this.$arrow = this.$arrow || this.tip().find('.arrow') - } - - Popover.prototype.tip = function () { - if (!this.$tip) this.$tip = $(this.options.template) - return this.$tip - } - - - // POPOVER PLUGIN DEFINITION - // ========================= - - var old = $.fn.popover - - $.fn.popover = function (option) { - return this.each(function () { - var $this = $(this) - var data = $this.data('bs.popover') - var options = typeof option == 'object' && option - - if (!data && option == 'destroy') return - if (!data) $this.data('bs.popover', (data = new Popover(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.popover.Constructor = Popover - - - // POPOVER NO CONFLICT - // =================== - - $.fn.popover.noConflict = function () { - $.fn.popover = old - return this - } - -}(jQuery); - -(function($, window) { - var Tour, document; - document = window.document; - Tour = (function() { - function Tour(options) { - var storage; - try { - storage = window.localStorage; - } catch (_error) { - storage = false; - } - this._options = $.extend({ - name: "tour", - steps: [], - container: "body", - keyboard: true, - storage: storage, - debug: false, - backdrop: false, - redirect: true, - orphan: false, - duration: false, - basePath: "", - template: "

    ", - afterSetState: function(key, value) {}, - afterGetState: function(key, value) {}, - afterRemoveState: function(key) {}, - onStart: function(tour) {}, - onEnd: function(tour) {}, - onShow: function(tour) {}, - onShown: function(tour) {}, - onHide: function(tour) {}, - onHidden: function(tour) {}, - onNext: function(tour) {}, - onPrev: function(tour) {}, - onPause: function(tour, duration) {}, - onResume: function(tour, duration) {} - }, options); - this._force = false; - this._inited = false; - this.backdrop = { - overlay: null, - $element: null, - $background: null, - backgroundShown: false, - overlayElementShown: false - }; - this; - } - - Tour.prototype.addSteps = function(steps) { - var step, _i, _len; - for (_i = 0, _len = steps.length; _i < _len; _i++) { - step = steps[_i]; - this.addStep(step); - } - return this; - }; - - Tour.prototype.addStep = function(step) { - this._options.steps.push(step); - return this; - }; - - Tour.prototype.getStep = function(i) { - if (this._options.steps[i] != null) { - return $.extend({ - id: "step-" + i, - path: "", - placement: "right", - title: "", - content: "

    ", - next: i === this._options.steps.length - 1 ? -1 : i + 1, - prev: i - 1, - animation: true, - container: this._options.container, - backdrop: this._options.backdrop, - redirect: this._options.redirect, - orphan: this._options.orphan, - duration: this._options.duration, - template: this._options.template, - onShow: this._options.onShow, - onShown: this._options.onShown, - onHide: this._options.onHide, - onHidden: this._options.onHidden, - onNext: this._options.onNext, - onPrev: this._options.onPrev, - onPause: this._options.onPause, - onResume: this._options.onResume - }, this._options.steps[i]); - } - }; - - Tour.prototype.init = function(force) { - this._force = force; - if (this.ended()) { - this._debug("Tour ended, init prevented."); - return this; - } - this.setCurrentStep(); - this._initMouseNavigation(); - this._initKeyboardNavigation(); - this._onResize((function(_this) { - return function() { - return _this.showStep(_this._current); - }; - })(this)); - if (this._current !== null) { - this.showStep(this._current); - } - this._inited = true; - return this; - }; - - Tour.prototype.start = function(force) { - var promise; - if (force == null) { - force = false; - } - if (!this._inited) { - this.init(force); - } - if (this._current === null) { - promise = this._makePromise(this._options.onStart != null ? this._options.onStart(this) : void 0); - this._callOnPromiseDone(promise, this.showStep, 0); - } - return this; - }; - - Tour.prototype.next = function() { - var promise; - promise = this.hideStep(this._current); - return this._callOnPromiseDone(promise, this._showNextStep); - }; - - Tour.prototype.prev = function() { - var promise; - promise = this.hideStep(this._current); - return this._callOnPromiseDone(promise, this._showPrevStep); - }; - - Tour.prototype.goTo = function(i) { - var promise; - promise = this.hideStep(this._current); - return this._callOnPromiseDone(promise, this.showStep, i); - }; - - Tour.prototype.end = function() { - var endHelper, promise; - endHelper = (function(_this) { - return function(e) { - $(document).off("click.tour-" + _this._options.name); - $(document).off("keyup.tour-" + _this._options.name); - $(window).off("resize.tour-" + _this._options.name); - _this._setState("end", "yes"); - _this._inited = false; - _this._force = false; - _this._clearTimer(); - if (_this._options.onEnd != null) { - return _this._options.onEnd(_this); - } - }; - })(this); - promise = this.hideStep(this._current); - return this._callOnPromiseDone(promise, endHelper); - }; - - Tour.prototype.ended = function() { - return !this._force && !!this._getState("end"); - }; - - Tour.prototype.restart = function() { - this._removeState("current_step"); - this._removeState("end"); - return this.start(); - }; - - Tour.prototype.pause = function() { - var step; - step = this.getStep(this._current); - if (!(step && step.duration)) { - return this; - } - this._paused = true; - this._duration -= new Date().getTime() - this._start; - window.clearTimeout(this._timer); - this._debug("Paused/Stopped step " + (this._current + 1) + " timer (" + this._duration + " remaining)."); - if (step.onPause != null) { - return step.onPause(this, this._duration); - } - }; - - Tour.prototype.resume = function() { - var step; - step = this.getStep(this._current); - if (!(step && step.duration)) { - return this; - } - this._paused = false; - this._start = new Date().getTime(); - this._duration = this._duration || step.duration; - this._timer = window.setTimeout((function(_this) { - return function() { - if (_this._isLast()) { - return _this.next(); - } else { - return _this.end(); - } - }; - })(this), this._duration); - this._debug("Started step " + (this._current + 1) + " timer with duration " + this._duration); - if ((step.onResume != null) && this._duration !== step.duration) { - return step.onResume(this, this._duration); - } - }; - - Tour.prototype.hideStep = function(i) { - var hideStepHelper, promise, step; - step = this.getStep(i); - if (!step) { - return; - } - this._clearTimer(); - promise = this._makePromise(step.onHide != null ? step.onHide(this, i) : void 0); - hideStepHelper = (function(_this) { - return function(e) { - var $element; - $element = $(step.element); - if (!($element.data("bs.popover") || $element.data("popover"))) { - $element = $("body"); - } - $element.popover("destroy").removeClass("tour-" + _this._options.name + "-element tour-" + _this._options.name + "-" + i + "-element"); - if (step.reflex) { - $element.css("cursor", "").off("click.tour-" + _this._options.name); - } - if (step.backdrop) { - _this._hideBackdrop(); - } - if (step.onHidden != null) { - return step.onHidden(_this); - } - }; - })(this); - this._callOnPromiseDone(promise, hideStepHelper); - return promise; - }; - - Tour.prototype.showStep = function(i) { - var promise, showStepHelper, skipToPrevious, step; - if (this.ended()) { - this._debug("Tour ended, showStep prevented."); - return this; - } - step = this.getStep(i); - if (!step) { - return; - } - skipToPrevious = i < this._current; - promise = this._makePromise(step.onShow != null ? step.onShow(this, i) : void 0); - showStepHelper = (function(_this) { - return function(e) { - var current_path, path; - _this.setCurrentStep(i); - path = (function() { - switch ({}.toString.call(step.path)) { - case "[object Function]": - return step.path(); - case "[object String]": - return this._options.basePath + step.path; - default: - return step.path; - } - }).call(_this); - current_path = document.location.href; - if (_this._isRedirect(path, current_path)) { - if ({}.toString.call(path) === "[object RegExp]") { - _this._redirect(step, path); - } - else { - path = document.location.protocol+'//'+path; - _this._redirect(step, path); - } - return; - } - if (_this._isOrphan(step)) { - if (!step.orphan) { - _this._debug("Skip the orphan step " + (_this._current + 1) + ". Orphan option is false and the element doesn't exist or is hidden."); - if (skipToPrevious) { - _this._showPrevStep(); - } else { - _this._showNextStep(); - } - return; - } - _this._debug("Show the orphan step " + (_this._current + 1) + ". Orphans option is true."); - } - if (step.title === "" & step.content === "") { - if (skipToPrevious) { - _this._showPrevStep(); - } else { - _this._showNextStep(); - } - return; - } - if (step.backdrop) { - _this._showBackdrop(!_this._isOrphan(step) ? step.element : void 0); - } - _this._scrollIntoView(step.element, function() { - if (_this.getCurrentStep() !== i) { - return; - } - if ((step.element != null) && step.backdrop) { - _this._showOverlayElement(step.element); - } - _this._showPopover(step, i); - if (step.onShown != null) { - step.onShown(_this); - } - return _this._debug("Step " + (_this._current + 1) + " of " + _this._options.steps.length); - }); - if (step.duration) { - return _this.resume(); - } - }; - })(this); - this._callOnPromiseDone(promise, showStepHelper); - return promise; - }; - - Tour.prototype.getCurrentStep = function() { - return this._current; - }; - - Tour.prototype.setCurrentStep = function(value) { - if (value != null) { - this._current = value; - this._setState("current_step", value); - } else { - this._current = this._getState("current_step"); - this._current = this._current === null ? null : parseInt(this._current, 10); - } - return this; - }; - - Tour.prototype._setState = function(key, value) { - var e, keyName; - if (this._options.storage) { - keyName = "" + this._options.name + "_" + key; - try { - this._options.storage.setItem(keyName, value); - } catch (_error) { - e = _error; - if (e.code === DOMException.QUOTA_EXCEEDED_ERR) { - this.debug("LocalStorage quota exceeded. State storage failed."); - } - } - return this._options.afterSetState(keyName, value); - } else { - if (this._state == null) { - this._state = {}; - } - return this._state[key] = value; - } - }; - - Tour.prototype._removeState = function(key) { - var keyName; - if (this._options.storage) { - keyName = "" + this._options.name + "_" + key; - this._options.storage.removeItem(keyName); - return this._options.afterRemoveState(keyName); - } else { - if (this._state != null) { - return delete this._state[key]; - } - } - }; - - Tour.prototype._getState = function(key) { - var keyName, value; - if (this._options.storage) { - keyName = "" + this._options.name + "_" + key; - value = this._options.storage.getItem(keyName); - } else { - if (this._state != null) { - value = this._state[key]; - } - } - if (value === void 0 || value === "null") { - value = null; - } - this._options.afterGetState(key, value); - return value; - }; - - Tour.prototype._showNextStep = function() { - var promise, showNextStepHelper, step; - step = this.getStep(this._current); - showNextStepHelper = (function(_this) { - return function(e) { - return _this.showStep(step.next); - }; - })(this); - promise = this._makePromise(step.onNext != null ? step.onNext(this) : void 0); - return this._callOnPromiseDone(promise, showNextStepHelper); - }; - - Tour.prototype._showPrevStep = function() { - var promise, showPrevStepHelper, step; - step = this.getStep(this._current); - showPrevStepHelper = (function(_this) { - return function(e) { - return _this.showStep(step.prev); - }; - })(this); - promise = this._makePromise(step.onPrev != null ? step.onPrev(this) : void 0); - return this._callOnPromiseDone(promise, showPrevStepHelper); - }; - - Tour.prototype._debug = function(text) { - if (this._options.debug) { - return window.console.log("Bootstrap Tour '" + this._options.name + "' | " + text); - } - }; - - Tour.prototype._isRedirect = function(path, currentPath) { - return (path != null) && path !== "" && (({}.toString.call(path) === "[object RegExp]" && !path.test(currentPath)) || ({}.toString.call(path) === "[object String]" && path !== currentPath.replace("http://", "").replace("https://", ""))); - }; - - Tour.prototype._redirect = function(step, path) { - if ($.isFunction(step.redirect)) { - return step.redirect.call(this, path); - } else if (step.redirect === true) { - this._debug("Redirect to " + path); - return document.location.href = path; - } - }; - - Tour.prototype._isOrphan = function(step) { - return (step.element == null) || !$(step.element).length || $(step.element).is(":hidden") && ($(step.element)[0].namespaceURI !== "http://www.w3.org/2000/svg"); - }; - - Tour.prototype._isLast = function() { - return this._current < this._options.steps.length - 1; - }; - - Tour.prototype._showPopover = function(step, i) { - var $element, $navigation, $template, $tip, isOrphan, options; - $(".tour-" + this._options.name).remove(); - options = $.extend({}, this._options); - $template = $.isFunction(step.template) ? $(step.template(i, step)) : $(step.template); - $navigation = $template.find(".popover-navigation"); - isOrphan = this._isOrphan(step); - if (isOrphan) { - step.element = "body"; - step.placement = "top"; - $template = $template.addClass("orphan"); - } - $element = $(step.element); - $template.addClass("tour-" + this._options.name + " tour-" + this._options.name + "-" + i); - $element.addClass("tour-" + this._options.name + "-element tour-" + this._options.name + "-" + i + "-element"); - if (step.options) { - $.extend(options, step.options); - } - if (step.reflex && !isOrphan) { - $element.css("cursor", "pointer").on("click.tour-" + this._options.name, (function(_this) { - return function() { - if (_this._isLast()) { - return _this.next(); - } else { - return _this.end(); - } - }; - })(this)); - } - if (step.prev < 0) { - $navigation.find("[data-role='prev']").addClass("disabled"); - } - if (step.next < 0) { - $navigation.find("[data-role='next']").addClass("disabled"); - } - if (!step.duration) { - $navigation.find("[data-role='pause-resume']").remove(); - } - step.template = $template.clone().wrap("
    ").parent().html(); - $element.popover({ - placement: step.placement, - trigger: "manual", - title: step.title, - content: step.content, - html: true, - animation: step.animation, - container: step.container, - template: step.template, - selector: step.element - }).popover("show"); - $tip = $element.data("bs.popover") ? $element.data("bs.popover").tip() : $element.data("popover").tip(); - $tip.attr("id", step.id); - this._reposition($tip, step); - if (isOrphan) { - return this._center($tip); - } - }; - - Tour.prototype._reposition = function($tip, step) { - var offsetBottom, offsetHeight, offsetRight, offsetWidth, originalLeft, originalTop, tipOffset; - offsetWidth = $tip[0].offsetWidth; - offsetHeight = $tip[0].offsetHeight; - tipOffset = $tip.offset(); - originalLeft = tipOffset.left; - originalTop = tipOffset.top; - offsetBottom = $(document).outerHeight() - tipOffset.top - $tip.outerHeight(); - if (offsetBottom < 0) { - tipOffset.top = tipOffset.top + offsetBottom; - } - offsetRight = $("html").outerWidth() - tipOffset.left - $tip.outerWidth(); - if (offsetRight < 0) { - tipOffset.left = tipOffset.left + offsetRight; - } - if (tipOffset.top < 0) { - tipOffset.top = 0; - } - if (tipOffset.left < 0) { - tipOffset.left = 0; - } - $tip.offset(tipOffset); - if (step.placement === "bottom" || step.placement === "top") { - if (originalLeft !== tipOffset.left) { - return this._replaceArrow($tip, (tipOffset.left - originalLeft) * 2, offsetWidth, "left"); - } - } else { - if (originalTop !== tipOffset.top) { - return this._replaceArrow($tip, (tipOffset.top - originalTop) * 2, offsetHeight, "top"); - } - } - }; - - Tour.prototype._center = function($tip) { - return $tip.css("top", $(window).outerHeight() / 2 - $tip.outerHeight() / 2); - }; - - Tour.prototype._replaceArrow = function($tip, delta, dimension, position) { - return $tip.find(".arrow").css(position, delta ? 50 * (1 - delta / dimension) + "%" : ""); - }; - - Tour.prototype._scrollIntoView = function(element, callback) { - var $element, $window, counter, offsetTop, scrollTop, windowHeight; - $element = $(element); - if (!$element.length) { - return callback(); - } - $window = $(window); - offsetTop = $element.offset().top; - windowHeight = $window.height(); - scrollTop = Math.max(0, offsetTop - (windowHeight / 2)); - this._debug("Scroll into view. ScrollTop: " + scrollTop + ". Element offset: " + offsetTop + ". Window height: " + windowHeight + "."); - counter = 0; - return $("body,html").stop(true, true).animate({ - scrollTop: Math.ceil(scrollTop) - }, (function(_this) { - return function() { - if (++counter === 2) { - callback(); - return _this._debug("Scroll into view. Animation end element offset: " + ($element.offset().top) + ". Window height: " + ($window.height()) + "."); - } - }; - })(this)); - }; - - Tour.prototype._onResize = function(callback, timeout) { - return $(window).on("resize.tour-" + this._options.name, function() { - clearTimeout(timeout); - return timeout = setTimeout(callback, 100); - }); - }; - - Tour.prototype._initMouseNavigation = function() { - var _this; - _this = this; - return $(document).off("click.tour-" + this._options.name, ".popover.tour-" + this._options.name + " *[data-role='prev']:not(.disabled)").off("click.tour-" + this._options.name, ".popover.tour-" + this._options.name + " *[data-role='next']:not(.disabled)").off("click.tour-" + this._options.name, ".popover.tour-" + this._options.name + " *[data-role='end']").off("click.tour-" + this._options.name, ".popover.tour-" + this._options.name + " *[data-role='pause-resume']").on("click.tour-" + this._options.name, ".popover.tour-" + this._options.name + " *[data-role='next']:not(.disabled)", (function(_this) { - return function(e) { - e.preventDefault(); - return _this.next(); - }; - })(this)).on("click.tour-" + this._options.name, ".popover.tour-" + this._options.name + " *[data-role='prev']:not(.disabled)", (function(_this) { - return function(e) { - e.preventDefault(); - return _this.prev(); - }; - })(this)).on("click.tour-" + this._options.name, ".popover.tour-" + this._options.name + " *[data-role='end']", (function(_this) { - return function(e) { - e.preventDefault(); - return _this.end(); - }; - })(this)).on("click.tour-" + this._options.name, ".popover.tour-" + this._options.name + " *[data-role='pause-resume']", function(e) { - var $this; - e.preventDefault(); - $this = $(this); - $this.text(_this._paused ? $this.data("pause-text") : $this.data("resume-text")); - if (_this._paused) { - return _this.resume(); - } else { - return _this.pause(); - } - }); - }; - - Tour.prototype._initKeyboardNavigation = function() { - if (!this._options.keyboard) { - return; - } - return $(document).on("keyup.tour-" + this._options.name, (function(_this) { - return function(e) { - if (!e.which) { - return; - } - switch (e.which) { - case 39: - e.preventDefault(); - if (_this._isLast()) { - return _this.next(); - } else { - return _this.end(); - } - break; - case 37: - e.preventDefault(); - if (_this._current > 0) { - return _this.prev(); - } - break; - case 27: - e.preventDefault(); - return _this.end(); - } - }; - })(this)); - }; - - Tour.prototype._makePromise = function(result) { - if (result && $.isFunction(result.then)) { - return result; - } else { - return null; - } - }; - - Tour.prototype._callOnPromiseDone = function(promise, cb, arg) { - if (promise) { - return promise.then((function(_this) { - return function(e) { - return cb.call(_this, arg); - }; - })(this)); - } else { - return cb.call(this, arg); - } - }; - - Tour.prototype._showBackdrop = function(element) { - if (this.backdrop.backgroundShown) { - return; - } - this.backdrop = $("
    ", { - "class": "tour-backdrop" - }); - this.backdrop.backgroundShown = true; - return $("body").append(this.backdrop); - }; - - Tour.prototype._hideBackdrop = function() { - this._hideOverlayElement(); - return this._hideBackground(); - }; - - Tour.prototype._hideBackground = function() { - if (this.backdrop) { - this.backdrop.remove(); - this.backdrop.overlay = null; - return this.backdrop.backgroundShown = false; - } - }; - - Tour.prototype._showOverlayElement = function(element) { - var $background, $element, offset; - $element = $(element); - if (!$element || $element.length === 0 || this.backdrop.overlayElementShown) { - return; - } - this.backdrop.overlayElementShown = true; - $background = $("
    "); - offset = $element.offset(); - offset.top = offset.top; - offset.left = offset.left; - $background.width($element.innerWidth()).height($element.innerHeight()).addClass("tour-step-background").offset(offset); - $element.addClass("tour-step-backdrop"); - $("body").append($background); - this.backdrop.$element = $element; - return this.backdrop.$background = $background; - }; - - Tour.prototype._hideOverlayElement = function() { - if (!this.backdrop.overlayElementShown) { - return; - } - this.backdrop.$element.removeClass("tour-step-backdrop"); - this.backdrop.$background.remove(); - this.backdrop.$element = null; - this.backdrop.$background = null; - return this.backdrop.overlayElementShown = false; - }; - - Tour.prototype._clearTimer = function() { - window.clearTimeout(this._timer); - this._timer = null; - return this._duration = null; - }; - - return Tour; - - })(); - return window.Tour = Tour; -})(jQuery, window); +/* ======================================================================== + * bootstrap-tour - v0.10.1 + * http://bootstraptour.com + * ======================================================================== + * Copyright 2012-2013 Ulrich Sossou + * + * ======================================================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ======================================================================== + */ + +/* ======================================================================== + * Bootstrap: tooltip.js v3.2.0 + * http://getbootstrap.com/javascript/#tooltip + * Inspired by the original jQuery.tipsy by Jason Frame + * ======================================================================== + * Copyright 2011-2014 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * ======================================================================== */ + + ++function ($) { + 'use strict'; + + // TOOLTIP PUBLIC CLASS DEFINITION + // =============================== + + var Tooltip = function (element, options) { + this.type = + this.options = + this.enabled = + this.timeout = + this.hoverState = + this.$element = null + + this.init('tooltip', element, options) + } + + Tooltip.VERSION = '3.2.0' + + Tooltip.DEFAULTS = { + animation: true, + placement: 'top', + selector: false, + template: '', + trigger: 'hover focus', + title: '', + delay: 0, + html: false, + container: false, + viewport: { + selector: 'body', + padding: 0 + } + } + + Tooltip.prototype.init = function (type, element, options) { + this.enabled = true + this.type = type + this.$element = $(element) + this.options = this.getOptions(options) + this.$viewport = this.options.viewport && $(this.options.viewport.selector || this.options.viewport) + + var triggers = this.options.trigger.split(' ') + + for (var i = triggers.length; i--;) { + var trigger = triggers[i] + + if (trigger == 'click') { + this.$element.on('click.' + this.type, this.options.selector, $.proxy(this.toggle, this)) + } else if (trigger != 'manual') { + var eventIn = trigger == 'hover' ? 'mouseenter' : 'focusin' + var eventOut = trigger == 'hover' ? 'mouseleave' : 'focusout' + + this.$element.on(eventIn + '.' + this.type, this.options.selector, $.proxy(this.enter, this)) + this.$element.on(eventOut + '.' + this.type, this.options.selector, $.proxy(this.leave, this)) + } + } + + this.options.selector ? + (this._options = $.extend({}, this.options, { trigger: 'manual', selector: '' })) : + this.fixTitle() + } + + Tooltip.prototype.getDefaults = function () { + return Tooltip.DEFAULTS + } + + Tooltip.prototype.getOptions = function (options) { + options = $.extend({}, this.getDefaults(), this.$element.data(), options) + + if (options.delay && typeof options.delay == 'number') { + options.delay = { + show: options.delay, + hide: options.delay + } + } + + return options + } + + Tooltip.prototype.getDelegateOptions = function () { + var options = {} + var defaults = this.getDefaults() + + this._options && $.each(this._options, function (key, value) { + if (defaults[key] != value) options[key] = value + }) + + return options + } + + Tooltip.prototype.enter = function (obj) { + var self = obj instanceof this.constructor ? + obj : $(obj.currentTarget).data('bs.' + this.type) + + if (!self) { + self = new this.constructor(obj.currentTarget, this.getDelegateOptions()) + $(obj.currentTarget).data('bs.' + this.type, self) + } + + clearTimeout(self.timeout) + + self.hoverState = 'in' + + if (!self.options.delay || !self.options.delay.show) return self.show() + + self.timeout = setTimeout(function () { + if (self.hoverState == 'in') self.show() + }, self.options.delay.show) + } + + Tooltip.prototype.leave = function (obj) { + var self = obj instanceof this.constructor ? + obj : $(obj.currentTarget).data('bs.' + this.type) + + if (!self) { + self = new this.constructor(obj.currentTarget, this.getDelegateOptions()) + $(obj.currentTarget).data('bs.' + this.type, self) + } + + clearTimeout(self.timeout) + + self.hoverState = 'out' + + if (!self.options.delay || !self.options.delay.hide) return self.hide() + + self.timeout = setTimeout(function () { + if (self.hoverState == 'out') self.hide() + }, self.options.delay.hide) + } + + Tooltip.prototype.show = function () { + var e = $.Event('show.bs.' + this.type) + + if (this.hasContent() && this.enabled) { + this.$element.trigger(e) + + var inDom = $.contains(document.documentElement, this.$element[0]) + if (e.isDefaultPrevented() || !inDom) return + var that = this + + var $tip = this.tip() + + var tipId = this.getUID(this.type) + + this.setContent() + $tip.attr('id', tipId) + this.$element.attr('aria-describedby', tipId) + + if (this.options.animation) $tip.addClass('fade') + + var placement = typeof this.options.placement == 'function' ? + this.options.placement.call(this, $tip[0], this.$element[0]) : + this.options.placement + + var autoToken = /\s?auto?\s?/i + var autoPlace = autoToken.test(placement) + if (autoPlace) placement = placement.replace(autoToken, '') || 'top' + + $tip + .detach() + .css({ top: 0, left: 0, display: 'block' }) + .addClass(placement) + .data('bs.' + this.type, this) + + this.options.container ? $tip.appendTo(this.options.container) : $tip.insertAfter(this.$element) + + var pos = this.getPosition() + var actualWidth = $tip[0].offsetWidth + var actualHeight = $tip[0].offsetHeight + + if (autoPlace) { + var orgPlacement = placement + var $parent = this.$element.parent() + var parentDim = this.getPosition($parent) + + placement = placement == 'bottom' && pos.top + pos.height + actualHeight - parentDim.scroll > parentDim.height ? 'top' : + placement == 'top' && pos.top - parentDim.scroll - actualHeight < 0 ? 'bottom' : + placement == 'right' && pos.right + actualWidth > parentDim.width ? 'left' : + placement == 'left' && pos.left - actualWidth < parentDim.left ? 'right' : + placement + + $tip + .removeClass(orgPlacement) + .addClass(placement) + } + + var calculatedOffset = this.getCalculatedOffset(placement, pos, actualWidth, actualHeight) + + this.applyPlacement(calculatedOffset, placement) + + var complete = function () { + that.$element.trigger('shown.bs.' + that.type) + that.hoverState = null + } + + $.support.transition && this.$tip.hasClass('fade') ? + $tip + .one('bsTransitionEnd', complete) + .emulateTransitionEnd(150) : + complete() + } + } + + Tooltip.prototype.applyPlacement = function (offset, placement) { + var $tip = this.tip() + var width = $tip[0].offsetWidth + var height = $tip[0].offsetHeight + + // manually read margins because getBoundingClientRect includes difference + var marginTop = parseInt($tip.css('margin-top'), 10) + var marginLeft = parseInt($tip.css('margin-left'), 10) + + // we must check for NaN for ie 8/9 + if (isNaN(marginTop)) marginTop = 0 + if (isNaN(marginLeft)) marginLeft = 0 + + offset.top = offset.top + marginTop + offset.left = offset.left + marginLeft + + // $.fn.offset doesn't round pixel values + // so we use setOffset directly with our own function B-0 + $.offset.setOffset($tip[0], $.extend({ + using: function (props) { + $tip.css({ + top: Math.round(props.top), + left: Math.round(props.left) + }) + } + }, offset), 0) + + $tip.addClass('in') + + // check to see if placing tip in new offset caused the tip to resize itself + var actualWidth = $tip[0].offsetWidth + var actualHeight = $tip[0].offsetHeight + + if (placement == 'top' && actualHeight != height) { + offset.top = offset.top + height - actualHeight + } + + var delta = this.getViewportAdjustedDelta(placement, offset, actualWidth, actualHeight) + + if (delta.left) offset.left += delta.left + else offset.top += delta.top + + var arrowDelta = delta.left ? delta.left * 2 - width + actualWidth : delta.top * 2 - height + actualHeight + var arrowPosition = delta.left ? 'left' : 'top' + var arrowOffsetPosition = delta.left ? 'offsetWidth' : 'offsetHeight' + + $tip.offset(offset) + this.replaceArrow(arrowDelta, $tip[0][arrowOffsetPosition], arrowPosition) + } + + Tooltip.prototype.replaceArrow = function (delta, dimension, position) { + this.arrow().css(position, delta ? (50 * (1 - delta / dimension) + '%') : '') + } + + Tooltip.prototype.setContent = function () { + var $tip = this.tip() + var title = this.getTitle() + + $tip.find('.tooltip-inner')[this.options.html ? 'html' : 'text'](title) + $tip.removeClass('fade in top bottom left right') + } + + Tooltip.prototype.hide = function () { + var that = this + var $tip = this.tip() + var e = $.Event('hide.bs.' + this.type) + + this.$element.removeAttr('aria-describedby') + + function complete() { + if (that.hoverState != 'in') $tip.detach() + that.$element.trigger('hidden.bs.' + that.type) + } + + this.$element.trigger(e) + + if (e.isDefaultPrevented()) return + + $tip.removeClass('in') + + $.support.transition && this.$tip.hasClass('fade') ? + $tip + .one('bsTransitionEnd', complete) + .emulateTransitionEnd(150) : + complete() + + this.hoverState = null + + return this + } + + Tooltip.prototype.fixTitle = function () { + var $e = this.$element + if ($e.attr('title') || typeof ($e.attr('data-original-title')) != 'string') { + $e.attr('data-original-title', $e.attr('title') || '').attr('title', '') + } + } + + Tooltip.prototype.hasContent = function () { + return this.getTitle() + } + + Tooltip.prototype.getPosition = function ($element) { + $element = $element || this.$element + var el = $element[0] + var isBody = el.tagName == 'BODY' + return $.extend({}, (typeof el.getBoundingClientRect == 'function') ? el.getBoundingClientRect() : null, { + scroll: isBody ? document.documentElement.scrollTop || document.body.scrollTop : $element.scrollTop(), + width: isBody ? $(window).width() : $element.outerWidth(), + height: isBody ? $(window).height() : $element.outerHeight() + }, isBody ? { top: 0, left: 0 } : $element.offset()) + } + + Tooltip.prototype.getCalculatedOffset = function (placement, pos, actualWidth, actualHeight) { + return placement == 'bottom' ? { top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2 } : + placement == 'top' ? { top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2 } : + placement == 'left' ? { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth } : + /* placement == 'right' */ { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width } + + } + + Tooltip.prototype.getViewportAdjustedDelta = function (placement, pos, actualWidth, actualHeight) { + var delta = { top: 0, left: 0 } + if (!this.$viewport) return delta + + var viewportPadding = this.options.viewport && this.options.viewport.padding || 0 + var viewportDimensions = this.getPosition(this.$viewport) + + if (/right|left/.test(placement)) { + var topEdgeOffset = pos.top - viewportPadding - viewportDimensions.scroll + var bottomEdgeOffset = pos.top + viewportPadding - viewportDimensions.scroll + actualHeight + if (topEdgeOffset < viewportDimensions.top) { // top overflow + delta.top = viewportDimensions.top - topEdgeOffset + } else if (bottomEdgeOffset > viewportDimensions.top + viewportDimensions.height) { // bottom overflow + delta.top = viewportDimensions.top + viewportDimensions.height - bottomEdgeOffset + } + } else { + var leftEdgeOffset = pos.left - viewportPadding + var rightEdgeOffset = pos.left + viewportPadding + actualWidth + if (leftEdgeOffset < viewportDimensions.left) { // left overflow + delta.left = viewportDimensions.left - leftEdgeOffset + } else if (rightEdgeOffset > viewportDimensions.width) { // right overflow + delta.left = viewportDimensions.left + viewportDimensions.width - rightEdgeOffset + } + } + + return delta + } + + Tooltip.prototype.getTitle = function () { + var title + var $e = this.$element + var o = this.options + + title = $e.attr('data-original-title') + || (typeof o.title == 'function' ? o.title.call($e[0]) : o.title) + + return title + } + + Tooltip.prototype.getUID = function (prefix) { + do prefix += ~~(Math.random() * 1000000) + while (document.getElementById(prefix)) + return prefix + } + + Tooltip.prototype.tip = function () { + return (this.$tip = this.$tip || $(this.options.template)) + } + + Tooltip.prototype.arrow = function () { + return (this.$arrow = this.$arrow || this.tip().find('.tooltip-arrow')) + } + + Tooltip.prototype.validate = function () { + if (!this.$element[0].parentNode) { + this.hide() + this.$element = null + this.options = null + } + } + + Tooltip.prototype.enable = function () { + this.enabled = true + } + + Tooltip.prototype.disable = function () { + this.enabled = false + } + + Tooltip.prototype.toggleEnabled = function () { + this.enabled = !this.enabled + } + + Tooltip.prototype.toggle = function (e) { + var self = this + if (e) { + self = $(e.currentTarget).data('bs.' + this.type) + if (!self) { + self = new this.constructor(e.currentTarget, this.getDelegateOptions()) + $(e.currentTarget).data('bs.' + this.type, self) + } + } + + self.tip().hasClass('in') ? self.leave(self) : self.enter(self) + } + + Tooltip.prototype.destroy = function () { + clearTimeout(this.timeout) + this.hide().$element.off('.' + this.type).removeData('bs.' + this.type) + } + + + // TOOLTIP PLUGIN DEFINITION + // ========================= + + function Plugin(option) { + return this.each(function () { + var $this = $(this) + var data = $this.data('bs.tooltip') + var options = typeof option == 'object' && option + + if (!data && option == 'destroy') return + if (!data) $this.data('bs.tooltip', (data = new Tooltip(this, options))) + if (typeof option == 'string') data[option]() + }) + } + + var old = $.fn.tooltip + + $.fn.tooltip = Plugin + $.fn.tooltip.Constructor = Tooltip + + + // TOOLTIP NO CONFLICT + // =================== + + $.fn.tooltip.noConflict = function () { + $.fn.tooltip = old + return this + } + +}(jQuery); + +/* ======================================================================== + * Bootstrap: popover.js v3.2.0 + * http://getbootstrap.com/javascript/#popovers + * ======================================================================== + * Copyright 2011-2014 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * ======================================================================== */ + + ++function ($) { + 'use strict'; + + // POPOVER PUBLIC CLASS DEFINITION + // =============================== + + var Popover = function (element, options) { + this.init('popover', element, options) + } + + if (!$.fn.tooltip) throw new Error('Popover requires tooltip.js') + + Popover.VERSION = '3.2.0' + + Popover.DEFAULTS = $.extend({}, $.fn.tooltip.Constructor.DEFAULTS, { + placement: 'right', + trigger: 'click', + content: '', + template: '' + }) + + + // NOTE: POPOVER EXTENDS tooltip.js + // ================================ + + Popover.prototype = $.extend({}, $.fn.tooltip.Constructor.prototype) + + Popover.prototype.constructor = Popover + + Popover.prototype.getDefaults = function () { + return Popover.DEFAULTS + } + + Popover.prototype.setContent = function () { + var $tip = this.tip() + var title = this.getTitle() + var content = this.getContent() + + $tip.find('.popover-title')[this.options.html ? 'html' : 'text'](title) + $tip.find('.popover-content').empty()[ // we use append for html objects to maintain js events + this.options.html ? (typeof content == 'string' ? 'html' : 'append') : 'text' + ](content) + + $tip.removeClass('fade top bottom left right in') + + // IE8 doesn't accept hiding via the `:empty` pseudo selector, we have to do + // this manually by checking the contents. + if (!$tip.find('.popover-title').html()) $tip.find('.popover-title').hide() + } + + Popover.prototype.hasContent = function () { + return this.getTitle() || this.getContent() + } + + Popover.prototype.getContent = function () { + var $e = this.$element + var o = this.options + + return $e.attr('data-content') + || (typeof o.content == 'function' ? + o.content.call($e[0]) : + o.content) + } + + Popover.prototype.arrow = function () { + return (this.$arrow = this.$arrow || this.tip().find('.arrow')) + } + + Popover.prototype.tip = function () { + if (!this.$tip) this.$tip = $(this.options.template) + return this.$tip + } + + + // POPOVER PLUGIN DEFINITION + // ========================= + + function Plugin(option) { + return this.each(function () { + var $this = $(this) + var data = $this.data('bs.popover') + var options = typeof option == 'object' && option + + if (!data && option == 'destroy') return + if (!data) $this.data('bs.popover', (data = new Popover(this, options))) + if (typeof option == 'string') data[option]() + }) + } + + var old = $.fn.popover + + $.fn.popover = Plugin + $.fn.popover.Constructor = Popover + + + // POPOVER NO CONFLICT + // =================== + + $.fn.popover.noConflict = function () { + $.fn.popover = old + return this + } + +}(jQuery); + +(function($, window) { + var Tour, document; + document = window.document; + Tour = (function() { + function Tour(options) { + var storage; + try { + storage = window.localStorage; + } catch (_error) { + storage = false; + } + this._options = $.extend({ + name: 'tour', + steps: [], + container: 'body', + autoscroll: true, + keyboard: true, + storage: storage, + debug: false, + backdrop: false, + backdropPadding: 0, + redirect: true, + orphan: false, + duration: false, + delay: false, + basePath: '', + template: '', + afterSetState: function(key, value) {}, + afterGetState: function(key, value) {}, + afterRemoveState: function(key) {}, + onStart: function(tour) {}, + onEnd: function(tour) {}, + onShow: function(tour) {}, + onShown: function(tour) {}, + onHide: function(tour) {}, + onHidden: function(tour) {}, + onNext: function(tour) {}, + onPrev: function(tour) {}, + onPause: function(tour, duration) {}, + onResume: function(tour, duration) {} + }, options); + this._force = false; + this._inited = false; + this.backdrop = { + overlay: null, + $element: null, + $background: null, + backgroundShown: false, + overlayElementShown: false + }; + this; + } + + Tour.prototype.addSteps = function(steps) { + var step, _i, _len; + for (_i = 0, _len = steps.length; _i < _len; _i++) { + step = steps[_i]; + this.addStep(step); + } + return this; + }; + + Tour.prototype.addStep = function(step) { + this._options.steps.push(step); + return this; + }; + + Tour.prototype.getStep = function(i) { + if (this._options.steps[i] != null) { + return $.extend({ + id: "step-" + i, + path: '', + placement: 'right', + title: '', + content: '

    ', + next: i === this._options.steps.length - 1 ? -1 : i + 1, + prev: i - 1, + animation: true, + container: this._options.container, + autoscroll: this._options.autoscroll, + backdrop: this._options.backdrop, + backdropPadding: this._options.backdropPadding, + redirect: this._options.redirect, + orphan: this._options.orphan, + duration: this._options.duration, + delay: this._options.delay, + template: this._options.template, + onShow: this._options.onShow, + onShown: this._options.onShown, + onHide: this._options.onHide, + onHidden: this._options.onHidden, + onNext: this._options.onNext, + onPrev: this._options.onPrev, + onPause: this._options.onPause, + onResume: this._options.onResume + }, this._options.steps[i]); + } + }; + + Tour.prototype.init = function(force) { + this._force = force; + if (this.ended()) { + this._debug('Tour ended, init prevented.'); + return this; + } + this.setCurrentStep(); + this._initMouseNavigation(); + this._initKeyboardNavigation(); + this._onResize((function(_this) { + return function() { + return _this.showStep(_this._current); + }; + })(this)); + if (this._current !== null) { + this.showStep(this._current); + } + this._inited = true; + return this; + }; + + Tour.prototype.start = function(force) { + var promise; + if (force == null) { + force = false; + } + if (!this._inited) { + this.init(force); + } + if (this._current === null) { + promise = this._makePromise(this._options.onStart != null ? this._options.onStart(this) : void 0); + this._callOnPromiseDone(promise, this.showStep, 0); + } + return this; + }; + + Tour.prototype.next = function() { + var promise; + promise = this.hideStep(this._current); + return this._callOnPromiseDone(promise, this._showNextStep); + }; + + Tour.prototype.prev = function() { + var promise; + promise = this.hideStep(this._current); + return this._callOnPromiseDone(promise, this._showPrevStep); + }; + + Tour.prototype.goTo = function(i) { + var promise; + promise = this.hideStep(this._current); + return this._callOnPromiseDone(promise, this.showStep, i); + }; + + Tour.prototype.end = function() { + var endHelper, promise; + endHelper = (function(_this) { + return function(e) { + $(document).off("click.tour-" + _this._options.name); + $(document).off("keyup.tour-" + _this._options.name); + $(window).off("resize.tour-" + _this._options.name); + _this._setState('end', 'yes'); + _this._inited = false; + _this._force = false; + _this._clearTimer(); + if (_this._options.onEnd != null) { + return _this._options.onEnd(_this); + } + }; + })(this); + promise = this.hideStep(this._current); + return this._callOnPromiseDone(promise, endHelper); + }; + + Tour.prototype.ended = function() { + return !this._force && !!this._getState('end'); + }; + + Tour.prototype.restart = function() { + this._removeState('current_step'); + this._removeState('end'); + return this.start(); + }; + + Tour.prototype.pause = function() { + var step; + step = this.getStep(this._current); + if (!(step && step.duration)) { + return this; + } + this._paused = true; + this._duration -= new Date().getTime() - this._start; + window.clearTimeout(this._timer); + this._debug("Paused/Stopped step " + (this._current + 1) + " timer (" + this._duration + " remaining)."); + if (step.onPause != null) { + return step.onPause(this, this._duration); + } + }; + + Tour.prototype.resume = function() { + var step; + step = this.getStep(this._current); + if (!(step && step.duration)) { + return this; + } + this._paused = false; + this._start = new Date().getTime(); + this._duration = this._duration || step.duration; + this._timer = window.setTimeout((function(_this) { + return function() { + if (_this._isLast()) { + return _this.next(); + } else { + return _this.end(); + } + }; + })(this), this._duration); + this._debug("Started step " + (this._current + 1) + " timer with duration " + this._duration); + if ((step.onResume != null) && this._duration !== step.duration) { + return step.onResume(this, this._duration); + } + }; + + Tour.prototype.hideStep = function(i) { + var hideStepHelper, promise, step; + step = this.getStep(i); + if (!step) { + return; + } + this._clearTimer(); + promise = this._makePromise(step.onHide != null ? step.onHide(this, i) : void 0); + hideStepHelper = (function(_this) { + return function(e) { + var $element; + $element = $(step.element); + if (!($element.data('bs.popover') || $element.data('popover'))) { + $element = $('body'); + } + $element.popover('destroy').removeClass("tour-" + _this._options.name + "-element tour-" + _this._options.name + "-" + i + "-element"); + if (step.reflex) { + $element.removeClass('tour-step-element-reflex').off("" + (_this._reflexEvent(step.reflex)) + ".tour-" + _this._options.name); + } + if (step.backdrop) { + _this._hideBackdrop(); + } + if (step.onHidden != null) { + return step.onHidden(_this); + } + }; + })(this); + this._callOnPromiseDone(promise, hideStepHelper); + return promise; + }; + + Tour.prototype.showStep = function(i) { + var promise, showStepHelper, skipToPrevious, step; + if (this.ended()) { + this._debug('Tour ended, showStep prevented.'); + return this; + } + step = this.getStep(i); + if (!step) { + return; + } + skipToPrevious = i < this._current; + promise = this._makePromise(step.onShow != null ? step.onShow(this, i) : void 0); + showStepHelper = (function(_this) { + return function(e) { + var current_path, path, showPopoverAndOverlay; + _this.setCurrentStep(i); + path = (function() { + switch ({}.toString.call(step.path)) { + case '[object Function]': + return step.path(); + case '[object String]': + return this._options.basePath + step.path; + default: + return step.path; + } + }).call(_this); + current_path = document.location.href; + if (_this._isRedirect(path, current_path)) { + if ({}.toString.call(path) === "[object RegExp]") { + _this._redirect(step, path); + } + else { + path = document.location.protocol+'//'+path; + _this._redirect(step, path); + } + return; + } + if (_this._isOrphan(step)) { + if (!step.orphan) { + _this._debug("Skip the orphan step " + (_this._current + 1) + ".\nOrphan option is false and the element does not exist or is hidden."); + if (skipToPrevious) { + _this._showPrevStep(); + } else { + _this._showNextStep(); + } + return; + } + _this._debug("Show the orphan step " + (_this._current + 1) + ". Orphans option is true."); + } + if (step.title === "" & step.content === "") { + if (skipToPrevious) { + _this._showPrevStep(); + } else { + _this._showNextStep(); + } + return; + } + if (step.backdrop) { + _this._showBackdrop(!_this._isOrphan(step) ? step.element : void 0); + } + showPopoverAndOverlay = function() { + if (_this.getCurrentStep() !== i) { + return; + } + if ((step.element != null) && step.backdrop) { + _this._showOverlayElement(step); + } + _this._showPopover(step, i); + if (step.onShown != null) { + step.onShown(_this); + } + return _this._debug("Step " + (_this._current + 1) + " of " + _this._options.steps.length); + }; + if (step.autoscroll) { + _this._scrollIntoView(step.element, showPopoverAndOverlay); + } else { + showPopoverAndOverlay(); + } + if (step.duration) { + return _this.resume(); + } + }; + })(this); + if (step.delay) { + this._debug("Wait " + step.delay + " milliseconds to show the step " + (this._current + 1)); + window.setTimeout((function(_this) { + return function() { + return _this._callOnPromiseDone(promise, showStepHelper); + }; + })(this), step.delay); + } else { + this._callOnPromiseDone(promise, showStepHelper); + } + return promise; + }; + + Tour.prototype.getCurrentStep = function() { + return this._current; + }; + + Tour.prototype.setCurrentStep = function(value) { + if (value != null) { + this._current = value; + this._setState('current_step', value); + } else { + this._current = this._getState('current_step'); + this._current = this._current === null ? null : parseInt(this._current, 10); + } + return this; + }; + + Tour.prototype._setState = function(key, value) { + var e, keyName; + if (this._options.storage) { + keyName = "" + this._options.name + "_" + key; + try { + this._options.storage.setItem(keyName, value); + } catch (_error) { + e = _error; + if (e.code === DOMException.QUOTA_EXCEEDED_ERR) { + this._debug('LocalStorage quota exceeded. State storage failed.'); + } + } + return this._options.afterSetState(keyName, value); + } else { + if (this._state == null) { + this._state = {}; + } + return this._state[key] = value; + } + }; + + Tour.prototype._removeState = function(key) { + var keyName; + if (this._options.storage) { + keyName = "" + this._options.name + "_" + key; + this._options.storage.removeItem(keyName); + return this._options.afterRemoveState(keyName); + } else { + if (this._state != null) { + return delete this._state[key]; + } + } + }; + + Tour.prototype._getState = function(key) { + var keyName, value; + if (this._options.storage) { + keyName = "" + this._options.name + "_" + key; + value = this._options.storage.getItem(keyName); + } else { + if (this._state != null) { + value = this._state[key]; + } + } + if (value === void 0 || value === 'null') { + value = null; + } + this._options.afterGetState(key, value); + return value; + }; + + Tour.prototype._showNextStep = function() { + var promise, showNextStepHelper, step; + step = this.getStep(this._current); + showNextStepHelper = (function(_this) { + return function(e) { + return _this.showStep(step.next); + }; + })(this); + promise = this._makePromise(step.onNext != null ? step.onNext(this) : void 0); + return this._callOnPromiseDone(promise, showNextStepHelper); + }; + + Tour.prototype._showPrevStep = function() { + var promise, showPrevStepHelper, step; + step = this.getStep(this._current); + showPrevStepHelper = (function(_this) { + return function(e) { + return _this.showStep(step.prev); + }; + })(this); + promise = this._makePromise(step.onPrev != null ? step.onPrev(this) : void 0); + return this._callOnPromiseDone(promise, showPrevStepHelper); + }; + + Tour.prototype._debug = function(text) { + if (this._options.debug) { + return window.console.log("Bootstrap Tour '" + this._options.name + "' | " + text); + } + }; + + Tour.prototype._isRedirect = function(path, currentPath) { + return (path != null) && path !== '' && (({}.toString.call(path) === '[object RegExp]' && !path.test(currentPath)) || ({}.toString.call(path) === '[object String]' && path !== currentPath.replace("http://", "").replace("https://", ""))); + }; + + Tour.prototype._redirect = function(step, path) { + if ($.isFunction(step.redirect)) { + return step.redirect.call(this, path); + } else if (step.redirect === true) { + this._debug("Redirect to " + path); + return document.location.href = path; + } + }; + + Tour.prototype._isOrphan = function(step) { + return (step.element == null) || !$(step.element).length || $(step.element).is(':hidden') && ($(step.element)[0].namespaceURI !== 'http://www.w3.org/2000/svg'); + }; + + Tour.prototype._isLast = function() { + return this._current < this._options.steps.length - 1; + }; + + Tour.prototype._showPopover = function(step, i) { + var $element, $tip, isOrphan, options; + $(".tour-" + this._options.name).remove(); + options = $.extend({}, this._options); + isOrphan = this._isOrphan(step); + step.template = this._template(step, i); + if (isOrphan) { + step.element = 'body'; + step.placement = 'top'; + } + $element = $(step.element); + $element.addClass("tour-" + this._options.name + "-element tour-" + this._options.name + "-" + i + "-element"); + if (step.options) { + $.extend(options, step.options); + } + if (step.reflex && !isOrphan) { + $element.addClass('tour-step-element-reflex'); + $element.off("" + (this._reflexEvent(step.reflex)) + ".tour-" + this._options.name); + $element.on("" + (this._reflexEvent(step.reflex)) + ".tour-" + this._options.name, (function(_this) { + return function() { + if (_this._isLast()) { + return _this.next(); + } else { + return _this.end(); + } + }; + })(this)); + } + $element.popover({ + placement: step.placement, + trigger: 'manual', + title: step.title, + content: step.content, + html: true, + animation: step.animation, + container: step.container, + template: step.template, + selector: step.element + }).popover('show'); + $tip = $element.data('bs.popover') ? $element.data('bs.popover').tip() : $element.data('popover').tip(); + $tip.attr('id', step.id); + this._reposition($tip, step); + if (isOrphan) { + return this._center($tip); + } + }; + + Tour.prototype._template = function(step, i) { + var $navigation, $next, $prev, $resume, $template; + $template = $.isFunction(step.template) ? $(step.template(i, step)) : $(step.template); + $navigation = $template.find('.popover-navigation'); + $prev = $navigation.find('[data-role="prev"]'); + $next = $navigation.find('[data-role="next"]'); + $resume = $navigation.find('[data-role="pause-resume"]'); + if (this._isOrphan(step)) { + $template.addClass('orphan'); + } + $template.addClass("tour-" + this._options.name + " tour-" + this._options.name + "-" + i); + if (step.prev < 0) { + $prev.addClass('disabled'); + } + if (step.next < 0) { + $next.addClass('disabled'); + } + if (!step.duration) { + $resume.remove(); + } + return $template.clone().wrap('
    ').parent().html(); + }; + + Tour.prototype._reflexEvent = function(reflex) { + if ({}.toString.call(reflex) === '[object Boolean]') { + return 'click'; + } else { + return reflex; + } + }; + + Tour.prototype._reposition = function($tip, step) { + var offsetBottom, offsetHeight, offsetRight, offsetWidth, originalLeft, originalTop, tipOffset; + offsetWidth = $tip[0].offsetWidth; + offsetHeight = $tip[0].offsetHeight; + tipOffset = $tip.offset(); + originalLeft = tipOffset.left; + originalTop = tipOffset.top; + offsetBottom = $(document).outerHeight() - tipOffset.top - $tip.outerHeight(); + if (offsetBottom < 0) { + tipOffset.top = tipOffset.top + offsetBottom; + } + offsetRight = $('html').outerWidth() - tipOffset.left - $tip.outerWidth(); + if (offsetRight < 0) { + tipOffset.left = tipOffset.left + offsetRight; + } + if (tipOffset.top < 0) { + tipOffset.top = 0; + } + if (tipOffset.left < 0) { + tipOffset.left = 0; + } + $tip.offset(tipOffset); + if (step.placement === 'bottom' || step.placement === 'top') { + if (originalLeft !== tipOffset.left) { + return this._replaceArrow($tip, (tipOffset.left - originalLeft) * 2, offsetWidth, 'left'); + } + } else { + if (originalTop !== tipOffset.top) { + return this._replaceArrow($tip, (tipOffset.top - originalTop) * 2, offsetHeight, 'top'); + } + } + }; + + Tour.prototype._center = function($tip) { + return $tip.css('top', $(window).outerHeight() / 2 - $tip.outerHeight() / 2); + }; + + Tour.prototype._replaceArrow = function($tip, delta, dimension, position) { + return $tip.find('.arrow').css(position, delta ? 50 * (1 - delta / dimension) + '%' : ''); + }; + + Tour.prototype._scrollIntoView = function(element, callback) { + var $element, $window, counter, offsetTop, scrollTop, windowHeight; + $element = $(element); + if (!$element.length) { + return callback(); + } + $window = $(window); + offsetTop = $element.offset().top; + windowHeight = $window.height(); + scrollTop = Math.max(0, offsetTop - (windowHeight / 2)); + this._debug("Scroll into view. ScrollTop: " + scrollTop + ". Element offset: " + offsetTop + ". Window height: " + windowHeight + "."); + counter = 0; + return $('body, html').stop(true, true).animate({ + scrollTop: Math.ceil(scrollTop) + }, (function(_this) { + return function() { + if (++counter === 2) { + callback(); + return _this._debug("Scroll into view.\nAnimation end element offset: " + ($element.offset().top) + ".\nWindow height: " + ($window.height()) + "."); + } + }; + })(this)); + }; + + Tour.prototype._onResize = function(callback, timeout) { + return $(window).on("resize.tour-" + this._options.name, function() { + clearTimeout(timeout); + return timeout = setTimeout(callback, 100); + }); + }; + + Tour.prototype._initMouseNavigation = function() { + var _this; + _this = this; + return $(document).off("click.tour-" + this._options.name, ".popover.tour-" + this._options.name + " *[data-role='prev']").off("click.tour-" + this._options.name, ".popover.tour-" + this._options.name + " *[data-role='next']").off("click.tour-" + this._options.name, ".popover.tour-" + this._options.name + " *[data-role='end']").off("click.tour-" + this._options.name, ".popover.tour-" + this._options.name + " *[data-role='pause-resume']").on("click.tour-" + this._options.name, ".popover.tour-" + this._options.name + " *[data-role='next']", (function(_this) { + return function(e) { + e.preventDefault(); + return _this.next(); + }; + })(this)).on("click.tour-" + this._options.name, ".popover.tour-" + this._options.name + " *[data-role='prev']", (function(_this) { + return function(e) { + e.preventDefault(); + return _this.prev(); + }; + })(this)).on("click.tour-" + this._options.name, ".popover.tour-" + this._options.name + " *[data-role='end']", (function(_this) { + return function(e) { + e.preventDefault(); + return _this.end(); + }; + })(this)).on("click.tour-" + this._options.name, ".popover.tour-" + this._options.name + " *[data-role='pause-resume']", function(e) { + var $this; + e.preventDefault(); + $this = $(this); + $this.text(_this._paused ? $this.data('pause-text') : $this.data('resume-text')); + if (_this._paused) { + return _this.resume(); + } else { + return _this.pause(); + } + }); + }; + + Tour.prototype._initKeyboardNavigation = function() { + if (!this._options.keyboard) { + return; + } + return $(document).on("keyup.tour-" + this._options.name, (function(_this) { + return function(e) { + if (!e.which) { + return; + } + switch (e.which) { + case 39: + e.preventDefault(); + if (_this._isLast()) { + return _this.next(); + } else { + return _this.end(); + } + break; + case 37: + e.preventDefault(); + if (_this._current > 0) { + return _this.prev(); + } + break; + case 27: + e.preventDefault(); + return _this.end(); + } + }; + })(this)); + }; + + Tour.prototype._makePromise = function(result) { + if (result && $.isFunction(result.then)) { + return result; + } else { + return null; + } + }; + + Tour.prototype._callOnPromiseDone = function(promise, cb, arg) { + if (promise) { + return promise.then((function(_this) { + return function(e) { + return cb.call(_this, arg); + }; + })(this)); + } else { + return cb.call(this, arg); + } + }; + + Tour.prototype._showBackdrop = function(element) { + if (this.backdrop.backgroundShown) { + return; + } + this.backdrop = $('
    ', { + "class": 'tour-backdrop' + }); + this.backdrop.backgroundShown = true; + return $('body').append(this.backdrop); + }; + + Tour.prototype._hideBackdrop = function() { + this._hideOverlayElement(); + return this._hideBackground(); + }; + + Tour.prototype._hideBackground = function() { + if (this.backdrop) { + this.backdrop.remove(); + this.backdrop.overlay = null; + return this.backdrop.backgroundShown = false; + } + }; + + Tour.prototype._showOverlayElement = function(step) { + var $element, elementData; + $element = $(step.element); + if (!$element || $element.length === 0 || this.backdrop.overlayElementShown) { + return; + } + this.backdrop.overlayElementShown = true; + this.backdrop.$element = $element.addClass('tour-step-backdrop'); + this.backdrop.$background = $('
    ', { + "class": 'tour-step-background' + }); + elementData = { + width: $element.innerWidth(), + height: $element.innerHeight(), + offset: $element.offset() + }; + this.backdrop.$background.appendTo('body'); + if (step.backdropPadding) { + elementData = this._applyBackdropPadding(step.backdropPadding, elementData); + } + return this.backdrop.$background.width(elementData.width).height(elementData.height).offset(elementData.offset); + }; + + Tour.prototype._hideOverlayElement = function() { + if (!this.backdrop.overlayElementShown) { + return; + } + this.backdrop.$element.removeClass('tour-step-backdrop'); + this.backdrop.$background.remove(); + this.backdrop.$element = null; + this.backdrop.$background = null; + return this.backdrop.overlayElementShown = false; + }; + + Tour.prototype._applyBackdropPadding = function(padding, data) { + if (typeof padding === 'object') { + if (padding.top == null) { + padding.top = 0; + } + if (padding.right == null) { + padding.right = 0; + } + if (padding.bottom == null) { + padding.bottom = 0; + } + if (padding.left == null) { + padding.left = 0; + } + data.offset.top = data.offset.top - padding.top; + data.offset.left = data.offset.left - padding.left; + data.width = data.width + padding.left + padding.right; + data.height = data.height + padding.top + padding.bottom; + } else { + data.offset.top = data.offset.top - padding; + data.offset.left = data.offset.left - padding; + data.width = data.width + (padding * 2); + data.height = data.height + (padding * 2); + } + return data; + }; + + Tour.prototype._clearTimer = function() { + window.clearTimeout(this._timer); + this._timer = null; + return this._duration = null; + }; + + return Tour; + + })(); + return window.Tour = Tour; +})(jQuery, window); diff --git a/sources/plugins/TakeATour/js/custom.patch b/sources/plugins/TakeATour/js/custom.patch index 0ad5f0b..c372de0 100644 --- a/sources/plugins/TakeATour/js/custom.patch +++ b/sources/plugins/TakeATour/js/custom.patch @@ -1,43 +1,43 @@ ---- E:/Program Files/EasyPHP/www/SITE/sandbox/pwg_test/piwigo_trunk/plugins/TakeATour/js/903.js Mon Jun 23 21:44:59 2014 -+++ E:/Program Files/EasyPHP/www/SITE/sandbox/pwg_test/piwigo_trunk/plugins/TakeATour/js/custom-bootstrap-tour-standalone.js Sun Apr 13 19:05:42 2014 -@@ -849,9 +849,15 @@ - return step.path; - } - }).call(_this); -- current_path = [document.location.pathname, document.location.hash].join(""); -+ current_path = document.location.href; - if (_this._isRedirect(path, current_path)) { -+ if (toString.call(path) === "[object RegExp]") { - _this._redirect(step, path); -+ } -+ else { -+ path = document.location.protocol+'//'+path; -+ _this._redirect(step, path); -+ } - return; - } - if (_this._isOrphan(step)) { -@@ -866,6 +872,14 @@ - } - _this._debug("Show the orphan step " + (_this._current + 1) + ". Orphans option is true."); - } -+ if (step.title === "" & step.content === "") { -+ if (skipToPrevious) { -+ _this._showPrevStep(); -+ } else { -+ _this._showNextStep(); -+ } -+ return; -+ } - if (step.backdrop) { - _this._showBackdrop(!_this._isOrphan(step) ? step.element : void 0); - } -@@ -988,7 +1002,7 @@ - }; - - Tour.prototype._isRedirect = function(path, currentPath) { -- return (path != null) && path !== "" && (({}.toString.call(path) === "[object RegExp]" && !path.test(currentPath)) || ({}.toString.call(path) === "[object String]" && path.replace(/\?.*$/, "").replace(/\/?$/, "") !== currentPath.replace(/\/?$/, ""))); -+ return (path != null) && path !== "" && ((toString.call(path) === "[object RegExp]" && !path.test(currentPath)) || (toString.call(path) === "[object String]" && path !== currentPath.replace("http://", "").replace("https://", ""))); - }; - - Tour.prototype._redirect = function(step, path) { +--- bootstrap-tour-standalone.js.orig 2015-02-10 14:28:55.000000000 +0100 ++++ bootstrap-tour-standalone.js 2015-02-10 14:35:03.000000000 +0100 +@@ -870,9 +870,15 @@ + return step.path; + } + }).call(_this); +- current_path = [document.location.pathname, document.location.hash].join(''); ++ current_path = document.location.href; + if (_this._isRedirect(path, current_path)) { ++ if ({}.toString.call(path) === "[object RegExp]") { ++ _this._redirect(step, path); ++ } ++ else { ++ path = document.location.protocol+'//'+path; + _this._redirect(step, path); ++ } + return; + } + if (_this._isOrphan(step)) { +@@ -887,6 +893,14 @@ + } + _this._debug("Show the orphan step " + (_this._current + 1) + ". Orphans option is true."); + } ++ if (step.title === "" & step.content === "") { ++ if (skipToPrevious) { ++ _this._showPrevStep(); ++ } else { ++ _this._showNextStep(); ++ } ++ return; ++ } + if (step.backdrop) { + _this._showBackdrop(!_this._isOrphan(step) ? step.element : void 0); + } +@@ -1023,7 +1037,7 @@ + }; + + Tour.prototype._isRedirect = function(path, currentPath) { +- return (path != null) && path !== '' && (({}.toString.call(path) === '[object RegExp]' && !path.test(currentPath)) || ({}.toString.call(path) === '[object String]' && path.replace(/\?.*$/, '').replace(/\/?$/, '') !== currentPath.replace(/\/?$/, ''))); ++ return (path != null) && path !== '' && (({}.toString.call(path) === '[object RegExp]' && !path.test(currentPath)) || ({}.toString.call(path) === '[object String]' && path !== currentPath.replace("http://", "").replace("https://", ""))); + }; + + Tour.prototype._redirect = function(step, path) { diff --git a/sources/plugins/TakeATour/language/ca_ES/plugin.lang.php b/sources/plugins/TakeATour/language/ca_ES/plugin.lang.php index a18a4ec..b74b8cb 100755 --- a/sources/plugins/TakeATour/language/ca_ES/plugin.lang.php +++ b/sources/plugins/TakeATour/language/ca_ES/plugin.lang.php @@ -33,4 +33,6 @@ $lang['End tour'] = 'Acaba l\'exploració'; $lang['Next '] = 'Següent'; $lang['Prev'] = 'Anterior'; $lang['Privacy'] = 'Privacitat'; -$lang['privacy_descrp'] = 'Aquesta exploració presenta tots els camins per protegir les vostres fotos de l\'accés públic afegint permisos en els àlbums i fotos, i evitant la còpia d\'imatges protegides.'; \ No newline at end of file +$lang['privacy_descrp'] = 'Aquesta exploració presenta tots els camins per protegir les vostres fotos de l\'accés públic afegint permisos en els àlbums i fotos, i evitant la còpia d\'imatges protegides.'; +$lang['2.8 Tour'] = 'Explora 2.8'; +$lang['2_8_0_descrp'] = 'Descobreix algunes noves funcionalitats de Piwigo 2.8. Llegiu els detalls visitant les notes de la versió.'; \ No newline at end of file diff --git a/sources/plugins/TakeATour/language/ca_ES/tour_2_7_0.lang.php b/sources/plugins/TakeATour/language/ca_ES/tour_2_7_0.lang.php index eba1913..7f75e3f 100755 --- a/sources/plugins/TakeATour/language/ca_ES/tour_2_7_0.lang.php +++ b/sources/plugins/TakeATour/language/ca_ES/tour_2_7_0.lang.php @@ -1,36 +1,36 @@ Aquesta pàgina està disponible a Connectors » Exploreu '; $lang['2_7_0_stp11'] = 'Aquesta exploració s\'ha acabat

    Gaudiu de Piwigo 2.7

    Si us agrada Piwigo i voleu donar-nos suport, podeu contribuir ajudant a traduir, donant, etc. Cliqueu aquí per donar suport Gràcies!'; $lang['2_7_0_title10'] = 'Filtre de mida de fitxer'; diff --git a/sources/plugins/TakeATour/language/ca_ES/tour_first_contact.lang.php b/sources/plugins/TakeATour/language/ca_ES/tour_first_contact.lang.php index 07b2963..c4a0278 100644 --- a/sources/plugins/TakeATour/language/ca_ES/tour_first_contact.lang.php +++ b/sources/plugins/TakeATour/language/ca_ES/tour_first_contact.lang.php @@ -1,7 +1,7 @@ Podeu descobrir més característiques de Piwigo agafant una altra exploració o llegint la documentació al lloc web de piwigo.org'; $lang['first_contact_stp20'] = 'Quan el ratolí passa per sobre d\'un àlbum apareix la informació i els enllaços. Quan cliqueu i arrastreu un àlbum -un bloc arrodonit- podeu canviar la posició i més tard guardar o cancel·lar l\'ordre manual.'; $lang['first_contact_stp19_b'] = 'Aquí hi ha un llistat dels àlbums \'arrel\''; -$lang['first_contact_stp12'] = 'després podeu editar-les emprant una acció'; \ No newline at end of file +$lang['first_contact_stp12'] = 'després podeu editar-les emprant una acció'; +$lang['first_contact_title15'] = 'La pàgina d\'edició d\'una foto'; +$lang['first_contact_title33'] = 'Configuració de l\'usuari visitant'; +$lang['first_contact_stp35'] = 'Indiqueu el tema que més us agradi com a tema predeterminat'; +$lang['first_contact_stp34'] = 'La primera cosa que s\'ha de fer per personalitzar Piwigo és escollir un tema. Els temes instal·lats es mostren aquí.
    Es pot habilitar més d\'un tema: Els usuaris poden canviar el seu tema escollint entre tots els que s\'habiliten aquí, si la opció \'Permet la personalitzacio als usuaris\' està activa a la pàgina d\'opcions.'; +$lang['first_contact_stp23'] = 'Bloquejar un àlbum significa que només els administradors són capaços de veure aquell àlbum: molt útil quan es prepara l\'àlbum abans de publicar-lo.'; +$lang['first_contact_stp18'] = 'Anem a veure com gestionar els àlbums. Cliqueu a Àlbums » Gestiona o cliqueu a Següent'; +$lang['first_contact_stp22'] = 'Com una foto, aquí es poden editar les propietats d\'un àlbum'; +$lang['first_contact_title43'] = 'Ha estat un plaer'; +$lang['first_contact_stp6'] = 'Veieu les fotos que s\'han llistat. Quan estigueu preparats cliqueu el boto Inicia càrrega'; +$lang['first_contact_stp21'] = 'La següent pestanya és una pàgina que permet moure qualsevol àlbum virtual.
    L\'enllaç permanent de la pestanya permet configurar una url particular per un àlbum.
    Anem a editar un àlbum: cliqueu sobre Edita un àlbum '; +$lang['first_contact_stp3'] = 'En la primera pestanya es on podeu afegir fotos directament des del vostre navegador. La resta de pestanyes permeten afegir fotos d\'altres maneres.'; +$lang['first_contact_stp29'] = 'Aquí, en aquesta primera pàgina, podeu configurar la configuració bàsica de la vostra galeria.'; +$lang['first_contact_stp28'] = 'Ara mirarem les opcions possibles per configurar Piwigo al vostre gust. Cliqueu a Configuració -> Opcions o simplement cliqueu a Següent.'; +$lang['first_contact_stp37'] = 'Per instal·lar nous temes, podeu descargar-los directament a la pestanya \'Afegeix un nou tema\'. Només es mostren els temes compatibles amb la vostra versió de Piwigo.

    Anem ara a descobrir els connectors! Cliqueu sobre Connectors » Gestiona '; +$lang['first_contact_stp9'] = 'Ara esteu en el Gestor de processament per lots, aquí podeu editar múltiples fotos al mateix temps.

    Aquí el pre-filtre està seleccionat al "Carret" ja que venim de la pàgina de pujades.'; +$lang['first_contact_stp8'] = 'Som-hi, edite-lo! Cliqueu sobre l\'enllaç'; +$lang['first_contact_stp5'] = 'Després feu clic al botó per seleccionar les fotos a enviar, o simplement cliqueu i arrossegueu els vostres fitxers.'; +$lang['first_contact_stp17'] = 'Aquí podeu posar la foto com a miniatura d\'un o diversos àlbums. La foto no ha d\'estar associada amb l\'àlbum per poder ser la seva miniatura. Si la foto està associada amb l\'àlbum es tan simple d\'indicar-ho des de la pàgina pública de la foto (pista: utilitzeu el connector Admin Tools per que sigui encara més fàcil).'; \ No newline at end of file diff --git a/sources/plugins/TakeATour/language/ca_ES/tour_privacy.lang.php b/sources/plugins/TakeATour/language/ca_ES/tour_privacy.lang.php index 840ddac..13c2b84 100644 --- a/sources/plugins/TakeATour/language/ca_ES/tour_privacy.lang.php +++ b/sources/plugins/TakeATour/language/ca_ES/tour_privacy.lang.php @@ -15,3 +15,7 @@ $lang['privacy_title6'] = 'Nivell de privacitat'; $lang['privacy_title7'] = 'Nivell de privacitat'; $lang['privacy_title8'] = 'Nivell de privacitat'; $lang['privacy_title9'] = 'Nivell de privacitat'; +$lang['privacy_stp8'] = 'Seleccioneu una o més fotografies...'; +$lang['privacy_stp3'] = 'Preneu-vos un moment per llegir la informació de sota.'; +$lang['privacy_stp13'] = 'Ara feu clic sobre privat'; +$lang['privacy_stp11'] = 'Ara feu clic sobre la pestanya de Permisos'; \ No newline at end of file diff --git a/sources/plugins/TakeATour/language/cs_CZ/plugin.lang.php b/sources/plugins/TakeATour/language/cs_CZ/plugin.lang.php index 5ae18e6..fad4377 100644 --- a/sources/plugins/TakeATour/language/cs_CZ/plugin.lang.php +++ b/sources/plugins/TakeATour/language/cs_CZ/plugin.lang.php @@ -13,3 +13,5 @@ $lang['2.7 Tour'] = 'Ukázka 2.7'; $lang['2_7_0_descrp'] = 'Zjisti co je nového v Piwigo 2.7'; $lang['Privacy'] = 'Soukromí'; $lang['privacy_descrp'] = 'Tato ukázka prezentuje vše okolo ochrany vašich fotografií před veřejným přístupem díky možnostem nastavit oprávnění pro přístup na každé album a fotku a zamezení snadnému kopírování použitím aktivní ochrany obrázků.'; +$lang['2.8 Tour'] = '2.8 Prohlídka'; +$lang['2_8_0_descrp'] = 'Objevte některé nové funkce Piwigo verze 2.8. Přečíst si více v podrobnostech k vydání.'; \ No newline at end of file diff --git a/sources/plugins/TakeATour/language/da_DK/plugin.lang.php b/sources/plugins/TakeATour/language/da_DK/plugin.lang.php index bf0bf37..5310a71 100755 --- a/sources/plugins/TakeATour/language/da_DK/plugin.lang.php +++ b/sources/plugins/TakeATour/language/da_DK/plugin.lang.php @@ -36,4 +36,6 @@ $lang['2.7 Tour'] = 'Udflugt i 2.7'; $lang['2_7_0_descrp'] = 'Opdag nyhederne i Piwigo 2.7'; $lang['privacy_descrp'] = 'Denne udflugt præsenterer dig for alle de måder, du kan beskytte et fotografi mod offentlig adgang ved hjælp af rettighedssysteer pr. album og pr. billede, og mod kopiering ved hjælp af billedbeskyttelser.'; -$lang['Privacy'] = 'Privatliv'; \ No newline at end of file +$lang['Privacy'] = 'Privatliv'; +$lang['2.8 Tour'] = 'Udflugt i 2.8'; +$lang['2_8_0_descrp'] = 'Opdag nogle af de nye funktioner i Piwigo 2.8. Læs flere oplysninger i udgivelsesbemærkningerne.'; \ No newline at end of file diff --git a/sources/plugins/TakeATour/language/de_DE/plugin.lang.php b/sources/plugins/TakeATour/language/de_DE/plugin.lang.php index 15e3dea..bda7d8a 100755 --- a/sources/plugins/TakeATour/language/de_DE/plugin.lang.php +++ b/sources/plugins/TakeATour/language/de_DE/plugin.lang.php @@ -24,16 +24,18 @@ $lang['takeatour_configpage'] = 'Mache eine Tour >> Liste der Touren'; $lang['Take a tour and discover the features of your Piwigo gallery » Go to the available tours'] = 'Mache eine Tour und entdecke die Funktionen deiner Piwigo Galerie >> Gehe zu den verfügbaren Touren '; $lang['Start the Tour'] = 'Tour starten'; $lang['Visit your Piwigo!'] = 'Besuche dein Piwigo!'; -$lang['TAT_descrp'] = 'Herzlich Willkommen! Hier findest du die Liste aller verfügbaren Touren zu den Funktionen der Piwigo Galerie.
    Starte unten eine Tour und folge den Anweisungen. Klicke auf \"Vorhergehende\" / \"Nächste\" (oder benutze die Pfeile auf der Tastatur) um in einer Tour zu navigieren. Wenn du beim Rundgang zur Verwaltungs-Seite gehst, wirst du danach auf die aktuelle Seite der Tour umgeleitet. Falls du stecken bleibst und die Tour nicht beenden kannst, gehe auf das Plugin » Mache eine Tour um die Tour zu beenden.'; +$lang['TAT_descrp'] = 'Herzlich Willkommen! Hier findest du die Liste aller verfügbaren Touren zu den Funktionen der Piwigo Galerie.
    Starte unten eine Tour und folge den Anweisungen. Klicke auf "Vorhergehende" / "Nächste" (oder benutze die Pfeile auf der Tastatur) um in einer Tour zu navigieren. Wenn du beim Rundgang zur Verwaltungs-Seite gehst, wirst du danach auf die aktuelle Seite der Tour umgeleitet. Falls du stecken bleibst und die Tour nicht beenden kannst, gehe auf das Plugin » Mache eine Tour um die Tour zu beenden.'; $lang['Prev'] = 'Vorhergehende'; $lang['Next '] = 'Nächste'; $lang['End tour'] = 'Tour beenden'; $lang['First Contact'] = 'Erster Kontakt'; -$lang['first_contact_descrp'] = 'Empfohlen für Anfänger, diese Tour stellt dir die Grundlagen von Piwigo vor. Sie startet mit hinzufügen und verwalten von Bildern. Die Tour geht weiter mit Album-Management und Zugriffsrechte und endet mit individueller Konfiguration der Themen und Plugins.'; +$lang['first_contact_descrp'] = 'Empfohlen für Anfänger, diese Tour stellt dir die Grundlagen von Piwigo vor. Sie startet mit dem Hinzufügen und Verwalten von Bildern. Die Tour geht weiter mit Album-Management und Zugriffsrechte und endet mit individueller Konfiguration der Themen und Plugins.'; $lang['privacy_descrp'] = 'Diese Tour beschreibt alle Möglichkeiten, deine Fotos mit dem Zugriffssystem pro Album oder Foto vor dem öffentlichen Zugriff und mit dem Bildschutz vor dem Kopieren zu schützen.'; $lang['2.7 Tour'] = '2.7 Tour'; $lang['2_7_0_descrp'] = 'Endecke die Neuigkeiten in Piwigo 2.7'; -$lang['Privacy'] = 'Privatsphäre'; \ No newline at end of file +$lang['Privacy'] = 'Privatsphäre'; +$lang['2.8 Tour'] = '2.8 Tour'; +$lang['2_8_0_descrp'] = 'Lerne einige der neuen Funktionen von Piwigo 2.8 kennen. Lies Einzelheiten dazu in den Versionshinweisen.'; \ No newline at end of file diff --git a/sources/plugins/TakeATour/language/de_DE/tour_2_7_0.lang.php b/sources/plugins/TakeATour/language/de_DE/tour_2_7_0.lang.php index 4a6cfaf..7ee4ef1 100644 --- a/sources/plugins/TakeATour/language/de_DE/tour_2_7_0.lang.php +++ b/sources/plugins/TakeATour/language/de_DE/tour_2_7_0.lang.php @@ -8,7 +8,7 @@ $lang['2_7_0_title5'] = 'Zeit'; $lang['2_7_0_title1'] = 'Willkommen bei Piwigo 2.7'; $lang['2_7_0_title11'] = 'Bis bald!'; $lang['2_7_0_title2'] = 'Die ersten neuen Funktionen'; -$lang['2_7_0_stp2'] = 'Wie du siehst, wurde ein vorgegebenes Plugin hinzugefügt. Take a Tour. Dieses Plugin hilft dir Piwigo zu entdecken. Hier sind alle verfügbaren Touren aufgelistet.
    Diese Seite ist in Plugins » Take a Tour verfügbar '; +$lang['2_7_0_stp2'] = 'Wie du siehst, wurde ein vorgegebenes Plugin hinzugefügt. "Take a Tour". Dieses Plugin hilft dir Piwigo zu entdecken. Hier sind alle verfügbaren Touren aufgelistet.
    Diese Seite ist in Plugins » Take a Tour verfügbar '; $lang['2_7_0_stp11'] = 'Diese Tour ist zu Ende.

    Freue dich über Piwigo 2.7!

    Wenn dir Piwigo gefällt und du uns unterstützen möchtest, dann kannst du beim übersetzen helfen, etwas Spenden usw. Klicke hier um uns zu unterstützen '; $lang['2_7_0_stp1'] = 'Hallo! Ich begleite dich, um Piwigo zu entdecken. Bitte folge meinen Anweisungen und klicke auf Nächste (oder benutze die Pfeile der Tastatur) zum navigieren. Wenn du auf andere Seiten gehst, wirst du danach auf die aktuelle Seite der Tour umgeleitet.'; $lang['2_7_0_stp9'] = 'Ein Suchfilter wurde der Stapelverarbeitung spendiert. Er verfügt über eine mächtige Syntax um Fotos nach Datum, Schlagworten, Größe, Dateinamen zu suchen. Optionen wie Exakt, Und/Oder, Gruppierung und Exkludieren werden unterstützt. Du kannst später die detaillierte Hilfe hierzu lesen. Die gleiche Syntax gilt für die Schnellsuche auf der öffentlichen Seite im Menü.'; diff --git a/sources/plugins/TakeATour/language/de_DE/tour_first_contact.lang.php b/sources/plugins/TakeATour/language/de_DE/tour_first_contact.lang.php index 7dadaec..65d2d87 100644 --- a/sources/plugins/TakeATour/language/de_DE/tour_first_contact.lang.php +++ b/sources/plugins/TakeATour/language/de_DE/tour_first_contact.lang.php @@ -48,7 +48,7 @@ $lang['first_contact_stp2'] = 'Der Link ist hier. Klicke "Nächste" zum weiterma $lang['first_contact_stp14'] = 'Wir sehen hier die Bearbeitungs-Seite eines Bildes. Dise Seite ist von hier aus erreichbar, aber auch von der öffentlichen Seite, wenn du als Administrator angemeldet bist. Klicke auf Bearbeiten oder Nächste'; $lang['first_contact_stp13'] = 'Du kannst Beschreibungen und mehr in der Stapelverarbeitung im Einzelmodus bearbeiten. Aber jetzt wollen wir im Global-Modus bleiben'; $lang['first_contact_stp10'] = 'Hier ist der Link, um direkt auf deinen Sammelkorb zuzugreifen: Das ist ein Tool für Administratoren um auf einfache Weise Bilder zu einem Satz hinzuzufügen und in der Stapelverarbeitung zu bearbeiten. Wenn du als Admin angemeldet bist, kannst du Fotos zum Sammelkorb aus der öffentlichen Seite hinzufügen, oder die Aktion "In den Sammelkorb" der Stapelverarbeitung benutzen.'; -$lang['first_contact_stp1'] = 'Hallo! Ich werde dein Begleiter sein, um Piwigo zu entdecken. Bitte folge meinen Anweisungen und klicke auf "Nächste" (oder benutze die Pfeile auf der Tastatur) zum navigieren. Wenn du beim Rundgang zur Verwaltungs-Seite gehst, wirst du danach auf die aktuelle Seite der Tour umgeleitet. Falls du stecken bleibst und die Tour nicht beenden kannst, gehe auf das Plugins » Mache eine Tour um die Tour zu beenden.
    Lass uns beginnen, indem wir Bilder hinzufügen!'; +$lang['first_contact_stp1'] = 'Hallo! Ich werde dein Begleiter sein, um Piwigo zu entdecken. Bitte folge meinen Anweisungen und klicke auf "Nächste" (oder benutze die Pfeile auf der Tastatur) zum Navigieren. Wenn du beim Rundgang zur Verwaltungs-Seite gehst, wirst du danach auf die aktuelle Seite der Tour umgeleitet. Falls du stecken bleibst und die Tour nicht beenden kannst, gehe zu Plugins » Mache eine Tour, um die Tour zu beenden.
    Lass uns beginnen, indem wir Bilder hinzufügen!'; $lang['first_contact_stp16'] = 'Hier kannst du Bilder den Alben hinzufügen oder dies entfernen. Die Verknüpfung ist virtuell, keine Bilder werden physikalisch verschoben.'; $lang['first_contact_stp20'] = 'Wenn deine Maus über einem Album ist, werden Links und Informationen angezeigt. Die Position eines Album kannst du per klicken & ziehen ändern, dann kannst du diese manuelle Änderung speichern oder abbrechen.'; $lang['first_contact_stp43'] = 'Diese Tour war sehr lange, wir haben aber nur einen kleinen Teil gesehen, wie mächtig Piwigo ist. Alles hat ein Ende, diese Übersicht ist nun beendet.
    Du kannst viel tiefer in die Eigenschaften von Piwigo einsteigen, indem du eine andere Tour nimmst oder unserer Dokumentation auf der Website piwigo.org liest.'; @@ -68,7 +68,7 @@ $lang['first_contact_stp38'] = 'Plugins sind sehr einfache Möglichkeiten, dein $lang['first_contact_stp34'] = 'Ein Thema zu wählen ist der erste Schritt Piwigo anzupassen. Installierte Themen werden hier aufgelistet.
    Es kann mehr als ein Thema aktiviert werden. Benutzer können so ihr eigenes Thema aus den freigeschalteten Themen wählen, falls die Option \'Erlaube Anpassungen durch Benutzer\' auf der Optionsseite eingeschaltet wurde.'; $lang['first_contact_stp35'] = 'Setze dein favorisiertes Thema als Standard.'; $lang['first_contact_stp5'] = 'Dann klicke den Schalter um gewählte Fotos zu senden oder ziehe einfach die Dateien.'; -$lang['first_contact_stp21'] = 'Der nächste Reiter ist eine Seite auf der du jedes virtuelle Album bewegen kannst.
    Der Permalinks Reiter existiert, um für ein bestimmtes Album einen URL-Verweis zu setzen.
    Aber lass uns erst ein Album editieren: Klicke auf Album verwalten.'; +$lang['first_contact_stp21'] = 'Der nächste Reiter ist eine Seite auf der du jedes virtuelle Album bewegen kannst.
    Der Permalinks Reiter existiert, um für Alben feste Adressen (URLs) festzulegen.
    Aber lass uns erst ein Album editieren: Klicke auf Bearbeiten.'; $lang['first_contact_stp19'] = 'Hier sind nun alle Haupt-Alben gelistet. Wenn du ein Album mit gestricheltem Hintergrund siehst, ist dies ein physisches Album aus einer FTP Synchronisation. Physische Alben können an dieser Stelle nicht verschoben oder gelöscht werden. Alle anderen Alben nennt man Virtuelle Alben.'; $lang['first_contact_stp19_b'] = 'Hier sind Haupt-Alben gelistet.'; $lang['first_contact_stp18'] = 'Lass uns nun ansehen wie man Alben verwaltet. Klicke auf Alben » Verwalten oder Nächste'; diff --git a/sources/plugins/TakeATour/language/el_GR/plugin.lang.php b/sources/plugins/TakeATour/language/el_GR/plugin.lang.php index 1154e91..0149534 100755 --- a/sources/plugins/TakeATour/language/el_GR/plugin.lang.php +++ b/sources/plugins/TakeATour/language/el_GR/plugin.lang.php @@ -37,4 +37,7 @@ $lang['2_7_0_descrp'] = 'Ανακαλύψτε τι νέο υπάρχει στο $lang['2.7 Tour'] = '2.7 Tour'; $lang['privacy_descrp'] = 'Η περιήγηση αυτή παρουσιάζει τρόπους να προστατέψετε τις φωτογραφίες σας από δημόσια πρόσβαση με ένα σύστημα αδειών ανά λεύκωμα και ανά εικόνα, και από την αντιγραφή χρησιμοποιώντας προστασία εικόνας. '; -$lang['Privacy'] = 'Προστασία Προσωπικών Δεδομένων'; \ No newline at end of file +$lang['Privacy'] = 'Προστασία Προσωπικών Δεδομένων'; +$lang['2_8_0_descrp'] = 'Ανακαλύψτε μερικά νέα χαρακτηριστικά του Piwigo 2.8. Διαβάστε σχετικά λεπτομέρειες στο the release notes. +'; +$lang['2.8 Tour'] = 'Περιήγηση 2.8 '; \ No newline at end of file diff --git a/sources/plugins/TakeATour/language/en_UK/plugin.lang.php b/sources/plugins/TakeATour/language/en_UK/plugin.lang.php index 893ad63..41edc3b 100644 --- a/sources/plugins/TakeATour/language/en_UK/plugin.lang.php +++ b/sources/plugins/TakeATour/language/en_UK/plugin.lang.php @@ -12,4 +12,6 @@ $lang['first_contact_descrp'] = 'Recommended for beginners, this tour introduce $lang['2.7 Tour'] = '2.7 Tour'; $lang['2_7_0_descrp'] = 'Discover What\'s New in Piwigo 2.7'; $lang['Privacy'] = 'Privacy'; -$lang['privacy_descrp'] = 'This tour presents all the ways to protect your photo from public access with permissions per album and per photo, and from copying using image protections.'; \ No newline at end of file +$lang['privacy_descrp'] = 'This tour presents all the ways to protect your photo from public access with permissions per album and per photo, and from copying using image protections.'; +$lang['2.8 Tour'] = '2.8 Tour'; +$lang['2_8_0_descrp'] = 'Discover some Piwigo 2.8 new features. Read details on the release notes.'; diff --git a/sources/plugins/TakeATour/language/eo_EO/tour_first_contact.lang.php b/sources/plugins/TakeATour/language/eo_EO/tour_first_contact.lang.php index 7b66f68..5bdd0bc 100644 --- a/sources/plugins/TakeATour/language/eo_EO/tour_first_contact.lang.php +++ b/sources/plugins/TakeATour/language/eo_EO/tour_first_contact.lang.php @@ -21,11 +21,11 @@ $lang['first_contact_stp2'] = 'La ligilo estas ĉi-tie. Alklaku sur Sekva por ko $lang['first_contact_stp15'] = 'Sur tiu paĝo vi povas redakti ĉiujn ecojn de foto, ekzemple...'; $lang['first_contact_stp11'] = 'Do vi povas selekti ĉitie inter unu kaj pli da fotoj'; $lang['first_contact_stp29'] = 'Ĉi-tie, sur tiu unua paĝo, vi elektos la ĉefan kaj bazan agordon sur via galerio.'; -$lang['first_contact_stp30'] = 'Komencu ni per ŝanĝo de la titolo'; +$lang['first_contact_stp30'] = 'Eku ni ŝanĝante la titolon'; $lang['first_contact_stp1'] = 'Saluton! Mi estos via ĉiĉerono por malkovri na Piwigo. Bonvolu sekvi miajn instrukciojn, kaj alklaku Sekvanta (aŭ uzu la sagojn el via klavaro) por navigi. Se vi iras al alia paĝo de la administrado, vi estos alidirektita al la aktuala paĝo de la travizito. Se vi estas blokita kaj ne povas fini la traviziton, iri al Kromaĵoj » Traviziti finos la travizion.
    Komencu ni per aldono de bildoj!'; $lang['first_contact_stp13'] = 'Vi povas redakti priskribojn kaj pli el la stapla mastrumilo dum unuopa modo. Sed nun, pludaŭrigu la ĝenerala modo.'; $lang['first_contact_stp16'] = 'ĉi-tie por aldoni aŭ forigi la foton el fotaroj. La ligo estas virtuala, neniu foto estos forigita iam ajn.'; -$lang['first_contact_stp32'] = 'Nun savu viajn ŝanĝojn'; +$lang['first_contact_stp32'] = 'Nun konservu viajn ŝanĝojn'; $lang['first_contact_stp28'] = 'Nun ni interesiĝos pri la opcioj disponeblaj por agordi, ke Piwigo funkciu kiel vi deziras. Alklaku sur Agordoj->Opcioj aŭ simple sur sekvanta.'; $lang['first_contact_stp23'] = 'Ŝlosi fotaron signifas, ke nur administrantoj rajtos vidi tiun fotaron: ege utilas kiam vi preparas fotaron antaŭ publikigado'; $lang['first_contact_stp3'] = 'La unua langeto estas, kie vi aldonas fotojn rekte el via dosieresplorilo. La aliaj langetoj traktas pri la aliaj manieroj elŝuti fotojn'; @@ -40,4 +40,29 @@ $lang['first_contact_stp6'] = 'Vi vidas, ke fotoj listiĝas. Kiam vi pretas, mus $lang['first_contact_stp19_b'] = 'Jen la listo de \'radikaj\' fotaroj.'; $lang['first_contact_stp21'] = 'La venonta langeto estas paĝo, kie eblas al vi movigi iun ajn virtualan fotaron.
    La konstantliga langeto servas por agordi apartan retadreson al fotaro.
    Sed redaktu ni fotaron: musklaku sur Redakti fotaron'; $lang['first_contact_stp18'] = 'Nun, vidu ni pri la mastrumado de fotaroj. Musklaku sur Fotaro » Mastrumado aŭ sur Poste'; -$lang['first_contact_stp12'] = 'kaj, poste, redaktu ilin uzante agon'; \ No newline at end of file +$lang['first_contact_stp12'] = 'kaj, poste, redaktu ilin uzante agon'; +$lang['first_contact_title37'] = 'Temoj'; +$lang['first_contact_title38'] = 'Kromprogramoj'; +$lang['first_contact_title39'] = 'Kromprogramoj'; +$lang['first_contact_title4'] = 'Aldonu ni foton!'; +$lang['first_contact_title43'] = 'Kiel mojosa momento'; +$lang['first_contact_title9'] = 'Stapla Mastrumilo'; +$lang['first_contact_title22'] = 'Fotaroredakta paĝo'; +$lang['first_contact_title28'] = 'Agordoj'; +$lang['first_contact_title29'] = 'Agordoj » Elektebloj » Ĝeneralaj'; +$lang['first_contact_title3'] = 'Aldoni fotopaĝon'; +$lang['first_contact_title33'] = 'Agordoj de invitito'; +$lang['first_contact_title34'] = 'Temoj'; +$lang['first_contact_title35'] = 'Temoj'; +$lang['first_contact_title11'] = 'Kiel redakti foton'; +$lang['first_contact_title15'] = 'La redakta paĝo de foto'; +$lang['first_contact_title18'] = 'Mastrumi fotarojn'; +$lang['first_contact_title19'] = 'Mastrumi Fotarojn'; +$lang['first_contact_title20'] = 'Mastrumi Fotarojn'; +$lang['first_contact_title21'] = 'Aliaj langetoj'; +$lang['first_contact_stp10'] = 'Jen la ligilo por rekte atingi vian korbon: estas ilo por ke la administrantoj facile kolektu fotojn dum foliumado de la publika parto, cele al redakti ilin en la Stapla Mastrumilo. +

    Vi povas aldoni fotojn al la korbon de la publikfoto-paĝo, post ensaluto kiel administranto, aŭ uzante la ago "Aldoni al korbo" de la Stapla Mastrumilo.'; +$lang['first_contact_stp14'] = 'Nun ni vidu la redaktopaĝon de iu foto. Tiu paĝo atingeblas de tie sed ankaŭ de la publika fotopaĝo, se vi ensalutas kiel administranto.

    Musumu la miniaturon kaj poste musklaku na Redakti.'; +$lang['first_contact_stp17'] = 'Ĉitie eblas al vi estigi la foton kiel miniaturo de unu aŭ pluraj fotaroj. Ne nepras ke la foto estu asociita kun la fotaro, eĉ pli simplas estigi ĝin kiel fotara miniaturo de la publika paĝo de la foto (truko: uzu la kromprogramon Administradaj Iloj por eĉ pli da simpleco)'; +$lang['first_contact_stp31'] = 'Tiam la rubando, kiu montriĝos supre de ĉiuj paĝoj. Kiel vi vidas, HTML-etikedoj estas permesitaj ĉi-tie. Vi povas uzi ankaŭ la ŝlosilvorton %gallery_title% por vidigi la titolon, kiun vi ĵus tajpis supre.'; +$lang['first_contact_stp20'] = 'Kiam vi musumas super fotaro, ligiloj kaj informoj aperas. Kiam vi ŝovmetas fotaron (rondigitan blokon), vi ŝanĝos ĝian pozicion kaj tiel vi povas konservi aŭ malfari vian permanan ordonon.'; \ No newline at end of file diff --git a/sources/plugins/TakeATour/language/es_ES/plugin.lang.php b/sources/plugins/TakeATour/language/es_ES/plugin.lang.php index 4ac754f..15ff225 100755 --- a/sources/plugins/TakeATour/language/es_ES/plugin.lang.php +++ b/sources/plugins/TakeATour/language/es_ES/plugin.lang.php @@ -37,4 +37,6 @@ $lang['2.7 Tour'] = '2.7 Tour'; $lang['2_7_0_descrp'] = 'Descubre las novedades de Piwigo 2.7'; $lang['privacy_descrp'] = 'Este tour le presenta todas las formas de proteger sus fotos del acceso público con sistemas de permisos por álbum y por imagen, y de las copias mediante protecciones de imagen.'; -$lang['Privacy'] = 'Privacidad'; \ No newline at end of file +$lang['Privacy'] = 'Privacidad'; +$lang['2.8 Tour'] = 'Tour 2.8'; +$lang['2_8_0_descrp'] = 'Descubre alguna de las nuevas funciones de Piwigo 2.8. Lee todos los detalles en la nota de la versión.'; \ No newline at end of file diff --git a/sources/plugins/TakeATour/language/fi_FI/plugin.lang.php b/sources/plugins/TakeATour/language/fi_FI/plugin.lang.php index 3a11615..db32eac 100755 --- a/sources/plugins/TakeATour/language/fi_FI/plugin.lang.php +++ b/sources/plugins/TakeATour/language/fi_FI/plugin.lang.php @@ -33,4 +33,6 @@ $lang['Take a tour and discover the features of your Piwigo gallery » Go to the $lang['Visit your Piwigo!'] = 'Käy Piwigossasi!'; $lang['first_contact_descrp'] = 'Suositeltu aloittelijoille, tämä esittely tutustuttaa sinut Piwigoon ja sen perus ominaisuuksiin. Se alkaa näyttämällä miten kuvia lisätään ja hallitaan. Esittely jatkuu albumien hallinnalla ja loppuu kustomointiin käyttäen asetuksia, teemoja ja laajennuksia.'; $lang['privacy_descrp'] = 'Tämä esittely näyttää kaikki eri tavat, jolla voit suojella kuviasi julkiselta pääsyltä albumi ja kuva kohtaisesti kopioinnista kuvien suojaukseen.'; -$lang['takeatour_configpage'] = 'Katso esittely » Lista esittelyistä'; \ No newline at end of file +$lang['takeatour_configpage'] = 'Katso esittely » Lista esittelyistä'; +$lang['2.8 Tour'] = '2.8 Esittely'; +$lang['2_8_0_descrp'] = 'Tutki joitain Piwigo 2.8:n uusia ominaisuuksia. Lue yksityiskohdat julkaisu tiedoista.'; \ No newline at end of file diff --git a/sources/plugins/TakeATour/language/fr_FR/plugin.lang.php b/sources/plugins/TakeATour/language/fr_FR/plugin.lang.php index da5bcfa..5dd8dbf 100644 --- a/sources/plugins/TakeATour/language/fr_FR/plugin.lang.php +++ b/sources/plugins/TakeATour/language/fr_FR/plugin.lang.php @@ -15,4 +15,7 @@ $lang['2_7_0_descrp'] = 'Découvrez ce qui est nouveau avec Piwigo 2.7'; $lang['2.7 Tour'] = 'Visite 2.7'; $lang['Privacy'] = 'Vie privée'; -$lang['privacy_descrp'] = 'Cette visite vous explique comment protéger vos photos de l\'accès public avec des systèmes de permissions par album et par photo, et vous protège de la copie à l\'aide de la protection d\'image.'; \ No newline at end of file +$lang['privacy_descrp'] = 'Cette visite vous explique comment protéger vos photos de l\'accès public avec des systèmes de permissions par album et par photo, et vous protège de la copie à l\'aide de la protection d\'image.'; + +$lang['2.8 Tour'] = 'Version 2.8'; +$lang['2_8_0_descrp'] = 'Découvrez quelques nouvelles fonctionnalités de Piwigo 2.8. Lire tous les détails sur les notes de la version.'; diff --git a/sources/plugins/TakeATour/language/it_IT/plugin.lang.php b/sources/plugins/TakeATour/language/it_IT/plugin.lang.php index dbbce48..94cf90d 100755 --- a/sources/plugins/TakeATour/language/it_IT/plugin.lang.php +++ b/sources/plugins/TakeATour/language/it_IT/plugin.lang.php @@ -36,4 +36,6 @@ $lang['2_7_0_descrp'] = 'Scopri le Novità di Piwigo 2.7'; $lang['TAT_descrp'] = 'Benvenuti! Ecco un elenco di tutti i tour disponibili per aiutarti a scoprire le caratteristiche della tua galleria Piwigo.

    Avvia un tour qui sotto, quindi segui le istruzioni. Clicca Avanti/Indietro (o utilizza le frecce della tastiera) per navigare durante un tour. Mentre si è in un tour, se vai in un\'altra pagina dell\'amministrazione, sarai reindirizzato alla pagina corrente del Tour. Se sei bloccato e non puoi terminare il giro, vai a Plugins » Scegli un Tour terminerai il tour.'; $lang['first_contact_descrp'] = 'Consigliato per i principianti, questo tour ti introduce a Piwigo e alle sue caratteristiche di base. Esso si avvierà mostrando come aggiungere foto e quindi gestirle. Il tour prosegue con la gestione album e termina con la personalizzazione tramite configurazione, temi e plugin.'; $lang['privacy_descrp'] = 'Questo tour presenta tutti i modi per proteggere le tue foto da pubblico accesso con autorizzazioni per album, foto e da copia utilizzando protezioni di immagine.'; -$lang['Privacy'] = 'Privacy'; \ No newline at end of file +$lang['Privacy'] = 'Privacy'; +$lang['2.8 Tour'] = '2.8 Tour'; +$lang['2_8_0_descrp'] = 'Scopri alcune nuove funzionalità di Piwigo 2.8. Leggi i dettagli sulle note della versione'; \ No newline at end of file diff --git a/sources/plugins/TakeATour/language/lv_LV/plugin.lang.php b/sources/plugins/TakeATour/language/lv_LV/plugin.lang.php index f3f90f0..2589df6 100755 --- a/sources/plugins/TakeATour/language/lv_LV/plugin.lang.php +++ b/sources/plugins/TakeATour/language/lv_LV/plugin.lang.php @@ -36,4 +36,6 @@ $lang['2.7 Tour'] = '2.7 Apskats'; $lang['2_7_0_descrp'] = 'Atklājiet, kas jauns Piwigo 2.7'; $lang['privacy_descrp'] = 'Šis apskats iepazīstina ar visiem veidiem, kā aizsargāt savu foto no publiskas piekļuves, izmantojot atļauju sistēmu vienam albūmam un vienam attēlam, un pret kopēšanu, izmantojot attēlu aizsardzību.'; -$lang['Privacy'] = 'Privātums'; \ No newline at end of file +$lang['Privacy'] = 'Privātums'; +$lang['2.8 Tour'] = '2.8 Tūre'; +$lang['2_8_0_descrp'] = 'Atklājiet dažas Piwigo 2.8 jaunās funkcijas. Lasīt informāciju relīzē.'; \ No newline at end of file diff --git a/sources/plugins/TakeATour/language/nb_NO/plugin.lang.php b/sources/plugins/TakeATour/language/nb_NO/plugin.lang.php index f08c63f..5600753 100755 --- a/sources/plugins/TakeATour/language/nb_NO/plugin.lang.php +++ b/sources/plugins/TakeATour/language/nb_NO/plugin.lang.php @@ -33,4 +33,6 @@ $lang['takeatour_configpage'] = 'Ta en Omvisning » Liste over Omvisninger'; $lang['privacy_descrp'] = 'Denne omvisningen presenterer alle måter å beskytte dine bilder fra offentligheten med tillatelser per album og per bilde, og fra å kopiere ved hjelp av bilde beskyttelse.'; $lang['first_contact_descrp'] = 'Anbefales for nybegynnere, denne omvisningen inntroduserer deg for Piwigo og dens grunnleggende funksjoner. Den vil starte med å vise deg hvordan legge til bilder og administrere de. Omvisningen forsetter med album administrasjon og slutter med tilpasning ved å bruke innstillinger, temaer og tillegsprogrammer.'; $lang['Take a tour and discover the features of your Piwigo gallery » Go to the available tours'] = 'Ta en omvisning og oppdag alle funksjonene i ditt Piwigo galleri » Gå til tilgjengelige omvisninger'; -$lang['TAT_descrp'] = 'Velkommen! Her er en liste over alle tilgjengelige omvisninger som vil hjelpe deg å oppdage funksjonene i ditt Piwigo galleri.

    Start en omvisning nedenfor, følg deretter instruksjonene. Klikk på Neste/Forrige (eller bruk pilene på tastaturet) for å navigere i løpet av omvisningen. Mens du holder på med en omvisning og går til en annen side i administrasjonen, vil du bli omdirigert til den gjeldende siden i omvisningen. Hvis du står fast og ikke klarer å avslutte omvisningen, gå til Tillegsprogrammer »Ta en omvisning dette vil avslutte omvisningen.'; \ No newline at end of file +$lang['TAT_descrp'] = 'Velkommen! Her er en liste over alle tilgjengelige omvisninger som vil hjelpe deg å oppdage funksjonene i ditt Piwigo galleri.

    Start en omvisning nedenfor, følg deretter instruksjonene. Klikk på Neste/Forrige (eller bruk pilene på tastaturet) for å navigere i løpet av omvisningen. Mens du holder på med en omvisning og går til en annen side i administrasjonen, vil du bli omdirigert til den gjeldende siden i omvisningen. Hvis du står fast og ikke klarer å avslutte omvisningen, gå til Tillegsprogrammer »Ta en omvisning dette vil avslutte omvisningen.'; +$lang['2.8 Tour'] = '2.8 Omvisning tur'; +$lang['2_8_0_descrp'] = 'Utforsk Piwigo 2.8 sine nye funksjoner. Les detaljer om siste utgivelse.'; \ No newline at end of file diff --git a/sources/plugins/TakeATour/language/nl_NL/plugin.lang.php b/sources/plugins/TakeATour/language/nl_NL/plugin.lang.php index 78f40ed..d94683a 100755 --- a/sources/plugins/TakeATour/language/nl_NL/plugin.lang.php +++ b/sources/plugins/TakeATour/language/nl_NL/plugin.lang.php @@ -36,4 +36,6 @@ $lang['2.7 Tour'] = '2.7 rondleiding'; $lang['2_7_0_descrp'] = 'Ontdek wat er nieuw is in Piwigo 2.7'; $lang['privacy_descrp'] = 'Deze rondleiding toont alle manieren om je foto te beschermen tegen openbare toegang met behulp van toestemmingssytemen per album en per afbeelding. En ook tegen kopiëren door middel van afbeeldingsbescherming.'; -$lang['Privacy'] = 'Privé'; \ No newline at end of file +$lang['Privacy'] = 'Privé'; +$lang['2_8_0_descrp'] = 'Ontdek nieuwe mogelijkheden van Piwigo 2.8. Lees de details in de release notes.'; +$lang['2.8 Tour'] = '2.8 Rondleiding'; \ No newline at end of file diff --git a/sources/plugins/TakeATour/language/pt_BR/plugin.lang.php b/sources/plugins/TakeATour/language/pt_BR/plugin.lang.php index d1d7c7c..b075707 100755 --- a/sources/plugins/TakeATour/language/pt_BR/plugin.lang.php +++ b/sources/plugins/TakeATour/language/pt_BR/plugin.lang.php @@ -36,4 +36,6 @@ $lang['2.7 Tour'] = '2.7 Tour'; $lang['2_7_0_descrp'] = 'Descubra o que há de novo no Piwigo 2.7'; $lang['privacy_descrp'] = 'Este tour irá apresentar-lhe todas as maneiras de proteger suas foto do acesso público com os sistemas de permissão por álbum e por imagem, e de copiar usando proteções de imagem.'; -$lang['Privacy'] = 'Privacidade'; \ No newline at end of file +$lang['Privacy'] = 'Privacidade'; +$lang['2.8 Tour'] = '2.8 Tour'; +$lang['2_8_0_descrp'] = 'Descubra alguns novos recursos do Piwik 2.8. Leia mais detalhes nas notas de lançamento.'; \ No newline at end of file diff --git a/sources/plugins/TakeATour/language/ru_RU/plugin.lang.php b/sources/plugins/TakeATour/language/ru_RU/plugin.lang.php index 597cce3..b8f565e 100755 --- a/sources/plugins/TakeATour/language/ru_RU/plugin.lang.php +++ b/sources/plugins/TakeATour/language/ru_RU/plugin.lang.php @@ -15,4 +15,6 @@ $lang['2_7_0_descrp'] = 'Что нового в Piwigo 2.7'; $lang['2.7 Tour'] = 'Тур по версии 2.7'; $lang['privacy_descrp'] = 'Этот тур раскроет Вам все способы защиты изображений из публичного доступа через системы разрешений для альбомов и изображений, а также защиты изображения от копирования'; -$lang['Privacy'] = 'Конфиденциальность'; \ No newline at end of file +$lang['Privacy'] = 'Конфиденциальность'; +$lang['2.8 Tour'] = 'Тур по Piiwigo 2.8'; +$lang['2_8_0_descrp'] = 'Откройте новые возможности Piiwigo 2.8. Читайте подробности по адресу Заметки к релизу.'; \ No newline at end of file diff --git a/sources/plugins/TakeATour/language/sk_SK/plugin.lang.php b/sources/plugins/TakeATour/language/sk_SK/plugin.lang.php index d5eed6b..329c7c0 100755 --- a/sources/plugins/TakeATour/language/sk_SK/plugin.lang.php +++ b/sources/plugins/TakeATour/language/sk_SK/plugin.lang.php @@ -33,4 +33,6 @@ $lang['First Contact'] = 'Prvý kontakt'; $lang['End tour'] = 'Koniec prehliadky'; $lang['2_7_0_descrp'] = 'Zistite, čo je nové v Piwigo 2.7'; $lang['2.7 Tour'] = '2.7 Tour'; -$lang['Privacy'] = 'O ochrane osobných údajov'; \ No newline at end of file +$lang['Privacy'] = 'O ochrane osobných údajov'; +$lang['2_8_0_descrp'] = 'Objavte niektoré nové funkcie Piwigo 2.8. Prečítajte si podrobnosti v poznámkach k vydaniu.'; +$lang['2.8 Tour'] = 'Prehliadka 2.8'; \ No newline at end of file diff --git a/sources/plugins/TakeATour/language/sl_SI/plugin.lang.php b/sources/plugins/TakeATour/language/sl_SI/plugin.lang.php index 4e5818f..102851e 100755 --- a/sources/plugins/TakeATour/language/sl_SI/plugin.lang.php +++ b/sources/plugins/TakeATour/language/sl_SI/plugin.lang.php @@ -36,4 +36,6 @@ $lang['Privacy'] = 'Zasebnost'; $lang['Visit your Piwigo!'] = 'Oglejte si vaš Piwigo!'; $lang['takeatour_configpage'] = 'Začni predtavitev'; $lang['privacy_descrp'] = 'Ta predstavitev vam prikaže vse možnosti zaščite fotografij pred javnim dostopom s pomočjo nastavitev pravic po Albumih in po fotografijah in zaščito pred kopiranjem z uporabo zaščite fotografij '; -$lang['first_contact_descrp'] = 'Ta predstavitev je namenjena začetnikom, predstavi vam osnovne lastnosti Piwigo galerije in se prične s predstavitvijo kako dodati fotografije in jih nato upravljati. Predstavitev se nadaljuje z upravljanjem Albumov in se konča s predstavitvijo prilagajanja Piwigo z uporabo Konfiguracije, spreminjanje izgleda (Teme) in uporabo Vtičnikov.'; \ No newline at end of file +$lang['first_contact_descrp'] = 'Ta predstavitev je namenjena začetnikom, predstavi vam osnovne lastnosti Piwigo galerije in se prične s predstavitvijo kako dodati fotografije in jih nato upravljati. Predstavitev se nadaljuje z upravljanjem Albumov in se konča s predstavitvijo prilagajanja Piwigo z uporabo Konfiguracije, spreminjanje izgleda (Teme) in uporabo Vtičnikov.'; +$lang['2.8 Tour'] = '2.8 Predstavitev'; +$lang['2_8_0_descrp'] = 'Odkrijte nekatere novosti Piwigo 2.8. Preberite podrobnosti v opambah ob izdaji.'; \ No newline at end of file diff --git a/sources/plugins/TakeATour/language/sr_RS/plugin.lang.php b/sources/plugins/TakeATour/language/sr_RS/plugin.lang.php index e7e57cc..4c4d319 100644 --- a/sources/plugins/TakeATour/language/sr_RS/plugin.lang.php +++ b/sources/plugins/TakeATour/language/sr_RS/plugin.lang.php @@ -1,24 +1,24 @@
    Покрените неки од обиласка, а затим следите упутства. За кретање кликните на Наредно/Претходно или користите стрелице на вашој тастатури. Док сте у обиласку, одлазак на другу администраторску страницу ће вас преусмерити на тренутну страницу обилсака. Уколико се изгубите и не можете да напустите обилазак, идите на Додаци » Крени у обилазак.'; \ No newline at end of file +$lang['TAT_descrp'] = 'Добродошли! Овде се налази списак доступних упутстава која ће вас провести кроз Piwigo галерију.

    Покрените неки од обиласка, а затим следите упутства. За кретање кликните на Наредно/Претходно или користите стрелице на вашој тастатури. Док сте у обиласку, одлазак на другу администраторску страницу ће вас преусмерити на тренутну страницу обилсака. Уколико се изгубите и не можете да напустите обилазак, идите на Додаци » Крени у обилазак.'; +$lang['2.8 Tour'] = 'Обилазак верзије 2.8'; +$lang['2_8_0_descrp'] = 'Откријте нове могућности у Piwigo верзији 2.8. Више на страници са новостима.'; \ No newline at end of file diff --git a/sources/plugins/TakeATour/language/sv_SE/plugin.lang.php b/sources/plugins/TakeATour/language/sv_SE/plugin.lang.php index c0fcee2..f219e7c 100755 --- a/sources/plugins/TakeATour/language/sv_SE/plugin.lang.php +++ b/sources/plugins/TakeATour/language/sv_SE/plugin.lang.php @@ -34,4 +34,6 @@ $lang['Take a tour and discover the features of your Piwigo gallery » Go to the $lang['Visit your Piwigo!'] = 'Besök ditt Piwigo!'; $lang['first_contact_descrp'] = 'Rekommenderas för nybörjare. Denna rundtur presenterar Piwigo och de grundläggande funktionerna. Den börjar med att visa hur du lägger till bilder och sedan hur du hanterar dem. Rundturen fortsätter sedan med albumhantering och slutar med anpassningar via konfigurationer, teman och insticksmoduler.'; $lang['privacy_descrp'] = 'Rundturen visar alla sätt att skydda ditt foto från allmän åtkomst med rättigheter per album och per foto, och från kopiering.'; -$lang['takeatour_configpage'] = 'Ta en rundtur » Lista över rundturer'; \ No newline at end of file +$lang['takeatour_configpage'] = 'Ta en rundtur » Lista över rundturer'; +$lang['2.8 Tour'] = '2.8 rundtur'; +$lang['2_8_0_descrp'] = 'Upptäck nya funktioner i Piwigo 2.8.'; \ No newline at end of file diff --git a/sources/plugins/TakeATour/language/sv_SE/tour_first_contact.lang.php b/sources/plugins/TakeATour/language/sv_SE/tour_first_contact.lang.php index bc13246..73a2301 100644 --- a/sources/plugins/TakeATour/language/sv_SE/tour_first_contact.lang.php +++ b/sources/plugins/TakeATour/language/sv_SE/tour_first_contact.lang.php @@ -16,4 +16,58 @@ $lang['first_contact_title5'] = ''; $lang['first_contact_title6'] = ''; $lang['first_contact_title7'] = ''; $lang['first_contact_title8'] = ''; -$lang['first_contact_stp1'] = 'Hej! Jag är din Guide för att upptäcka Piwigo! Följ mina instruktioner och klicka på "Nästa"(eller använd piltangenterna på ditt tangentbord) för att navigera. Går du till en anna del av Administrationen så får du en annan sekvens av denna Guide, relevant för den sidan. Fastnar detta, kan du gå till Plugins > Take a Tourså stannar den. Låt oss börja med att lägga till några bilder!'; \ No newline at end of file +$lang['first_contact_stp1'] = 'Hej! Jag är din Guide för att upptäcka Piwigo! Följ mina instruktioner och klicka på "Nästa"(eller använd piltangenterna på ditt tangentbord) för att navigera. Går du till en anna del av Administrationen så får du en annan sekvens av denna Guide, relevant för den sidan. Fastnar detta, kan du gå till Plugins > Take a Tourså stannar den. Låt oss börja med att lägga till några bilder!'; +$lang['first_contact_stp38'] = 'Tillägg är ett enkelt sätt att hantera din Piwigo med. De kan göra nästan allt du kan tänka dig, från små text-tillägg till hela presentationer, som tex Gemenskaps-tillägget som tillåter icke-administratörer att ladda upp utan att gå in i administrations-delen.'; +$lang['first_contact_stp37'] = 'För att installera nya temor, kan man ladda ner dem direkt från fliken "Lägg till tema". Bara de temor som är kompatibla med din Piwigo-version visas.

    Låt oss undersöka tillägen nu! Klicka på Tillägg » Hantera'; +$lang['first_contact_stp34'] = 'Att välja ett tema är det första steget för att kustomisera din Piwigo. Installerade teman listas här. +
    Mer än ett tema kan aktiveras: användare kan ändra sina teman genom att välja ett av de aktiverade temorna här, om valet "Tillåt användar-kustomisering" är förbockat på Inställningssidan.'; +$lang['first_contact_stp33'] = 'Bara ett sista ord om inställningarna, Gäst-inställingarna är för att ställa in preferenserna för oregistrerade besökare. Varje gång Piwigo refererar till en "gäst", betyder det en oregistrerad besökare. +
    Låt oss fortsätta med konfigurationen: klicka på Konfiguration » Teman eller klicka på Nästa.'; +$lang['first_contact_stp32'] = 'Spara ändringarna nu'; +$lang['first_contact_stp31'] = 'Sen baneren, som kommer att synas högst upp på alla sidor. Som du kan se, är HTML-taggar tillåtna här. Du kan också använda %gallery_title%-taggen för att visa titeln du just skrev in ovan.'; +$lang['first_contact_title9'] = 'Batch Managern'; +$lang['first_contact_title43'] = 'Det har varit fantastiskt'; +$lang['first_contact_title4'] = 'Låt oss lägga till ett foto!'; +$lang['first_contact_title38'] = 'Tillägg'; +$lang['first_contact_title39'] = 'Tillägg'; +$lang['first_contact_title35'] = 'Teman'; +$lang['first_contact_title37'] = 'Teman'; +$lang['first_contact_title34'] = 'Teman'; +$lang['first_contact_title33'] = 'Gäst-inställningar'; +$lang['first_contact_title3'] = 'Lägg till foto-sidan'; +$lang['first_contact_title29'] = 'Konfiguration » Inställningar » Generellt'; +$lang['first_contact_title28'] = 'Konfiguration'; +$lang['first_contact_title22'] = 'Editeringssida för album'; +$lang['first_contact_title21'] = 'Andra flikar'; +$lang['first_contact_title20'] = 'Hantera album'; +$lang['first_contact_title19'] = 'Hantera album'; +$lang['first_contact_title18'] = 'Hantera album'; +$lang['first_contact_title15'] = 'Editeringssidan för ett foto'; +$lang['first_contact_title11'] = 'Hur man editerar ett foto'; +$lang['first_contact_title1'] = 'Välkommen till ditt Piwigo-galleri'; +$lang['first_contact_stp8'] = 'Låt oss editera dem! Klicka på länken'; +$lang['first_contact_stp6'] = 'Du ser att foton listas. När du är klar, klicka på knappen Börja Uppladdning'; +$lang['first_contact_stp5'] = 'Klicka sen på knappen för att välja foton att sända, eller dra och släpp dina filer.'; +$lang['first_contact_stp4'] = 'Välj ett album först; skapa ett om det inte finns något än.'; +$lang['first_contact_stp35'] = 'Sätt ditt favorittema som standardtema.'; +$lang['first_contact_stp19'] = 'Här listas "rot"-albumen. Om du ser ett album med en streckad bakgrund, betyder det att det är ett fysiskt album från en FTp-synkronisering. Fysiska album kan inte flyttas eller tas bort härifrån. De andra albumen kallas virtuella album.'; +$lang['first_contact_stp3'] = 'På första fliken kan man lägga till foton direkt from webbläsaren. De andra flikarna är för andra sätt att ladda upp foton'; +$lang['first_contact_stp28'] = 'Nu ska vi titta på valen som finns för att få Piwigo att bete sig precis som vi vill. Klicka på Konfiguration->Inställningar eller klicka på Nästa.'; +$lang['first_contact_stp23'] = 'Att låsa ett album, innebär att bara en administratör kommer att kunna se albumet: detta är användbart när man förbereder ett album för publicering'; +$lang['first_contact_stp21'] = 'Nästa flik är en sida där du kan flytta omkring alla virtuella album.
    Permallink-fliken är satt till en specifik URL for albumet.
    Låt oss editera ett album'; +$lang['first_contact_stp20'] = 'När din muspekare hovraröver ett album, syns länkar och information. När du drar och släpper ett album - ett rundat block - , kommer du att ändra dess position och kan då spara eller ångra din manuella sorteringsinställning.'; +$lang['first_contact_stp19_b'] = 'Här listas "rot"-albumen.'; +$lang['first_contact_stp17'] = 'Här kan man sätta ett foto som tumnagel för ett eller flera album. Fotot behöver inte vara associerat med albumet på något sätt för att sättas som tumnagel. Om fotot är associerat med albumet, är det ännu enklare att sätta det som album-tumnagel från den publika sidan. (Tips: Använd tillägget Admin Tools för ännu enklare hantering).'; +$lang['first_contact_stp16'] = 'i vilket album fotot ska vara.

    Här kan man ta bort eller lägga till foton från album. Länken är virtuell, inga foton kommer någonsin att flyttas fysiskt.'; +$lang['first_contact_stp14'] = 'Nu ser vi editeringssidan för ett foto. Denna sida är tillgänglig härifrån men också från den publika fotosidan när man är påloggad som administratör.

    Hovra över tumnageln och klicka sen på Editera.'; +$lang['first_contact_stp13'] = 'Du kan editera beskrivningar och annat från Batch Managern i singel-läget. Men låt oss stanna i det globala läget för tillfället'; +$lang['first_contact_stp12'] = 'och sen editera dem med en åtgärd'; +$lang['first_contact_stp10'] = 'Här är länken för direkt-åtkomst till caddien: Det är ett verktyg för administratörerna att enkelt kunna välja foton när man bläddrar i den publika delen och sen editera dem i Batch Managern.
    +
    Du kan lägga till foton i caddien från den publika fotosidan när du är inloggad som en admin, eller genom åtgärden "Lägg till i caddien" i Batch Managern.'; +$lang['first_contact_stp30'] = 'Låt oss börja med att ändra titeln'; +$lang['first_contact_stp29'] = 'Här, på den första sidan, ställer man in de nödvändiga och grundläggande konfigurationerna på ditt galleri'; +$lang['first_contact_stp22'] = 'Som för ett foto, kan man editera albumets egenskaper'; +$lang['first_contact_stp2'] = 'Här är länken. Klicka på den eller klicka Nästa för att fortsätta'; +$lang['first_contact_stp18'] = 'Låt oss se hur hanterar album nu. Klicka På album » Hantera eller klicka på Nästa'; +$lang['first_contact_stp15'] = 'På denna sida kan du editera alla egenskaper för ett foto, till exempel...'; +$lang['first_contact_stp11'] = 'Härifrån kan du välja ett eller flera foton'; \ No newline at end of file diff --git a/sources/plugins/TakeATour/language/tr_TR/tour_first_contact.lang.php b/sources/plugins/TakeATour/language/tr_TR/tour_first_contact.lang.php index c69edc8..22aae01 100644 --- a/sources/plugins/TakeATour/language/tr_TR/tour_first_contact.lang.php +++ b/sources/plugins/TakeATour/language/tr_TR/tour_first_contact.lang.php @@ -1,24 +1,24 @@ Yapılandırma » Seçenekler » Genel    '; +$lang['first_contact_stp30'] = 'Başlangıç olarak başlığı değiştirelim'; +$lang['first_contact_stp32'] = 'Şimdi değiştirdikleri kaydet'; +$lang['first_contact_stp35'] = 'En sevdiğin tema varsayılan olarak belirle.'; +$lang['first_contact_stp4'] = 'Önce bir albüm seç; albüm bulunmazsa bir tane oluştur.'; +$lang['first_contact_title1'] = 'Piwigo Galeri\'de Hoş Geldin'; \ No newline at end of file diff --git a/sources/plugins/TakeATour/language/zh_CN/plugin.lang.php b/sources/plugins/TakeATour/language/zh_CN/plugin.lang.php index 7079559..a71e75f 100755 --- a/sources/plugins/TakeATour/language/zh_CN/plugin.lang.php +++ b/sources/plugins/TakeATour/language/zh_CN/plugin.lang.php @@ -36,4 +36,6 @@ $lang['2.7 Tour'] = 'Piwigo 2.7 导览'; $lang['2_7_0_descrp'] = '探索 Piwigo 2.7 的新特性'; $lang['privacy_descrp'] = '本导览向您展示通过涵盖每个相册及每张图片的许可系统保护您的图片免于公共访问的各种方法，以及通过图片保护防止拷贝。'; -$lang['Privacy'] = '隐私'; \ No newline at end of file +$lang['Privacy'] = '隐私'; +$lang['2_8_0_descrp'] = '探索 Piwigo 2.8 的一些新特性。详见 发布公告。'; +$lang['2.8 Tour'] = '2.8 导览'; \ No newline at end of file diff --git a/sources/plugins/TakeATour/main.inc.php b/sources/plugins/TakeATour/main.inc.php index c71b89b..f5673c7 100644 --- a/sources/plugins/TakeATour/main.inc.php +++ b/sources/plugins/TakeATour/main.inc.php @@ -1,7 +1,7 @@ 'en_UK')); @@ -61,8 +66,15 @@ function TAT_tour_setup() $tat_path=str_replace(basename($_SERVER['SCRIPT_NAME']),'', $_SERVER['HTTP_HOST'] . $_SERVER['SCRIPT_NAME']); $template->assign('TAT_path', $tat_path); $template->assign('ABS_U_ADMIN', get_absolute_root_url());// absolute one due to public pages and $conf['question_mark_in_urls'] = false+$conf['php_extension_in_urls'] = false; + + // some tours may need admin functions (like 2_8_0 needs get_orphans) + include_once(PHPWG_ROOT_PATH.'admin/include/functions.php'); + include($tour_to_launch.'/config.inc.php'); $template->set_filename('TAT_tour_tpl', $TOUR_PATH); + + trigger_notify('TAT_before_parse_tour'); + $template->parse('TAT_tour_tpl'); } @@ -119,4 +131,4 @@ function TAT_admin_menu($menu) ); return $menu; } -?> \ No newline at end of file +?> diff --git a/sources/plugins/TakeATour/tpl/admin.tpl b/sources/plugins/TakeATour/tpl/admin.tpl index c89494f..2ec113f 100644 --- a/sources/plugins/TakeATour/tpl/admin.tpl +++ b/sources/plugins/TakeATour/tpl/admin.tpl @@ -1,3 +1,7 @@ +{footer_script require="jquery"} +jQuery('.TAT_description a[href*="piwigo.org"]').addClass("externalLink"); +{/footer_script} +

    {'takeatour_configpage'|@translate}

    @@ -25,6 +29,17 @@ {/if} + {if !isset($TAT_tour_ignored) or (isset($TAT_tour_ignored) and in_array(2_8_0, $TAT_tour_ignored))} +
    + {'2.8 Tour'|@translate} +
    {'2_8_0_descrp'|@translate|sprintf:$TAT_28URL}
    +
    + + + +
    +
    + {/if} {if !isset($TAT_tour_ignored) or (isset($TAT_tour_ignored) and in_array(2_7_0, $TAT_tour_ignored))}
    {'2.7 Tour'|@translate} diff --git a/sources/plugins/index.php b/sources/plugins/index.php index c8de97f..0b96c3e 100644 --- a/sources/plugins/index.php +++ b/sources/plugins/index.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/plugins/language_switch/language_switch.css b/sources/plugins/language_switch/language_switch.css index 356a43e..9cdbe29 100644 --- a/sources/plugins/language_switch/language_switch.css +++ b/sources/plugins/language_switch/language_switch.css @@ -88,6 +88,7 @@ .langflag-ec { background-position:0px -64px; } .langflag-et_EE { background-position:-24px -64px; } .langflag-eg { background-position:-48px -64px; } +.langflag-ar_EG { background-position:-48px -64px; } .langflag-eh { background-position:-72px -64px; } .langflag-en_UK { background-position:-96px -64px; } .langflag-eo_EO { background-position:-120px -64px; } diff --git a/sources/plugins/language_switch/main.inc.php b/sources/plugins/language_switch/main.inc.php index 8af8a23..cac2b35 100644 --- a/sources/plugins/language_switch/main.inc.php +++ b/sources/plugins/language_switch/main.inc.php @@ -23,7 +23,7 @@ /* Plugin Name: Language Switch -Version: 2.7.1 +Version: 2.8.2 Description: Switch to another language from flags on your gallery home page. Plugin URI: http://piwigo.org/ext/extension_view.php?eid=123 Author: Piwigo team @@ -39,4 +39,4 @@ include_once(LANGUAGE_SWITCH_PATH.'language_switch.inc.php'); add_event_handler('loading_lang', 'language_controler_switch', 5 ); add_event_handler('loc_end_index', 'language_controler_flags', 95 ); -?> \ No newline at end of file +?> diff --git a/sources/plugins/language_switch/style.css b/sources/plugins/language_switch/style.css index 55992d3..476ab4a 100644 --- a/sources/plugins/language_switch/style.css +++ b/sources/plugins/language_switch/style.css @@ -20,4 +20,10 @@ } #languageSwitchBox a:hover { color:#ddd; -} \ No newline at end of file +} + +[class*="langflag-"] { + overflow: hidden; + text-indent: -9999px; + vertical-align: bottom; +} diff --git a/sources/popuphelp.php b/sources/popuphelp.php index 52958d2..f8bb08c 100644 --- a/sources/popuphelp.php +++ b/sources/popuphelp.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/profile.php b/sources/profile.php index 372f5cc..3f60fde 100644 --- a/sources/profile.php +++ b/sources/profile.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -207,6 +207,8 @@ function save_profile_from_post($userdata, &$errors) $fields[] = $conf['user_fields']['password']; // password is hashed with function $conf['password_hash'] $data{$conf['user_fields']['password']} = $conf['password_hash']($_POST['use_new_pwd']); + + deactivate_user_auth_keys($userdata['id']); } // username is updated only if allowed diff --git a/sources/qsearch.php b/sources/qsearch.php index a19efa5..f614e83 100644 --- a/sources/qsearch.php +++ b/sources/qsearch.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/random.php b/sources/random.php index 74cad94..7577303 100644 --- a/sources/random.php +++ b/sources/random.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/register.php b/sources/register.php index 9f95d51..40897af 100644 --- a/sources/register.php +++ b/sources/register.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/search.php b/sources/search.php index e4528ea..f8f0a19 100644 --- a/sources/search.php +++ b/sources/search.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -72,6 +72,11 @@ if (isset($_POST['submit'])) 'mode' => $_POST['mode'], 'fields' => $_POST['fields'], ); + + if (isset($_POST['search_in_tags'])) + { + $search['fields']['search_in_tags'] = true; + } } if (isset($_POST['tags'])) @@ -119,7 +124,7 @@ if (isset($_POST['submit'])) { $search['fields'][$type_date.'-after'] = array( 'date' => sprintf( - '%d-%02d-%02d', + '%d-%02d-%02d 00:00:00', $_POST['start_year'], $_POST['start_month'] != 0 ? $_POST['start_month'] : '01', $_POST['start_day'] != 0 ? $_POST['start_day'] : '01' @@ -132,7 +137,7 @@ if (isset($_POST['submit'])) { $search['fields'][$type_date.'-before'] = array( 'date' => sprintf( - '%d-%02d-%02d', + '%d-%02d-%02d 23:59:59', $_POST['end_year'], $_POST['end_month'] != 0 ? $_POST['end_month'] : '12', $_POST['end_day'] != 0 ? $_POST['end_day'] : '31' diff --git a/sources/search_rules.php b/sources/search_rules.php index 34854d2..7ec39ac 100644 --- a/sources/search_rules.php +++ b/sources/search_rules.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/tags.php b/sources/tags.php index f4ac851..b781830 100644 --- a/sources/tags.php +++ b/sources/tags.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/template-extension/index.php b/sources/template-extension/index.php index c8de97f..0b96c3e 100644 --- a/sources/template-extension/index.php +++ b/sources/template-extension/index.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/template-extension/yoga/index.php b/sources/template-extension/yoga/index.php index c8de97f..0b96c3e 100644 --- a/sources/template-extension/yoga/index.php +++ b/sources/template-extension/yoga/index.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/template-extension/yoga/local/index.php b/sources/template-extension/yoga/local/index.php index c8de97f..0b96c3e 100644 --- a/sources/template-extension/yoga/local/index.php +++ b/sources/template-extension/yoga/local/index.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/themes/Sylvia/icon/index.php b/sources/themes/Sylvia/icon/index.php index c8de97f..0b96c3e 100644 --- a/sources/themes/Sylvia/icon/index.php +++ b/sources/themes/Sylvia/icon/index.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/themes/Sylvia/icon/mimetypes/index.php b/sources/themes/Sylvia/icon/mimetypes/index.php index c8de97f..0b96c3e 100644 --- a/sources/themes/Sylvia/icon/mimetypes/index.php +++ b/sources/themes/Sylvia/icon/mimetypes/index.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/themes/Sylvia/index.php b/sources/themes/Sylvia/index.php index c8de97f..0b96c3e 100644 --- a/sources/themes/Sylvia/index.php +++ b/sources/themes/Sylvia/index.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ diff --git a/sources/themes/Sylvia/themeconf.inc.php b/sources/themes/Sylvia/themeconf.inc.php index 0ca6ae4..27a3bbc 100644 --- a/sources/themes/Sylvia/themeconf.inc.php +++ b/sources/themes/Sylvia/themeconf.inc.php @@ -1,7 +1,7 @@ = 0; + // adding 1 corrects loss of precision from parseFloat (#15100) + return !jQuery.isArray( obj ) && (obj - parseFloat( obj ) + 1) >= 0; }, isEmptyObject: function( obj ) { @@ -568,7 +569,12 @@ jQuery.each("Boolean Number String Function Array Date RegExp Object Error".spli }); function isArraylike( obj ) { - var length = obj.length, + + // Support: iOS 8.2 (not reproducible in simulator) + // `in` check used to prevent JIT error (gh-2145) + // hasOwn isn't used here due to false negatives + // regarding Nodelist length in IE + var length = "length" in obj && obj.length, type = jQuery.type( obj ); if ( type === "function" || jQuery.isWindow( obj ) ) { @@ -584,14 +590,14 @@ function isArraylike( obj ) { } var Sizzle = /*! - * Sizzle CSS Selector Engine v1.10.19 + * Sizzle CSS Selector Engine v2.2.0-pre * http://sizzlejs.com/ * - * Copyright 2013 jQuery Foundation, Inc. and other contributors + * Copyright 2008, 2014 jQuery Foundation, Inc. and other contributors * Released under the MIT license * http://jquery.org/license * - * Date: 2014-04-18 + * Date: 2014-12-16 */ (function( window ) { @@ -618,7 +624,7 @@ var i, contains, // Instance-specific data - expando = "sizzle" + -(new Date()), + expando = "sizzle" + 1 * new Date(), preferredDoc = window.document, dirruns = 0, done = 0, @@ -633,7 +639,6 @@ var i, }, // General-purpose constants - strundefined = typeof undefined, MAX_NEGATIVE = 1 << 31, // Instance methods @@ -643,12 +648,13 @@ var i, push_native = arr.push, push = arr.push, slice = arr.slice, - // Use a stripped-down indexOf if we can't use a native one - indexOf = arr.indexOf || function( elem ) { + // Use a stripped-down indexOf as it's faster than native + // http://jsperf.com/thor-indexof-vs-for/5 + indexOf = function( list, elem ) { var i = 0, - len = this.length; + len = list.length; for ( ; i < len; i++ ) { - if ( this[i] === elem ) { + if ( list[i] === elem ) { return i; } } @@ -688,6 +694,7 @@ var i, ")\\)|)", // Leading and non-escaped trailing whitespace, capturing some non-whitespace characters preceding the latter + rwhitespace = new RegExp( whitespace + "+", "g" ), rtrim = new RegExp( "^" + whitespace + "+|((?:^|[^\\\\])(?:\\\\.)*)" + whitespace + "+$", "g" ), rcomma = new RegExp( "^" + whitespace + "*," + whitespace + "*" ), @@ -739,6 +746,14 @@ var i, String.fromCharCode( high + 0x10000 ) : // Supplemental Plane codepoint (surrogate pair) String.fromCharCode( high >> 10 | 0xD800, high & 0x3FF | 0xDC00 ); + }, + + // Used for iframes + // See setDocument() + // Removing the function wrapper causes a "Permission Denied" + // error in IE + unloadHandler = function() { + setDocument(); }; // Optimize for push.apply( _, NodeList ) @@ -781,19 +796,18 @@ function Sizzle( selector, context, results, seed ) { context = context || document; results = results || []; + nodeType = context.nodeType; + + if ( typeof selector !== "string" || !selector || + nodeType !== 1 && nodeType !== 9 && nodeType !== 11 ) { - if ( !selector || typeof selector !== "string" ) { return results; } - if ( (nodeType = context.nodeType) !== 1 && nodeType !== 9 ) { - return []; - } + if ( !seed && documentIsHTML ) { - if ( documentIsHTML && !seed ) { - - // Shortcuts - if ( (match = rquickExpr.exec( selector )) ) { + // Try to shortcut find operations when possible (e.g., not under DocumentFragment) + if ( nodeType !== 11 && (match = rquickExpr.exec( selector )) ) { // Speed-up: Sizzle("#ID") if ( (m = match[1]) ) { if ( nodeType === 9 ) { @@ -825,7 +839,7 @@ function Sizzle( selector, context, results, seed ) { return results; // Speed-up: Sizzle(".CLASS") - } else if ( (m = match[3]) && support.getElementsByClassName && context.getElementsByClassName ) { + } else if ( (m = match[3]) && support.getElementsByClassName ) { push.apply( results, context.getElementsByClassName( m ) ); return results; } @@ -835,7 +849,7 @@ function Sizzle( selector, context, results, seed ) { if ( support.qsa && (!rbuggyQSA || !rbuggyQSA.test( selector )) ) { nid = old = expando; newContext = context; - newSelector = nodeType === 9 && selector; + newSelector = nodeType !== 1 && selector; // qSA works strangely on Element-rooted queries // We can work around this by specifying an extra ID on the root @@ -1022,7 +1036,7 @@ function createPositionalPseudo( fn ) { * @returns {Element|Object|Boolean} The input node if acceptable, otherwise a falsy value */ function testContext( context ) { - return context && typeof context.getElementsByTagName !== strundefined && context; + return context && typeof context.getElementsByTagName !== "undefined" && context; } // Expose support vars for convenience @@ -1046,9 +1060,8 @@ isXML = Sizzle.isXML = function( elem ) { * @returns {Object} Returns the current document */ setDocument = Sizzle.setDocument = function( node ) { - var hasCompare, - doc = node ? node.ownerDocument || node : preferredDoc, - parent = doc.defaultView; + var hasCompare, parent, + doc = node ? node.ownerDocument || node : preferredDoc; // If no document and documentElement is available, return if ( doc === document || doc.nodeType !== 9 || !doc.documentElement ) { @@ -1058,9 +1071,7 @@ setDocument = Sizzle.setDocument = function( node ) { // Set our document document = doc; docElem = doc.documentElement; - - // Support tests - documentIsHTML = !isXML( doc ); + parent = doc.defaultView; // Support: IE>8 // If iframe document is assigned to "document" variable and if iframe has been reloaded, @@ -1069,21 +1080,22 @@ setDocument = Sizzle.setDocument = function( node ) { if ( parent && parent !== parent.top ) { // IE11 does not have attachEvent, so all must suffer if ( parent.addEventListener ) { - parent.addEventListener( "unload", function() { - setDocument(); - }, false ); + parent.addEventListener( "unload", unloadHandler, false ); } else if ( parent.attachEvent ) { - parent.attachEvent( "onunload", function() { - setDocument(); - }); + parent.attachEvent( "onunload", unloadHandler ); } } + /* Support tests + ---------------------------------------------------------------------- */ + documentIsHTML = !isXML( doc ); + /* Attributes ---------------------------------------------------------------------- */ // Support: IE<8 - // Verify that getAttribute really returns attributes and not properties (excepting IE8 booleans) + // Verify that getAttribute really returns attributes and not properties + // (excepting IE8 booleans) support.attributes = assert(function( div ) { div.className = "i"; return !div.getAttribute("className"); @@ -1098,17 +1110,8 @@ setDocument = Sizzle.setDocument = function( node ) { return !div.getElementsByTagName("*").length; }); - // Check if getElementsByClassName can be trusted - support.getElementsByClassName = rnative.test( doc.getElementsByClassName ) && assert(function( div ) { - div.innerHTML = "
    "; - - // Support: Safari<4 - // Catch class over-caching - div.firstChild.className = "i"; - // Support: Opera<10 - // Catch gEBCN failure to find non-leading classes - return div.getElementsByClassName("i").length === 2; - }); + // Support: IE<9 + support.getElementsByClassName = rnative.test( doc.getElementsByClassName ); // Support: IE<10 // Check if getElementById returns elements by name @@ -1122,7 +1125,7 @@ setDocument = Sizzle.setDocument = function( node ) { // ID find and filter if ( support.getById ) { Expr.find["ID"] = function( id, context ) { - if ( typeof context.getElementById !== strundefined && documentIsHTML ) { + if ( typeof context.getElementById !== "undefined" && documentIsHTML ) { var m = context.getElementById( id ); // Check parentNode to catch when Blackberry 4.6 returns // nodes that are no longer in the document #6963 @@ -1143,7 +1146,7 @@ setDocument = Sizzle.setDocument = function( node ) { Expr.filter["ID"] = function( id ) { var attrId = id.replace( runescape, funescape ); return function( elem ) { - var node = typeof elem.getAttributeNode !== strundefined && elem.getAttributeNode("id"); + var node = typeof elem.getAttributeNode !== "undefined" && elem.getAttributeNode("id"); return node && node.value === attrId; }; }; @@ -1152,14 +1155,20 @@ setDocument = Sizzle.setDocument = function( node ) { // Tag Expr.find["TAG"] = support.getElementsByTagName ? function( tag, context ) { - if ( typeof context.getElementsByTagName !== strundefined ) { + if ( typeof context.getElementsByTagName !== "undefined" ) { return context.getElementsByTagName( tag ); + + // DocumentFragment nodes don't have gEBTN + } else if ( support.qsa ) { + return context.querySelectorAll( tag ); } } : + function( tag, context ) { var elem, tmp = [], i = 0, + // By happy coincidence, a (broken) gEBTN appears on DocumentFragment nodes too results = context.getElementsByTagName( tag ); // Filter out possible comments @@ -1177,7 +1186,7 @@ setDocument = Sizzle.setDocument = function( node ) { // Class Expr.find["CLASS"] = support.getElementsByClassName && function( className, context ) { - if ( typeof context.getElementsByClassName !== strundefined && documentIsHTML ) { + if ( documentIsHTML ) { return context.getElementsByClassName( className ); } }; @@ -1206,13 +1215,15 @@ setDocument = Sizzle.setDocument = function( node ) { // setting a boolean content attribute, // since its presence should be enough // http://bugs.jquery.com/ticket/12359 - div.innerHTML = ""; + docElem.appendChild( div ).innerHTML = "" + + ""; // Support: IE8, Opera 11-12.16 // Nothing should be selected when empty strings follow ^= or $= or *= // The test attribute must be unknown in Opera but "safe" for WinRT // http://msdn.microsoft.com/en-us/library/ie/hh465388.aspx#attribute_section - if ( div.querySelectorAll("[msallowclip^='']").length ) { + if ( div.querySelectorAll("[msallowcapture^='']").length ) { rbuggyQSA.push( "[*^$]=" + whitespace + "*(?:''|\"\")" ); } @@ -1222,12 +1233,24 @@ setDocument = Sizzle.setDocument = function( node ) { rbuggyQSA.push( "\\[" + whitespace + "*(?:value|" + booleans + ")" ); } + // Support: Chrome<29, Android<4.2+, Safari<7.0+, iOS<7.0+, PhantomJS<1.9.7+ + if ( !div.querySelectorAll( "[id~=" + expando + "-]" ).length ) { + rbuggyQSA.push("~="); + } + // Webkit/Opera - :checked should return selected option elements // http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked // IE8 throws error here and will not see later tests if ( !div.querySelectorAll(":checked").length ) { rbuggyQSA.push(":checked"); } + + // Support: Safari 8+, iOS 8+ + // https://bugs.webkit.org/show_bug.cgi?id=136851 + // In-page `selector#id sibing-combinator selector` fails + if ( !div.querySelectorAll( "a#" + expando + "+*" ).length ) { + rbuggyQSA.push(".#.+[+~]"); + } }); assert(function( div ) { @@ -1344,7 +1367,7 @@ setDocument = Sizzle.setDocument = function( node ) { // Maintain original order return sortInput ? - ( indexOf.call( sortInput, a ) - indexOf.call( sortInput, b ) ) : + ( indexOf( sortInput, a ) - indexOf( sortInput, b ) ) : 0; } @@ -1371,7 +1394,7 @@ setDocument = Sizzle.setDocument = function( node ) { aup ? -1 : bup ? 1 : sortInput ? - ( indexOf.call( sortInput, a ) - indexOf.call( sortInput, b ) ) : + ( indexOf( sortInput, a ) - indexOf( sortInput, b ) ) : 0; // If the nodes are siblings, we can do a quick check @@ -1434,7 +1457,7 @@ Sizzle.matchesSelector = function( elem, expr ) { elem.document && elem.document.nodeType !== 11 ) { return ret; } - } catch(e) {} + } catch (e) {} } return Sizzle( expr, document, null, [ elem ] ).length > 0; @@ -1653,7 +1676,7 @@ Expr = Sizzle.selectors = { return pattern || (pattern = new RegExp( "(^|" + whitespace + ")" + className + "(" + whitespace + "|$)" )) && classCache( className, function( elem ) { - return pattern.test( typeof elem.className === "string" && elem.className || typeof elem.getAttribute !== strundefined && elem.getAttribute("class") || "" ); + return pattern.test( typeof elem.className === "string" && elem.className || typeof elem.getAttribute !== "undefined" && elem.getAttribute("class") || "" ); }); }, @@ -1675,7 +1698,7 @@ Expr = Sizzle.selectors = { operator === "^=" ? check && result.indexOf( check ) === 0 : operator === "*=" ? check && result.indexOf( check ) > -1 : operator === "$=" ? check && result.slice( -check.length ) === check : - operator === "~=" ? ( " " + result + " " ).indexOf( check ) > -1 : + operator === "~=" ? ( " " + result.replace( rwhitespace, " " ) + " " ).indexOf( check ) > -1 : operator === "|=" ? result === check || result.slice( 0, check.length + 1 ) === check + "-" : false; }; @@ -1795,7 +1818,7 @@ Expr = Sizzle.selectors = { matched = fn( seed, argument ), i = matched.length; while ( i-- ) { - idx = indexOf.call( seed, matched[i] ); + idx = indexOf( seed, matched[i] ); seed[ idx ] = !( matches[ idx ] = matched[i] ); } }) : @@ -1834,6 +1857,8 @@ Expr = Sizzle.selectors = { function( elem, context, xml ) { input[0] = elem; matcher( input, null, xml, results ); + // Don't keep the element (issue #299) + input[0] = null; return !results.pop(); }; }), @@ -1845,6 +1870,7 @@ Expr = Sizzle.selectors = { }), "contains": markFunction(function( text ) { + text = text.replace( runescape, funescape ); return function( elem ) { return ( elem.textContent || elem.innerText || getText( elem ) ).indexOf( text ) > -1; }; @@ -2266,7 +2292,7 @@ function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postS i = matcherOut.length; while ( i-- ) { if ( (elem = matcherOut[i]) && - (temp = postFinder ? indexOf.call( seed, elem ) : preMap[i]) > -1 ) { + (temp = postFinder ? indexOf( seed, elem ) : preMap[i]) > -1 ) { seed[temp] = !(results[temp] = elem); } @@ -2301,13 +2327,16 @@ function matcherFromTokens( tokens ) { return elem === checkContext; }, implicitRelative, true ), matchAnyContext = addCombinator( function( elem ) { - return indexOf.call( checkContext, elem ) > -1; + return indexOf( checkContext, elem ) > -1; }, implicitRelative, true ), matchers = [ function( elem, context, xml ) { - return ( !leadingRelative && ( xml || context !== outermostContext ) ) || ( + var ret = ( !leadingRelative && ( xml || context !== outermostContext ) ) || ( (checkContext = context).nodeType ? matchContext( elem, context, xml ) : matchAnyContext( elem, context, xml ) ); + // Avoid hanging onto element (issue #299) + checkContext = null; + return ret; } ]; for ( ; i < len; i++ ) { @@ -2557,7 +2586,7 @@ select = Sizzle.select = function( selector, context, results, seed ) { // Sort stability support.sortStable = expando.split("").sort( sortOrder ).join("") === expando; -// Support: Chrome<14 +// Support: Chrome 14-35+ // Always assume duplicates if they aren't passed to the comparison function support.detectDuplicates = !!hasDuplicate; @@ -6115,7 +6144,14 @@ var getStyles, curCSS, if ( window.getComputedStyle ) { getStyles = function( elem ) { - return elem.ownerDocument.defaultView.getComputedStyle( elem, null ); + // Support: IE<=11+, Firefox<=30+ (#15098, #14150) + // IE throws on elements created in popups + // FF meanwhile throws on frame elements through "defaultView.getComputedStyle" + if ( elem.ownerDocument.defaultView.opener ) { + return elem.ownerDocument.defaultView.getComputedStyle( elem, null ); + } + + return window.getComputedStyle( elem, null ); }; curCSS = function( elem, name, computed ) { @@ -6363,6 +6399,8 @@ function addGetHookIf( conditionFn, hookFn ) { reliableMarginRightVal = !parseFloat( ( window.getComputedStyle( contents, null ) || {} ).marginRight ); + + div.removeChild( contents ); } // Support: IE8 @@ -9070,7 +9108,8 @@ jQuery.extend({ } // We can fire global events as of now if asked to - fireGlobals = s.global; + // Don't fire events if jQuery.event is undefined in an AMD-usage scenario (#15118) + fireGlobals = jQuery.event && s.global; // Watch for a new set of requests if ( fireGlobals && jQuery.active++ === 0 ) { @@ -9329,13 +9368,6 @@ jQuery.each( [ "get", "post" ], function( i, method ) { }; }); -// Attach a bunch of functions for handling common AJAX events -jQuery.each( [ "ajaxStart", "ajaxStop", "ajaxComplete", "ajaxError", "ajaxSuccess", "ajaxSend" ], function( i, type ) { - jQuery.fn[ type ] = function( fn ) { - return this.on( type, fn ); - }; -}); - jQuery._evalUrl = function( url ) { return jQuery.ajax({ @@ -9561,8 +9593,9 @@ var xhrId = 0, // Support: IE<10 // Open requests must be manually aborted on unload (#5280) -if ( window.ActiveXObject ) { - jQuery( window ).on( "unload", function() { +// See https://support.microsoft.com/kb/2856746 for more info +if ( window.attachEvent ) { + window.attachEvent( "onunload", function() { for ( var key in xhrCallbacks ) { xhrCallbacks[ key ]( undefined, true ); } @@ -9996,6 +10029,16 @@ jQuery.fn.load = function( url, params, callback ) { +// Attach a bunch of functions for handling common AJAX events +jQuery.each( [ "ajaxStart", "ajaxStop", "ajaxComplete", "ajaxError", "ajaxSuccess", "ajaxSend" ], function( i, type ) { + jQuery.fn[ type ] = function( fn ) { + return this.on( type, fn ); + }; +}); + + + + jQuery.expr.filters.animated = function( elem ) { return jQuery.grep(jQuery.timers, function( fn ) { return elem === fn.elem; diff --git a/sources/themes/default/js/jquery.min.js b/sources/themes/default/js/jquery.min.js index ab28a24..0f60b7b 100644 --- a/sources/themes/default/js/jquery.min.js +++ b/sources/themes/default/js/jquery.min.js @@ -1,4 +1,5 @@ -/*! jQuery v1.11.1 | (c) 2005, 2014 jQuery Foundation, Inc. | jquery.org/license */ -!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=c.slice,e=c.concat,f=c.push,g=c.indexOf,h={},i=h.toString,j=h.hasOwnProperty,k={},l="1.11.1",m=function(a,b){return new m.fn.init(a,b)},n=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,o=/^-ms-/,p=/-([\da-z])/gi,q=function(a,b){return b.toUpperCase()};m.fn=m.prototype={jquery:l,constructor:m,selector:"",length:0,toArray:function(){return d.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:d.call(this)},pushStack:function(a){var b=m.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a,b){return m.each(this,a,b)},map:function(a){return this.pushStack(m.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(d.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor(null)},push:f,sort:c.sort,splice:c.splice},m.extend=m.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||m.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(e=arguments[h]))for(d in e)a=g[d],c=e[d],g!==c&&(j&&c&&(m.isPlainObject(c)||(b=m.isArray(c)))?(b?(b=!1,f=a&&m.isArray(a)?a:[]):f=a&&m.isPlainObject(a)?a:{},g[d]=m.extend(j,f,c)):void 0!==c&&(g[d]=c));return g},m.extend({expando:"jQuery"+(l+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===m.type(a)},isArray:Array.isArray||function(a){return"array"===m.type(a)},isWindow:function(a){return null!=a&&a==a.window},isNumeric:function(a){return!m.isArray(a)&&a-parseFloat(a)>=0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},isPlainObject:function(a){var b;if(!a||"object"!==m.type(a)||a.nodeType||m.isWindow(a))return!1;try{if(a.constructor&&!j.call(a,"constructor")&&!j.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}if(k.ownLast)for(b in a)return j.call(a,b);for(b in a);return void 0===b||j.call(a,b)},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?h[i.call(a)]||"object":typeof a},globalEval:function(b){b&&m.trim(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(o,"ms-").replace(p,q)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b,c){var d,e=0,f=a.length,g=r(a);if(c){if(g){for(;f>e;e++)if(d=b.apply(a[e],c),d===!1)break}else for(e in a)if(d=b.apply(a[e],c),d===!1)break}else if(g){for(;f>e;e++)if(d=b.call(a[e],e,a[e]),d===!1)break}else for(e in a)if(d=b.call(a[e],e,a[e]),d===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(n,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(r(Object(a))?m.merge(c,"string"==typeof a?[a]:a):f.call(c,a)),c},inArray:function(a,b,c){var d;if(b){if(g)return g.call(b,a,c);for(d=b.length,c=c?0>c?Math.max(0,d+c):c:0;d>c;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,b){var c=+b.length,d=0,e=a.length;while(c>d)a[e++]=b[d++];if(c!==c)while(void 0!==b[d])a[e++]=b[d++];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,f=0,g=a.length,h=r(a),i=[];if(h)for(;g>f;f++)d=b(a[f],f,c),null!=d&&i.push(d);else for(f in a)d=b(a[f],f,c),null!=d&&i.push(d);return e.apply([],i)},guid:1,proxy:function(a,b){var c,e,f;return"string"==typeof b&&(f=a[b],b=a,a=f),m.isFunction(a)?(c=d.call(arguments,2),e=function(){return a.apply(b||this,c.concat(d.call(arguments)))},e.guid=a.guid=a.guid||m.guid++,e):void 0},now:function(){return+new Date},support:k}),m.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(a,b){h["[object "+b+"]"]=b.toLowerCase()});function r(a){var b=a.length,c=m.type(a);return"function"===c||m.isWindow(a)?!1:1===a.nodeType&&b?!0:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var s=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+-new Date,v=a.document,w=0,x=0,y=gb(),z=gb(),A=gb(),B=function(a,b){return a===b&&(l=!0),0},C="undefined",D=1<<31,E={}.hasOwnProperty,F=[],G=F.pop,H=F.push,I=F.push,J=F.slice,K=F.indexOf||function(a){for(var b=0,c=this.length;c>b;b++)if(this[b]===a)return b;return-1},L="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",M="[\\x20\\t\\r\\n\\f]",N="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",O=N.replace("w","w#"),P="\\["+M+"*("+N+")(?:"+M+"*([*^$|!~]?=)"+M+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+O+"))|)"+M+"*\\]",Q=":("+N+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+P+")*)|.*)\\)|)",R=new RegExp("^"+M+"+|((?:^|[^\\\\])(?:\\\\.)*)"+M+"+$","g"),S=new RegExp("^"+M+"*,"+M+"*"),T=new RegExp("^"+M+"*([>+~]|"+M+")"+M+"*"),U=new RegExp("="+M+"*([^\\]'\"]*?)"+M+"*\\]","g"),V=new RegExp(Q),W=new RegExp("^"+O+"$"),X={ID:new RegExp("^#("+N+")"),CLASS:new RegExp("^\\.("+N+")"),TAG:new RegExp("^("+N.replace("w","w*")+")"),ATTR:new RegExp("^"+P),PSEUDO:new RegExp("^"+Q),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+L+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/^(?:input|select|textarea|button)$/i,Z=/^h\d$/i,$=/^[^{]+\{\s*\[native \w/,_=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ab=/[+~]/,bb=/'|\\/g,cb=new RegExp("\\\\([\\da-f]{1,6}"+M+"?|("+M+")|.)","ig"),db=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)};try{I.apply(F=J.call(v.childNodes),v.childNodes),F[v.childNodes.length].nodeType}catch(eb){I={apply:F.length?function(a,b){H.apply(a,J.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function fb(a,b,d,e){var f,h,j,k,l,o,r,s,w,x;if((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,d=d||[],!a||"string"!=typeof a)return d;if(1!==(k=b.nodeType)&&9!==k)return[];if(p&&!e){if(f=_.exec(a))if(j=f[1]){if(9===k){if(h=b.getElementById(j),!h||!h.parentNode)return d;if(h.id===j)return d.push(h),d}else if(b.ownerDocument&&(h=b.ownerDocument.getElementById(j))&&t(b,h)&&h.id===j)return d.push(h),d}else{if(f[2])return I.apply(d,b.getElementsByTagName(a)),d;if((j=f[3])&&c.getElementsByClassName&&b.getElementsByClassName)return I.apply(d,b.getElementsByClassName(j)),d}if(c.qsa&&(!q||!q.test(a))){if(s=r=u,w=b,x=9===k&&a,1===k&&"object"!==b.nodeName.toLowerCase()){o=g(a),(r=b.getAttribute("id"))?s=r.replace(bb,"\\$&"):b.setAttribute("id",s),s="[id='"+s+"'] ",l=o.length;while(l--)o[l]=s+qb(o[l]);w=ab.test(a)&&ob(b.parentNode)||b,x=o.join(",")}if(x)try{return I.apply(d,w.querySelectorAll(x)),d}catch(y){}finally{r||b.removeAttribute("id")}}}return i(a.replace(R,"$1"),b,d,e)}function gb(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function hb(a){return a[u]=!0,a}function ib(a){var b=n.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function jb(a,b){var c=a.split("|"),e=a.length;while(e--)d.attrHandle[c[e]]=b}function kb(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||D)-(~a.sourceIndex||D);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function lb(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function mb(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function nb(a){return hb(function(b){return b=+b,hb(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function ob(a){return a&&typeof a.getElementsByTagName!==C&&a}c=fb.support={},f=fb.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},m=fb.setDocument=function(a){var b,e=a?a.ownerDocument||a:v,g=e.defaultView;return e!==n&&9===e.nodeType&&e.documentElement?(n=e,o=e.documentElement,p=!f(e),g&&g!==g.top&&(g.addEventListener?g.addEventListener("unload",function(){m()},!1):g.attachEvent&&g.attachEvent("onunload",function(){m()})),c.attributes=ib(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ib(function(a){return a.appendChild(e.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=$.test(e.getElementsByClassName)&&ib(function(a){return a.innerHTML="
    ",a.firstChild.className="i",2===a.getElementsByClassName("i").length}),c.getById=ib(function(a){return o.appendChild(a).id=u,!e.getElementsByName||!e.getElementsByName(u).length}),c.getById?(d.find.ID=function(a,b){if(typeof b.getElementById!==C&&p){var c=b.getElementById(a);return c&&c.parentNode?[c]:[]}},d.filter.ID=function(a){var b=a.replace(cb,db);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(cb,db);return function(a){var c=typeof a.getAttributeNode!==C&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return typeof b.getElementsByTagName!==C?b.getElementsByTagName(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return typeof b.getElementsByClassName!==C&&p?b.getElementsByClassName(a):void 0},r=[],q=[],(c.qsa=$.test(e.querySelectorAll))&&(ib(function(a){a.innerHTML="",a.querySelectorAll("[msallowclip^='']").length&&q.push("[*^$]="+M+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+M+"*(?:value|"+L+")"),a.querySelectorAll(":checked").length||q.push(":checked")}),ib(function(a){var b=e.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+M+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=$.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ib(function(a){c.disconnectedMatch=s.call(a,"div"),s.call(a,"[s!='']:x"),r.push("!=",Q)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=$.test(o.compareDocumentPosition),t=b||$.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===e||a.ownerDocument===v&&t(v,a)?-1:b===e||b.ownerDocument===v&&t(v,b)?1:k?K.call(k,a)-K.call(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,f=a.parentNode,g=b.parentNode,h=[a],i=[b];if(!f||!g)return a===e?-1:b===e?1:f?-1:g?1:k?K.call(k,a)-K.call(k,b):0;if(f===g)return kb(a,b);c=a;while(c=c.parentNode)h.unshift(c);c=b;while(c=c.parentNode)i.unshift(c);while(h[d]===i[d])d++;return d?kb(h[d],i[d]):h[d]===v?-1:i[d]===v?1:0},e):n},fb.matches=function(a,b){return fb(a,null,null,b)},fb.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(U,"='$1']"),!(!c.matchesSelector||!p||r&&r.test(b)||q&&q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return fb(b,n,null,[a]).length>0},fb.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},fb.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&E.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},fb.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},fb.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=fb.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=fb.selectors={cacheLength:50,createPseudo:hb,match:X,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(cb,db),a[3]=(a[3]||a[4]||a[5]||"").replace(cb,db),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||fb.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&fb.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return X.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&V.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(cb,db).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+M+")"+a+"("+M+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||typeof a.getAttribute!==C&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=fb.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h;if(q){if(f){while(p){l=b;while(l=l[p])if(h?l.nodeName.toLowerCase()===r:1===l.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){k=q[u]||(q[u]={}),j=k[a]||[],n=j[0]===w&&j[1],m=j[0]===w&&j[2],l=n&&q.childNodes[n];while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if(1===l.nodeType&&++m&&l===b){k[a]=[w,n,m];break}}else if(s&&(j=(b[u]||(b[u]={}))[a])&&j[0]===w)m=j[1];else while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if((h?l.nodeName.toLowerCase()===r:1===l.nodeType)&&++m&&(s&&((l[u]||(l[u]={}))[a]=[w,m]),l===b))break;return m-=e,m===d||m%d===0&&m/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||fb.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?hb(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=K.call(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:hb(function(a){var b=[],c=[],d=h(a.replace(R,"$1"));return d[u]?hb(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),!c.pop()}}),has:hb(function(a){return function(b){return fb(a,b).length>0}}),contains:hb(function(a){return function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:hb(function(a){return W.test(a||"")||fb.error("unsupported lang: "+a),a=a.replace(cb,db).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return Z.test(a.nodeName)},input:function(a){return Y.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:nb(function(){return[0]}),last:nb(function(a,b){return[b-1]}),eq:nb(function(a,b,c){return[0>c?c+b:c]}),even:nb(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:nb(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:nb(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:nb(function(a,b,c){for(var d=0>c?c+b:c;++db;b++)d+=a[b].value;return d}function rb(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=x++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j=[w,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(i=b[u]||(b[u]={}),(h=i[d])&&h[0]===w&&h[1]===f)return j[2]=h[2];if(i[d]=j,j[2]=a(b,c,g))return!0}}}function sb(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function tb(a,b,c){for(var d=0,e=b.length;e>d;d++)fb(a,b[d],c);return c}function ub(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(!c||c(f,d,e))&&(g.push(f),j&&b.push(h));return g}function vb(a,b,c,d,e,f){return d&&!d[u]&&(d=vb(d)),e&&!e[u]&&(e=vb(e,f)),hb(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||tb(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:ub(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=ub(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?K.call(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=ub(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):I.apply(g,r)})}function wb(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=rb(function(a){return a===b},h,!0),l=rb(function(a){return K.call(b,a)>-1},h,!0),m=[function(a,c,d){return!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d))}];f>i;i++)if(c=d.relative[a[i].type])m=[rb(sb(m),c)];else{if(c=d.filter[a[i].type].apply(null,a[i].matches),c[u]){for(e=++i;f>e;e++)if(d.relative[a[e].type])break;return vb(i>1&&sb(m),i>1&&qb(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(R,"$1"),c,e>i&&wb(a.slice(i,e)),f>e&&wb(a=a.slice(e)),f>e&&qb(a))}m.push(c)}return sb(m)}function xb(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,m,o,p=0,q="0",r=f&&[],s=[],t=j,u=f||e&&d.find.TAG("*",k),v=w+=null==t?1:Math.random()||.1,x=u.length;for(k&&(j=g!==n&&g);q!==x&&null!=(l=u[q]);q++){if(e&&l){m=0;while(o=a[m++])if(o(l,g,h)){i.push(l);break}k&&(w=v)}c&&((l=!o&&l)&&p--,f&&r.push(l))}if(p+=q,c&&q!==p){m=0;while(o=b[m++])o(r,s,g,h);if(f){if(p>0)while(q--)r[q]||s[q]||(s[q]=G.call(i));s=ub(s)}I.apply(i,s),k&&!f&&s.length>0&&p+b.length>1&&fb.uniqueSort(i)}return k&&(w=v,j=t),r};return c?hb(f):f}return h=fb.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=wb(b[c]),f[u]?d.push(f):e.push(f);f=A(a,xb(e,d)),f.selector=a}return f},i=fb.select=function(a,b,e,f){var i,j,k,l,m,n="function"==typeof a&&a,o=!f&&g(a=n.selector||a);if(e=e||[],1===o.length){if(j=o[0]=o[0].slice(0),j.length>2&&"ID"===(k=j[0]).type&&c.getById&&9===b.nodeType&&p&&d.relative[j[1].type]){if(b=(d.find.ID(k.matches[0].replace(cb,db),b)||[])[0],!b)return e;n&&(b=b.parentNode),a=a.slice(j.shift().value.length)}i=X.needsContext.test(a)?0:j.length;while(i--){if(k=j[i],d.relative[l=k.type])break;if((m=d.find[l])&&(f=m(k.matches[0].replace(cb,db),ab.test(j[0].type)&&ob(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&qb(j),!a)return I.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,ab.test(a)&&ob(b.parentNode)||b),e},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ib(function(a){return 1&a.compareDocumentPosition(n.createElement("div"))}),ib(function(a){return a.innerHTML="","#"===a.firstChild.getAttribute("href")})||jb("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ib(function(a){return a.innerHTML="",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||jb("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),ib(function(a){return null==a.getAttribute("disabled")})||jb(L,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),fb}(a);m.find=s,m.expr=s.selectors,m.expr[":"]=m.expr.pseudos,m.unique=s.uniqueSort,m.text=s.getText,m.isXMLDoc=s.isXML,m.contains=s.contains;var t=m.expr.match.needsContext,u=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,v=/^.[^:#\[\.,]*$/;function w(a,b,c){if(m.isFunction(b))return m.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return m.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(v.test(b))return m.filter(b,a,c);b=m.filter(b,a)}return m.grep(a,function(a){return m.inArray(a,b)>=0!==c})}m.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?m.find.matchesSelector(d,a)?[d]:[]:m.find.matches(a,m.grep(b,function(a){return 1===a.nodeType}))},m.fn.extend({find:function(a){var b,c=[],d=this,e=d.length;if("string"!=typeof a)return this.pushStack(m(a).filter(function(){for(b=0;e>b;b++)if(m.contains(d[b],this))return!0}));for(b=0;e>b;b++)m.find(a,d[b],c);return c=this.pushStack(e>1?m.unique(c):c),c.selector=this.selector?this.selector+" "+a:a,c},filter:function(a){return this.pushStack(w(this,a||[],!1))},not:function(a){return this.pushStack(w(this,a||[],!0))},is:function(a){return!!w(this,"string"==typeof a&&t.test(a)?m(a):a||[],!1).length}});var x,y=a.document,z=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,A=m.fn.init=function(a,b){var c,d;if(!a)return this;if("string"==typeof a){if(c="<"===a.charAt(0)&&">"===a.charAt(a.length-1)&&a.length>=3?[null,a,null]:z.exec(a),!c||!c[1]&&b)return!b||b.jquery?(b||x).find(a):this.constructor(b).find(a);if(c[1]){if(b=b instanceof m?b[0]:b,m.merge(this,m.parseHTML(c[1],b&&b.nodeType?b.ownerDocument||b:y,!0)),u.test(c[1])&&m.isPlainObject(b))for(c in b)m.isFunction(this[c])?this[c](b[c]):this.attr(c,b[c]);return this}if(d=y.getElementById(c[2]),d&&d.parentNode){if(d.id!==c[2])return x.find(a);this.length=1,this[0]=d}return this.context=y,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):m.isFunction(a)?"undefined"!=typeof x.ready?x.ready(a):a(m):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),m.makeArray(a,this))};A.prototype=m.fn,x=m(y);var B=/^(?:parents|prev(?:Until|All))/,C={children:!0,contents:!0,next:!0,prev:!0};m.extend({dir:function(a,b,c){var d=[],e=a[b];while(e&&9!==e.nodeType&&(void 0===c||1!==e.nodeType||!m(e).is(c)))1===e.nodeType&&d.push(e),e=e[b];return d},sibling:function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c}}),m.fn.extend({has:function(a){var b,c=m(a,this),d=c.length;return this.filter(function(){for(b=0;d>b;b++)if(m.contains(this,c[b]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=t.test(a)||"string"!=typeof a?m(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&m.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?m.unique(f):f)},index:function(a){return a?"string"==typeof a?m.inArray(this[0],m(a)):m.inArray(a.jquery?a[0]:a,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(m.unique(m.merge(this.get(),m(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function D(a,b){do a=a[b];while(a&&1!==a.nodeType);return a}m.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return m.dir(a,"parentNode")},parentsUntil:function(a,b,c){return m.dir(a,"parentNode",c)},next:function(a){return D(a,"nextSibling")},prev:function(a){return D(a,"previousSibling")},nextAll:function(a){return m.dir(a,"nextSibling")},prevAll:function(a){return m.dir(a,"previousSibling")},nextUntil:function(a,b,c){return m.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return m.dir(a,"previousSibling",c)},siblings:function(a){return m.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return m.sibling(a.firstChild)},contents:function(a){return m.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:m.merge([],a.childNodes)}},function(a,b){m.fn[a]=function(c,d){var e=m.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=m.filter(d,e)),this.length>1&&(C[a]||(e=m.unique(e)),B.test(a)&&(e=e.reverse())),this.pushStack(e)}});var E=/\S+/g,F={};function G(a){var b=F[a]={};return m.each(a.match(E)||[],function(a,c){b[c]=!0}),b}m.Callbacks=function(a){a="string"==typeof a?F[a]||G(a):m.extend({},a);var b,c,d,e,f,g,h=[],i=!a.once&&[],j=function(l){for(c=a.memory&&l,d=!0,f=g||0,g=0,e=h.length,b=!0;h&&e>f;f++)if(h[f].apply(l[0],l[1])===!1&&a.stopOnFalse){c=!1;break}b=!1,h&&(i?i.length&&j(i.shift()):c?h=[]:k.disable())},k={add:function(){if(h){var d=h.length;!function f(b){m.each(b,function(b,c){var d=m.type(c);"function"===d?a.unique&&k.has(c)||h.push(c):c&&c.length&&"string"!==d&&f(c)})}(arguments),b?e=h.length:c&&(g=d,j(c))}return this},remove:function(){return h&&m.each(arguments,function(a,c){var d;while((d=m.inArray(c,h,d))>-1)h.splice(d,1),b&&(e>=d&&e--,f>=d&&f--)}),this},has:function(a){return a?m.inArray(a,h)>-1:!(!h||!h.length)},empty:function(){return h=[],e=0,this},disable:function(){return h=i=c=void 0,this},disabled:function(){return!h},lock:function(){return i=void 0,c||k.disable(),this},locked:function(){return!i},fireWith:function(a,c){return!h||d&&!i||(c=c||[],c=[a,c.slice?c.slice():c],b?i.push(c):j(c)),this},fire:function(){return k.fireWith(this,arguments),this},fired:function(){return!!d}};return k},m.extend({Deferred:function(a){var b=[["resolve","done",m.Callbacks("once memory"),"resolved"],["reject","fail",m.Callbacks("once memory"),"rejected"],["notify","progress",m.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return m.Deferred(function(c){m.each(b,function(b,f){var g=m.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&m.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?m.extend(a,d):d}},e={};return d.pipe=d.then,m.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=d.call(arguments),e=c.length,f=1!==e||a&&m.isFunction(a.promise)?e:0,g=1===f?a:m.Deferred(),h=function(a,b,c){return function(e){b[a]=this,c[a]=arguments.length>1?d.call(arguments):e,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(e>1)for(i=new Array(e),j=new Array(e),k=new Array(e);e>b;b++)c[b]&&m.isFunction(c[b].promise)?c[b].promise().done(h(b,k,c)).fail(g.reject).progress(h(b,j,i)):--f;return f||g.resolveWith(k,c),g.promise()}});var H;m.fn.ready=function(a){return m.ready.promise().done(a),this},m.extend({isReady:!1,readyWait:1,holdReady:function(a){a?m.readyWait++:m.ready(!0)},ready:function(a){if(a===!0?!--m.readyWait:!m.isReady){if(!y.body)return setTimeout(m.ready);m.isReady=!0,a!==!0&&--m.readyWait>0||(H.resolveWith(y,[m]),m.fn.triggerHandler&&(m(y).triggerHandler("ready"),m(y).off("ready")))}}});function I(){y.addEventListener?(y.removeEventListener("DOMContentLoaded",J,!1),a.removeEventListener("load",J,!1)):(y.detachEvent("onreadystatechange",J),a.detachEvent("onload",J))}function J(){(y.addEventListener||"load"===event.type||"complete"===y.readyState)&&(I(),m.ready())}m.ready.promise=function(b){if(!H)if(H=m.Deferred(),"complete"===y.readyState)setTimeout(m.ready);else if(y.addEventListener)y.addEventListener("DOMContentLoaded",J,!1),a.addEventListener("load",J,!1);else{y.attachEvent("onreadystatechange",J),a.attachEvent("onload",J);var c=!1;try{c=null==a.frameElement&&y.documentElement}catch(d){}c&&c.doScroll&&!function e(){if(!m.isReady){try{c.doScroll("left")}catch(a){return setTimeout(e,50)}I(),m.ready()}}()}return H.promise(b)};var K="undefined",L;for(L in m(k))break;k.ownLast="0"!==L,k.inlineBlockNeedsLayout=!1,m(function(){var a,b,c,d;c=y.getElementsByTagName("body")[0],c&&c.style&&(b=y.createElement("div"),d=y.createElement("div"),d.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",c.appendChild(d).appendChild(b),typeof b.style.zoom!==K&&(b.style.cssText="display:inline;margin:0;border:0;padding:1px;width:1px;zoom:1",k.inlineBlockNeedsLayout=a=3===b.offsetWidth,a&&(c.style.zoom=1)),c.removeChild(d))}),function(){var a=y.createElement("div");if(null==k.deleteExpando){k.deleteExpando=!0;try{delete a.test}catch(b){k.deleteExpando=!1}}a=null}(),m.acceptData=function(a){var b=m.noData[(a.nodeName+" ").toLowerCase()],c=+a.nodeType||1;return 1!==c&&9!==c?!1:!b||b!==!0&&a.getAttribute("classid")===b};var M=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,N=/([A-Z])/g;function O(a,b,c){if(void 0===c&&1===a.nodeType){var d="data-"+b.replace(N,"-$1").toLowerCase();if(c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:M.test(c)?m.parseJSON(c):c}catch(e){}m.data(a,b,c)}else c=void 0}return c}function P(a){var b;for(b in a)if(("data"!==b||!m.isEmptyObject(a[b]))&&"toJSON"!==b)return!1;return!0}function Q(a,b,d,e){if(m.acceptData(a)){var f,g,h=m.expando,i=a.nodeType,j=i?m.cache:a,k=i?a[h]:a[h]&&h; -if(k&&j[k]&&(e||j[k].data)||void 0!==d||"string"!=typeof b)return k||(k=i?a[h]=c.pop()||m.guid++:h),j[k]||(j[k]=i?{}:{toJSON:m.noop}),("object"==typeof b||"function"==typeof b)&&(e?j[k]=m.extend(j[k],b):j[k].data=m.extend(j[k].data,b)),g=j[k],e||(g.data||(g.data={}),g=g.data),void 0!==d&&(g[m.camelCase(b)]=d),"string"==typeof b?(f=g[b],null==f&&(f=g[m.camelCase(b)])):f=g,f}}function R(a,b,c){if(m.acceptData(a)){var d,e,f=a.nodeType,g=f?m.cache:a,h=f?a[m.expando]:m.expando;if(g[h]){if(b&&(d=c?g[h]:g[h].data)){m.isArray(b)?b=b.concat(m.map(b,m.camelCase)):b in d?b=[b]:(b=m.camelCase(b),b=b in d?[b]:b.split(" ")),e=b.length;while(e--)delete d[b[e]];if(c?!P(d):!m.isEmptyObject(d))return}(c||(delete g[h].data,P(g[h])))&&(f?m.cleanData([a],!0):k.deleteExpando||g!=g.window?delete g[h]:g[h]=null)}}}m.extend({cache:{},noData:{"applet ":!0,"embed ":!0,"object ":"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(a){return a=a.nodeType?m.cache[a[m.expando]]:a[m.expando],!!a&&!P(a)},data:function(a,b,c){return Q(a,b,c)},removeData:function(a,b){return R(a,b)},_data:function(a,b,c){return Q(a,b,c,!0)},_removeData:function(a,b){return R(a,b,!0)}}),m.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=m.data(f),1===f.nodeType&&!m._data(f,"parsedAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=m.camelCase(d.slice(5)),O(f,d,e[d])));m._data(f,"parsedAttrs",!0)}return e}return"object"==typeof a?this.each(function(){m.data(this,a)}):arguments.length>1?this.each(function(){m.data(this,a,b)}):f?O(f,a,m.data(f,a)):void 0},removeData:function(a){return this.each(function(){m.removeData(this,a)})}}),m.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=m._data(a,b),c&&(!d||m.isArray(c)?d=m._data(a,b,m.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=m.queue(a,b),d=c.length,e=c.shift(),f=m._queueHooks(a,b),g=function(){m.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return m._data(a,c)||m._data(a,c,{empty:m.Callbacks("once memory").add(function(){m._removeData(a,b+"queue"),m._removeData(a,c)})})}}),m.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.lengthh;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f},W=/^(?:checkbox|radio)$/i;!function(){var a=y.createElement("input"),b=y.createElement("div"),c=y.createDocumentFragment();if(b.innerHTML="
    a",k.leadingWhitespace=3===b.firstChild.nodeType,k.tbody=!b.getElementsByTagName("tbody").length,k.htmlSerialize=!!b.getElementsByTagName("link").length,k.html5Clone="<:nav>"!==y.createElement("nav").cloneNode(!0).outerHTML,a.type="checkbox",a.checked=!0,c.appendChild(a),k.appendChecked=a.checked,b.innerHTML="",k.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue,c.appendChild(b),b.innerHTML="",k.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,k.noCloneEvent=!0,b.attachEvent&&(b.attachEvent("onclick",function(){k.noCloneEvent=!1}),b.cloneNode(!0).click()),null==k.deleteExpando){k.deleteExpando=!0;try{delete b.test}catch(d){k.deleteExpando=!1}}}(),function(){var b,c,d=y.createElement("div");for(b in{submit:!0,change:!0,focusin:!0})c="on"+b,(k[b+"Bubbles"]=c in a)||(d.setAttribute(c,"t"),k[b+"Bubbles"]=d.attributes[c].expando===!1);d=null}();var X=/^(?:input|select|textarea)$/i,Y=/^key/,Z=/^(?:mouse|pointer|contextmenu)|click/,$=/^(?:focusinfocus|focusoutblur)$/,_=/^([^.]*)(?:\.(.+)|)$/;function ab(){return!0}function bb(){return!1}function cb(){try{return y.activeElement}catch(a){}}m.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,n,o,p,q,r=m._data(a);if(r){c.handler&&(i=c,c=i.handler,e=i.selector),c.guid||(c.guid=m.guid++),(g=r.events)||(g=r.events={}),(k=r.handle)||(k=r.handle=function(a){return typeof m===K||a&&m.event.triggered===a.type?void 0:m.event.dispatch.apply(k.elem,arguments)},k.elem=a),b=(b||"").match(E)||[""],h=b.length;while(h--)f=_.exec(b[h])||[],o=q=f[1],p=(f[2]||"").split(".").sort(),o&&(j=m.event.special[o]||{},o=(e?j.delegateType:j.bindType)||o,j=m.event.special[o]||{},l=m.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&m.expr.match.needsContext.test(e),namespace:p.join(".")},i),(n=g[o])||(n=g[o]=[],n.delegateCount=0,j.setup&&j.setup.call(a,d,p,k)!==!1||(a.addEventListener?a.addEventListener(o,k,!1):a.attachEvent&&a.attachEvent("on"+o,k))),j.add&&(j.add.call(a,l),l.handler.guid||(l.handler.guid=c.guid)),e?n.splice(n.delegateCount++,0,l):n.push(l),m.event.global[o]=!0);a=null}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,n,o,p,q,r=m.hasData(a)&&m._data(a);if(r&&(k=r.events)){b=(b||"").match(E)||[""],j=b.length;while(j--)if(h=_.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o){l=m.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,n=k[o]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),i=f=n.length;while(f--)g=n[f],!e&&q!==g.origType||c&&c.guid!==g.guid||h&&!h.test(g.namespace)||d&&d!==g.selector&&("**"!==d||!g.selector)||(n.splice(f,1),g.selector&&n.delegateCount--,l.remove&&l.remove.call(a,g));i&&!n.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||m.removeEvent(a,o,r.handle),delete k[o])}else for(o in k)m.event.remove(a,o+b[j],c,d,!0);m.isEmptyObject(k)&&(delete r.handle,m._removeData(a,"events"))}},trigger:function(b,c,d,e){var f,g,h,i,k,l,n,o=[d||y],p=j.call(b,"type")?b.type:b,q=j.call(b,"namespace")?b.namespace.split("."):[];if(h=l=d=d||y,3!==d.nodeType&&8!==d.nodeType&&!$.test(p+m.event.triggered)&&(p.indexOf(".")>=0&&(q=p.split("."),p=q.shift(),q.sort()),g=p.indexOf(":")<0&&"on"+p,b=b[m.expando]?b:new m.Event(p,"object"==typeof b&&b),b.isTrigger=e?2:3,b.namespace=q.join("."),b.namespace_re=b.namespace?new RegExp("(^|\\.)"+q.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=d),c=null==c?[b]:m.makeArray(c,[b]),k=m.event.special[p]||{},e||!k.trigger||k.trigger.apply(d,c)!==!1)){if(!e&&!k.noBubble&&!m.isWindow(d)){for(i=k.delegateType||p,$.test(i+p)||(h=h.parentNode);h;h=h.parentNode)o.push(h),l=h;l===(d.ownerDocument||y)&&o.push(l.defaultView||l.parentWindow||a)}n=0;while((h=o[n++])&&!b.isPropagationStopped())b.type=n>1?i:k.bindType||p,f=(m._data(h,"events")||{})[b.type]&&m._data(h,"handle"),f&&f.apply(h,c),f=g&&h[g],f&&f.apply&&m.acceptData(h)&&(b.result=f.apply(h,c),b.result===!1&&b.preventDefault());if(b.type=p,!e&&!b.isDefaultPrevented()&&(!k._default||k._default.apply(o.pop(),c)===!1)&&m.acceptData(d)&&g&&d[p]&&!m.isWindow(d)){l=d[g],l&&(d[g]=null),m.event.triggered=p;try{d[p]()}catch(r){}m.event.triggered=void 0,l&&(d[g]=l)}return b.result}},dispatch:function(a){a=m.event.fix(a);var b,c,e,f,g,h=[],i=d.call(arguments),j=(m._data(this,"events")||{})[a.type]||[],k=m.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=m.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,g=0;while((e=f.handlers[g++])&&!a.isImmediatePropagationStopped())(!a.namespace_re||a.namespace_re.test(e.namespace))&&(a.handleObj=e,a.data=e.data,c=((m.event.special[e.origType]||{}).handle||e.handler).apply(f.elem,i),void 0!==c&&(a.result=c)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&(!a.button||"click"!==a.type))for(;i!=this;i=i.parentNode||this)if(1===i.nodeType&&(i.disabled!==!0||"click"!==a.type)){for(e=[],f=0;h>f;f++)d=b[f],c=d.selector+" ",void 0===e[c]&&(e[c]=d.needsContext?m(c,this).index(i)>=0:m.find(c,this,null,[i]).length),e[c]&&e.push(d);e.length&&g.push({elem:i,handlers:e})}return h]","i"),hb=/^\s+/,ib=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,jb=/<([\w:]+)/,kb=/\s*$/g,rb={option:[1,""],legend:[1,"
    ","
    "],area:[1,"",""],param:[1,"",""],thead:[1,"","
    "],tr:[2,"","
    "],col:[2,"","
    "],td:[3,"","
    "],_default:k.htmlSerialize?[0,"",""]:[1,"X
    ","
    "]},sb=db(y),tb=sb.appendChild(y.createElement("div"));rb.optgroup=rb.option,rb.tbody=rb.tfoot=rb.colgroup=rb.caption=rb.thead,rb.th=rb.td;function ub(a,b){var c,d,e=0,f=typeof a.getElementsByTagName!==K?a.getElementsByTagName(b||"*"):typeof a.querySelectorAll!==K?a.querySelectorAll(b||"*"):void 0;if(!f)for(f=[],c=a.childNodes||a;null!=(d=c[e]);e++)!b||m.nodeName(d,b)?f.push(d):m.merge(f,ub(d,b));return void 0===b||b&&m.nodeName(a,b)?m.merge([a],f):f}function vb(a){W.test(a.type)&&(a.defaultChecked=a.checked)}function wb(a,b){return m.nodeName(a,"table")&&m.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function xb(a){return a.type=(null!==m.find.attr(a,"type"))+"/"+a.type,a}function yb(a){var b=pb.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function zb(a,b){for(var c,d=0;null!=(c=a[d]);d++)m._data(c,"globalEval",!b||m._data(b[d],"globalEval"))}function Ab(a,b){if(1===b.nodeType&&m.hasData(a)){var c,d,e,f=m._data(a),g=m._data(b,f),h=f.events;if(h){delete g.handle,g.events={};for(c in h)for(d=0,e=h[c].length;e>d;d++)m.event.add(b,c,h[c][d])}g.data&&(g.data=m.extend({},g.data))}}function Bb(a,b){var c,d,e;if(1===b.nodeType){if(c=b.nodeName.toLowerCase(),!k.noCloneEvent&&b[m.expando]){e=m._data(b);for(d in e.events)m.removeEvent(b,d,e.handle);b.removeAttribute(m.expando)}"script"===c&&b.text!==a.text?(xb(b).text=a.text,yb(b)):"object"===c?(b.parentNode&&(b.outerHTML=a.outerHTML),k.html5Clone&&a.innerHTML&&!m.trim(b.innerHTML)&&(b.innerHTML=a.innerHTML)):"input"===c&&W.test(a.type)?(b.defaultChecked=b.checked=a.checked,b.value!==a.value&&(b.value=a.value)):"option"===c?b.defaultSelected=b.selected=a.defaultSelected:("input"===c||"textarea"===c)&&(b.defaultValue=a.defaultValue)}}m.extend({clone:function(a,b,c){var d,e,f,g,h,i=m.contains(a.ownerDocument,a);if(k.html5Clone||m.isXMLDoc(a)||!gb.test("<"+a.nodeName+">")?f=a.cloneNode(!0):(tb.innerHTML=a.outerHTML,tb.removeChild(f=tb.firstChild)),!(k.noCloneEvent&&k.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||m.isXMLDoc(a)))for(d=ub(f),h=ub(a),g=0;null!=(e=h[g]);++g)d[g]&&Bb(e,d[g]);if(b)if(c)for(h=h||ub(a),d=d||ub(f),g=0;null!=(e=h[g]);g++)Ab(e,d[g]);else Ab(a,f);return d=ub(f,"script"),d.length>0&&zb(d,!i&&ub(a,"script")),d=h=e=null,f},buildFragment:function(a,b,c,d){for(var e,f,g,h,i,j,l,n=a.length,o=db(b),p=[],q=0;n>q;q++)if(f=a[q],f||0===f)if("object"===m.type(f))m.merge(p,f.nodeType?[f]:f);else if(lb.test(f)){h=h||o.appendChild(b.createElement("div")),i=(jb.exec(f)||["",""])[1].toLowerCase(),l=rb[i]||rb._default,h.innerHTML=l[1]+f.replace(ib,"<$1>")+l[2],e=l[0];while(e--)h=h.lastChild;if(!k.leadingWhitespace&&hb.test(f)&&p.push(b.createTextNode(hb.exec(f)[0])),!k.tbody){f="table"!==i||kb.test(f)?""!==l[1]||kb.test(f)?0:h:h.firstChild,e=f&&f.childNodes.length;while(e--)m.nodeName(j=f.childNodes[e],"tbody")&&!j.childNodes.length&&f.removeChild(j)}m.merge(p,h.childNodes),h.textContent="";while(h.firstChild)h.removeChild(h.firstChild);h=o.lastChild}else p.push(b.createTextNode(f));h&&o.removeChild(h),k.appendChecked||m.grep(ub(p,"input"),vb),q=0;while(f=p[q++])if((!d||-1===m.inArray(f,d))&&(g=m.contains(f.ownerDocument,f),h=ub(o.appendChild(f),"script"),g&&zb(h),c)){e=0;while(f=h[e++])ob.test(f.type||"")&&c.push(f)}return h=null,o},cleanData:function(a,b){for(var d,e,f,g,h=0,i=m.expando,j=m.cache,l=k.deleteExpando,n=m.event.special;null!=(d=a[h]);h++)if((b||m.acceptData(d))&&(f=d[i],g=f&&j[f])){if(g.events)for(e in g.events)n[e]?m.event.remove(d,e):m.removeEvent(d,e,g.handle);j[f]&&(delete j[f],l?delete d[i]:typeof d.removeAttribute!==K?d.removeAttribute(i):d[i]=null,c.push(f))}}}),m.fn.extend({text:function(a){return V(this,function(a){return void 0===a?m.text(this):this.empty().append((this[0]&&this[0].ownerDocument||y).createTextNode(a))},null,a,arguments.length)},append:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=wb(this,a);b.appendChild(a)}})},prepend:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=wb(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},remove:function(a,b){for(var c,d=a?m.filter(a,this):this,e=0;null!=(c=d[e]);e++)b||1!==c.nodeType||m.cleanData(ub(c)),c.parentNode&&(b&&m.contains(c.ownerDocument,c)&&zb(ub(c,"script")),c.parentNode.removeChild(c));return this},empty:function(){for(var a,b=0;null!=(a=this[b]);b++){1===a.nodeType&&m.cleanData(ub(a,!1));while(a.firstChild)a.removeChild(a.firstChild);a.options&&m.nodeName(a,"select")&&(a.options.length=0)}return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return m.clone(this,a,b)})},html:function(a){return V(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a)return 1===b.nodeType?b.innerHTML.replace(fb,""):void 0;if(!("string"!=typeof a||mb.test(a)||!k.htmlSerialize&&gb.test(a)||!k.leadingWhitespace&&hb.test(a)||rb[(jb.exec(a)||["",""])[1].toLowerCase()])){a=a.replace(ib,"<$1>");try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(m.cleanData(ub(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=arguments[0];return this.domManip(arguments,function(b){a=this.parentNode,m.cleanData(ub(this)),a&&a.replaceChild(b,this)}),a&&(a.length||a.nodeType)?this:this.remove()},detach:function(a){return this.remove(a,!0)},domManip:function(a,b){a=e.apply([],a);var c,d,f,g,h,i,j=0,l=this.length,n=this,o=l-1,p=a[0],q=m.isFunction(p);if(q||l>1&&"string"==typeof p&&!k.checkClone&&nb.test(p))return this.each(function(c){var d=n.eq(c);q&&(a[0]=p.call(this,c,d.html())),d.domManip(a,b)});if(l&&(i=m.buildFragment(a,this[0].ownerDocument,!1,this),c=i.firstChild,1===i.childNodes.length&&(i=c),c)){for(g=m.map(ub(i,"script"),xb),f=g.length;l>j;j++)d=i,j!==o&&(d=m.clone(d,!0,!0),f&&m.merge(g,ub(d,"script"))),b.call(this[j],d,j);if(f)for(h=g[g.length-1].ownerDocument,m.map(g,yb),j=0;f>j;j++)d=g[j],ob.test(d.type||"")&&!m._data(d,"globalEval")&&m.contains(h,d)&&(d.src?m._evalUrl&&m._evalUrl(d.src):m.globalEval((d.text||d.textContent||d.innerHTML||"").replace(qb,"")));i=c=null}return this}}),m.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){m.fn[a]=function(a){for(var c,d=0,e=[],g=m(a),h=g.length-1;h>=d;d++)c=d===h?this:this.clone(!0),m(g[d])[b](c),f.apply(e,c.get());return this.pushStack(e)}});var Cb,Db={};function Eb(b,c){var d,e=m(c.createElement(b)).appendTo(c.body),f=a.getDefaultComputedStyle&&(d=a.getDefaultComputedStyle(e[0]))?d.display:m.css(e[0],"display");return e.detach(),f}function Fb(a){var b=y,c=Db[a];return c||(c=Eb(a,b),"none"!==c&&c||(Cb=(Cb||m("