diff --git a/admin.php b/admin.php index 2b40a6328..f932b53a4 100644 --- a/admin.php +++ b/admin.php @@ -61,8 +61,8 @@ $page['infos'] = array(); $link_start = PHPWG_ROOT_PATH.'admin.php?page='; $conf_link = $link_start.'configuration&section='; //----------------------------------------------------- template initialization -$title = l10n('PhpWebGallery Administration'); // for include/page_header.php -$page['page_banner'] = '

'.l10n('PhpWebGallery Administration').'

'; +$title = l10n('Piwigo Administration'); // for include/page_header.php +$page['page_banner'] = '

'.l10n('Piwigo Administration').'

'; $page['body_id'] = 'theAdminPage'; $template->set_filenames(array('admin' => 'admin.tpl')); diff --git a/admin/intro.php b/admin/intro.php index d30c30532..ed378d2d5 100644 --- a/admin/intro.php +++ b/admin/intro.php @@ -93,14 +93,14 @@ if (isset($_GET['action']) and 'check_upgrade' == $_GET['action']) { array_push( $page['infos'], - l10n('A new version of PhpWebGallery is available.') + l10n('A new version of Piwigo is available.') ); } else { array_push( $page['infos'], - l10n('You are running the latest version of PhpWebGallery.') + l10n('You are running the latest version of Piwigo.') ); } } diff --git a/doc/README_en.txt b/doc/README_en.txt index 097d365c4..91b5eecc8 100644 --- a/doc/README_en.txt +++ b/doc/README_en.txt @@ -1,8 +1,8 @@ ============= -PhpWebGallery +Piwigo ============= -http://phpwebgallery.net +http://piwigo.org Installation @@ -65,9 +65,9 @@ Newsletter https://gna.org/mail/?group=phpwebgallery -It is *highly* recommended to subscribe to PhpWebGallery newsletter. This is +It is *highly* recommended to subscribe to Piwigo newsletter. This is extremely low-traffic, but will provide you with announcements of new -PhpWebGallery releases and serious bug notification. You will find available +Piwigo releases and serious bug notification. You will find available mailing lists at this URL : No spam, no commercial use. diff --git a/doc/README_fr.txt b/doc/README_fr.txt index 72b7f1596..2915c1253 100644 --- a/doc/README_fr.txt +++ b/doc/README_fr.txt @@ -1,8 +1,8 @@ ============= -PhpWebGallery +Piwigo ============= -http://phpwebgallery.net +http://piwigo.org Installation ============ @@ -67,7 +67,7 @@ Newsletter https://gna.org/mail/?group=phpwebgallery Il est *fortement* recommandé de souscrire à la newsletter de -PhpWebGallery. Très peu de mails sont envoyés, mais les informations sont +Piwigo. Très peu de mails sont envoyés, mais les informations sont importantes : nouvelles versions de l'application, notification de bugs importants (relatifs à la sécurité). Vous trouverez les listes de discussions disponibles sur la page suivante : diff --git a/index.php b/index.php index 5ebc91083..b5c5feeaa 100644 --- a/index.php +++ b/index.php @@ -1,13 +1,10 @@ PhpWebGallery demonstration site

My photos web site

','html displayed on the top each page of your gallery'); -INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('history_admin','false','keep a history of administrator visits on your website'); -INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('history_guest','true','keep a history of guest visits on your website'); -INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('allow_user_registration','true','allow visitors to register?'); -INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('secret_key', MD5(RAND()), 'a secret key specific to the gallery for internal use'); -INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('nbm_send_html_mail','true','Send mail on HTML format for notification by mail'); -INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('nbm_send_mail_as','','Send mail as param value for notification by mail'); -INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('nbm_send_detailed_content','true','Send detailed content for notification by mail'); -INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('nbm_complementary_mail_content','','Complementary mail content for notification by mail'); -INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('nbm_send_recent_post_dates','true','Send recent post by dates for notification by mail'); -INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('email_admin_on_new_user','false','Send an email to theadministrators when a user registers'); -INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('email_admin_on_comment','false','Send an email to the administrators when a valid comment is entered'); -INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('email_admin_on_comment_validation','false','Send an email to the administrators when a comment requires validation'); -INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('email_admin_on_picture_uploaded','false','Send an email to the administrators when a picture is uploaded'); -INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('obligatory_user_mail_address','false','Mail address is obligatory for users'); -INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('c13y_ignore',null,'List of ignored anomalies'); -INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('upload_link_everytime','false','Show upload link every time'); -INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('upload_user_access',2 /*ACCESS_CLASSIC*/,'User access level to upload'); +INSERT INTO piwigo_config (param,value,comment) VALUES ('nb_comment_page','10','number of comments to display on each page'); +INSERT INTO piwigo_config (param,value,comment) VALUES ('log','false','keep an history of visits on your website'); +INSERT INTO piwigo_config (param,value,comment) VALUES ('comments_validation','false','administrators validate users comments before becoming visible'); +INSERT INTO piwigo_config (param,value,comment) VALUES ('comments_forall','false','even guest not registered can post comments'); +INSERT INTO piwigo_config (param,value,comment) VALUES ('gallery_locked','false','Lock your gallery temporary for non admin users'); +INSERT INTO piwigo_config (param,value,comment) VALUES ('gallery_title','Piwigo demonstration site','Title at top of each page and for RSS feed'); +INSERT INTO piwigo_config (param,value,comment) VALUES ('gallery_url','http://demo.piwigo.net','URL given in RSS feed'); +INSERT INTO piwigo_config (param,value,comment) VALUES ('rate','true','Rating pictures feature is enabled'); +INSERT INTO piwigo_config (param,value,comment) VALUES ('rate_anonymous','true','Rating pictures feature is also enabled for visitors'); +INSERT INTO piwigo_config (param,value,comment) VALUES ('page_banner','

Piwigo demonstration site

My photos web site

','html displayed on the top each page of your gallery'); +INSERT INTO piwigo_config (param,value,comment) VALUES ('history_admin','false','keep a history of administrator visits on your website'); +INSERT INTO piwigo_config (param,value,comment) VALUES ('history_guest','true','keep a history of guest visits on your website'); +INSERT INTO piwigo_config (param,value,comment) VALUES ('allow_user_registration','true','allow visitors to register?'); +INSERT INTO piwigo_config (param,value,comment) VALUES ('secret_key', MD5(RAND()), 'a secret key specific to the gallery for internal use'); +INSERT INTO piwigo_config (param,value,comment) VALUES ('nbm_send_html_mail','true','Send mail on HTML format for notification by mail'); +INSERT INTO piwigo_config (param,value,comment) VALUES ('nbm_send_mail_as','','Send mail as param value for notification by mail'); +INSERT INTO piwigo_config (param,value,comment) VALUES ('nbm_send_detailed_content','true','Send detailed content for notification by mail'); +INSERT INTO piwigo_config (param,value,comment) VALUES ('nbm_complementary_mail_content','','Complementary mail content for notification by mail'); +INSERT INTO piwigo_config (param,value,comment) VALUES ('nbm_send_recent_post_dates','true','Send recent post by dates for notification by mail'); +INSERT INTO piwigo_config (param,value,comment) VALUES ('email_admin_on_new_user','false','Send an email to theadministrators when a user registers'); +INSERT INTO piwigo_config (param,value,comment) VALUES ('email_admin_on_comment','false','Send an email to the administrators when a valid comment is entered'); +INSERT INTO piwigo_config (param,value,comment) VALUES ('email_admin_on_comment_validation','false','Send an email to the administrators when a comment requires validation'); +INSERT INTO piwigo_config (param,value,comment) VALUES ('email_admin_on_picture_uploaded','false','Send an email to the administrators when a picture is uploaded'); +INSERT INTO piwigo_config (param,value,comment) VALUES ('obligatory_user_mail_address','false','Mail address is obligatory for users'); +INSERT INTO piwigo_config (param,value,comment) VALUES ('c13y_ignore',null,'List of ignored anomalies'); +INSERT INTO piwigo_config (param,value,comment) VALUES ('upload_link_everytime','false','Show upload link every time'); +INSERT INTO piwigo_config (param,value,comment) VALUES ('upload_user_access',2 /*ACCESS_CLASSIC*/,'User access level to upload'); diff --git a/install/db/25-database.php b/install/db/25-database.php index 6fe0efee4..9afa5e5ac 100644 --- a/install/db/25-database.php +++ b/install/db/25-database.php @@ -30,7 +30,7 @@ $upgrade_description = 'reinitialize page_banner'; $query = ' UPDATE '.PREFIX_TABLE.'config - SET value = \'

PhpWebGallery demonstration site

My photos web site

\' + SET value = \'

Piwigo demonstration site

My photos web site

\' WHERE param = \'page_banner\' ;'; pwg_query($query); diff --git a/language/en_UK/about.html b/language/en_UK/about.html index b5a46d006..e185f7ddf 100644 --- a/language/en_UK/about.html +++ b/language/en_UK/about.html @@ -1,10 +1,10 @@ -
  • PhpWebGallery is a web application giving you the possibility to +
  • Piwigo is a web application giving you the possibility to create an online images gallery easily.
    • -
  • Technicaly, PhpWebGallery is fully developped with PHP (the elePHPant) +
  • Technicaly, Piwigo is fully developped with PHP (the elePHPant) with a MySQL database (the SQuirreL).
  • If you have any suggestions or comments, please visit PhpWebGallery official site, and - its dedicated forum.
    • + href="http://piwigo.org">Piwigo official site, and + its dedicated forum. diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php index 06ff359b7..58c0f078f 100644 --- a/language/en_UK/admin.lang.php +++ b/language/en_UK/admin.lang.php @@ -48,7 +48,6 @@ $lang['%d users'] = '%d users'; $lang['%d waiting for validation'] = '%d waiting for validation'; $lang['%d waiting pictures rejected'] = '%d waiting pictures rejected'; $lang['%d waiting pictures validated'] = '%d waiting pictures validated'; -$lang['A new version of PhpWebGallery is available.'] = 'A new version of PhpWebGallery is available.'; $lang['Actions'] = 'Actions'; $lang['Activate'] = 'Activate'; $lang['Add/delete a permalink'] = 'Add/delete a permalink'; @@ -146,8 +145,6 @@ $lang['Permalinks'] = 'Permalinks'; $lang['Permission denied'] = 'Permission denied'; $lang['Permission granted thanks to a group'] = 'Permission granted thanks to a group'; $lang['Permission granted'] = 'Permission granted'; -$lang['PhpWebGallery Administration'] = 'PhpWebGallery Administration'; -$lang['PhpWebGallery version'] = 'PhpWebGallery version'; $lang['Picture informations updated'] = 'Picture informations updated'; $lang['Plugins'] = 'Plugins'; $lang['Position'] = 'Position'; @@ -194,7 +191,6 @@ $lang['Virtual categories to move'] = 'Virtual categories to move'; $lang['Virtual category name'] = 'Virtual category name'; $lang['Webmaster cannot be deleted'] = 'Webmaster cannot be deleted'; $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 PhpWebGallery.'] = 'You are running the latest version of PhpWebGallery.'; $lang['You cannot delete your account'] = "You cannot delete your account"; $lang['You cannot move a category in its own sub category'] = 'You cannot move a category in its own sub category'; $lang['You need to confirm deletion'] = 'You need to confirm deletion'; @@ -385,8 +381,8 @@ $lang['target'] = 'target'; $lang['thumbnail'] = 'thumbnail'; $lang['title'] = 'title'; $lang['title_categories'] = 'Categories management'; -$lang['title_configuration'] = 'PhpWebGallery configuration'; -$lang['title_default'] = 'PhpWebGallery administration'; +$lang['title_configuration'] = 'Piwigo configuration'; +$lang['title_default'] = 'Piwigo administration'; $lang['title_edit_cat'] = 'Edit a category'; $lang['title_groups'] = 'Group management'; $lang['title_liste_users'] = 'User list'; @@ -422,8 +418,8 @@ $lang['update'] = 'Synchronize'; $lang['update_cats_subset'] = 'reduce to single existing categories'; $lang['update_default_title'] = 'Choose an option'; $lang['update_display_info'] = 'display maximum informations (added categories and elements, deleted categories and elements)'; -$lang['update_err_pwg_version_differs'] = 'PhpWebGallery version differs on the remote site'; -$lang['update_err_pwg_version_differs_info'] = 'Version of create_listing_file.php on the remote site and PhpWebGallery must be the same'; +$lang['update_err_pwg_version_differs'] = 'Piwigo version differs on the remote site'; +$lang['update_err_pwg_version_differs_info'] = 'Version of create_listing_file.php on the remote site and Piwigo must be the same'; $lang['update_err_remote_listing_not_found'] = 'listing.xml file was not found'; $lang['update_err_remote_listing_not_found_info'] = 'listing.xml file was not found on the remote site. This file is generated by choosing the "generate listing" command in the Site manager'; $lang['update_error_list_title'] = 'Error list'; @@ -501,7 +497,7 @@ $lang['Returned images limit'] = 'Returned images limit'; $lang['Comment to identify your partner clearly'] = 'Comment to identify your partner clearly'; $lang['Add this access definition'] = 'Add this access definition'; $lang['Web Services availability duration in days'] = 'Web Services availability duration in days'; -$lang['Web Services under control'] = 'PhpWebGallery Web Services are fully operationals and all requests are under control.'; +$lang['Web Services under control'] = 'Piwigo Web Services are fully operationals and all requests are under control.'; $lang['special_admin_menu'] = 'Specials'; $lang['Duplicates'] = 'Files with same name in more than one physical category'; @@ -600,7 +596,6 @@ $lang['c13y_ignore_msg1'] = 'The anomaly will be ignored until next application $lang['c13y_ignore_msg2'] = 'Correction the anomaly will cancel the fact that it\'s ignored'; $lang['c13y_anomaly_ignored_count'] = '%d anomaly has been ignored.'; $lang['c13y_anomalies_ignored_count'] = '%d anomalies have been ignored.'; - $lang['plugins_need_update'] = 'Plugins which need upgrade'; $lang['plugins_dontneed_update'] = 'Plugins up to date'; $lang['plugins_cant_check'] = 'Plugin versions can\'t be checked'; @@ -627,7 +622,6 @@ $lang['plugins_archive_error'] = 'Can\'t read or extract archive.'; $lang['plugins_extract_error'] = 'An error occured during extraction (%s).'; $lang['plugins_check_chmod'] = 'Please check "plugins" folder and sub-folders permissions (CHMOD).'; $lang['plugins_server_error'] = 'Can\'t connect to server.'; - $lang['Purge compiled templates'] = 'Purge compiled templates'; $lang['Caddie is currently empty'] = 'Caddie is currently empty'; $lang['conf_upload_title'] = 'Upload'; @@ -639,11 +633,14 @@ $lang['ACCESS_2'] = 'Access to subscribed'; $lang['ACCESS_3'] = 'Access to administrators'; $lang['ACCESS_4'] = 'Access to webmasters'; $lang['ACCESS_5'] = 'No access'; - $lang['DEMO'] = 'Demo'; $lang['HOME'] = 'Piwigo home'; $lang['FORUM'] = 'Support'; $lang['BUGS'] = 'Bugs'; $lang['EXTENSIONS'] = 'Extensions'; $lang['WIKI / DOC'] = 'Documentation'; +$lang['A new version of Piwigo is available.'] = 'A new version of Piwigo is available.'; +$lang['Piwigo Administration'] = 'Piwigo Administration'; +$lang['Piwigo version'] = 'Piwigo version'; +$lang['You are running the latest version of Piwigo.'] = 'You are running the latest version of Piwigo.'; ?> diff --git a/language/en_UK/common.lang.php b/language/en_UK/common.lang.php index e8abb3d3a..0ff959fd6 100644 --- a/language/en_UK/common.lang.php +++ b/language/en_UK/common.lang.php @@ -97,7 +97,6 @@ $lang['Number of items'] = 'Number of items'; $lang['Original dimensions'] = 'Original dimensions'; $lang['Password forgotten'] = 'Password forgotten'; $lang['Password'] = 'Password'; -$lang['PhpWebGallery Help'] = 'PhpWebGallery Help'; $lang['Post date'] = 'Post date'; $lang['Posted on'] = 'Posted on'; $lang['Profile'] = 'Profile'; @@ -126,7 +125,7 @@ $lang['Username'] = 'Username'; $lang['Visits'] = 'Visits'; $lang['Webmaster'] = 'Webmaster'; $lang['Week %d'] = 'Week %d'; -$lang['about_page_title'] = 'About PhpWebGallery'; +$lang['about_page_title'] = 'About Piwigo'; $lang['access_forbiden'] = 'You are not authorized to access the requested page'; $lang['add to caddie'] = 'add to caddie'; $lang['add_favorites_hint'] = 'add this image to your favorites'; @@ -364,5 +363,6 @@ $lang['%d elements are also linked to current tags'] = '%d images are also linke $lang['See elements linked to this tag only'] = 'See images linked to this tag only'; $lang['elements posted during the last %d days'] = 'images posted during the last %d days'; $lang['Choose an image'] = 'Choose an image'; +$lang['Piwigo Help'] = 'Piwigo Help'; ?> diff --git a/language/en_UK/help.html b/language/en_UK/help.html index f8fd2bcb8..1ca5c5ca9 100644 --- a/language/en_UK/help.html +++ b/language/en_UK/help.html @@ -14,10 +14,10 @@ names "galleries". Set authorizations to 777 on directory "galleries/test_category". -
  • Connect to your PhpWebGallery as an admin.
    • +
  • Connect to your Piwigo as an admin.
  • Go to Administration, Pictures, - Thumbnails. PhpWebGallery find the picture from "test_category" + Thumbnails. Piwigo find the picture from "test_category" without thumbnails. Ask to create thumbnails.
  • Go to Administration, Categories, @@ -35,7 +35,7 @@ your gallery.
  • -

    Category directories are in the PhpWebGallery directory +

    Category directories are in the Piwigo directory "galleries". Here follow the directory tree of a very small gallery (but using many features) :

    @@ -76,12 +76,12 @@ your gallery.
  • Basically, a category is represented by a directory at any level in - PhpWebGallery directory "galleries". Each category can contain as many + Piwigo directory "galleries". Each category can contain as many sub-level as you wish. In the example above, category-1.1.1.1 is at level 4 of deepness.
  • Basically, an element is represented by a file. A file can be a - PhpWebGallery element if its extenstion is among file_ext + Piwigo element if its extenstion is among file_ext configuration parameter possibilities (see include/config_default.inc.php file). A file can be a picture if its extension is among picture_ext @@ -182,7 +182,7 @@ containing sub-categories.