Produced by Araxis Merge on Mon Jan 24 03:40:47 2005 UTC. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a reasonably standards compliant browser such as the latest version of Internet Explorer. For optimum results when printing this report, enable printing of background images and colours in your browser and use landscape orientation.
# | Location | File | Last Modified |
---|---|---|---|
1 | e:\tech\cvs\coppermine\stable-head\lang | english-1.15.php | Thu Sep 23 08:02:32 2004 UTC |
2 | e:\tech\cvs\coppermine\stable\lang | english-1.15.php | Mon Jan 24 03:31:46 2005 UTC |
Description | Between Files 1 and 2 |
|
---|---|---|
Blocks | Lines | |
Unchanged | 8 | 1273 |
Changed | 1 | 2 |
Inserted | 6 | 9 |
Removed | 0 | 0 |
Whitespace | All differences in whitespace within lines are ignored |
---|---|
Character case | Differences in character case are significant |
Line endings | Differences in line endings (CR and LF characters) are ignored |
CR/LF characters | Hidden in comparison detail |
No regular expressions were active.
1 | <?php | 1 | <?php | |||
2 | // ------------------------------------------------------------------------- // | 2 | // ------------------------------------------------------------------------- // | |||
3 | // Coppermine Photo Gallery 1.3.2 // | 3 | // Coppermine Photo Gallery 1.3.2 // | |||
4 | // ------------------------------------------------------------------------- // | 4 | // ------------------------------------------------------------------------- // | |||
(316 unchanged lines omitted) | ||||||
321 | 'delete' => 'Delete', | 321 | 'delete' => 'Delete', | |||
322 | 'new' => 'New', | 322 | 'new' => 'New', | |||
323 | 'apply_modifs' => 'Apply modifications', | 323 | 'apply_modifs' => 'Apply modifications', | |||
324 | 'select_category' => 'Select category', | 324 | 'select_category' => 'Select category', | |||
325 | 'to_create_album' => '<b>To create an album:</b> click \'New\'; edit name as needed; Click \'Apply\'', | |||||
325 | ); | 326 | ); | |||
326 | 327 | |||||
327 | // ------------------------------------------------------------------------- // | 328 | // ------------------------------------------------------------------------- // | |||
328 | // File catmgr.php | 329 | // File catmgr.php | |||
(50 unchanged lines omitted) | ||||||
379 | array('Target address for the \'See more pictures\' link in e-cards', 'ecards_more_pic_target', 0), | 380 | array('Target address for the \'See more pictures\' link in e-cards', 'ecards_more_pic_target', 0), | |||
380 | array('Gallery is offline', 'offline', 1), //cpg1.3.0 | 381 | array('Gallery is offline', 'offline', 1), //cpg1.3.0 | |||
381 | array('Log ecards', 'log_ecards', 1), //cpg1.3.0 | 382 | array('Log ecards', 'log_ecards', 1), //cpg1.3.0 | |||
382 | array('Allow ZIP-download of favorites', 'enable_zipdownload', 1), //cpg1.3.0 | 383 | array('Allow ZIP-download of favorites', 'enable_zipdownload', 1), //cpg1.3.0 | |||
384 | array('SAFE_MODE: URI for mkdir cgi', 'safe_mode_mkdir', 0), | |||||
385 | array('SAFE_MODE: Host coppermine path (SCRIPT_FILENAME path in Apache)', 'safe_mode_cpg_path',0), | |||||
383 | 386 | |||||
384 | 'Language, Themes & Charset settings', | 387 | 'Language, Themes & Charset settings', | |||
385 | array('Language', 'lang', 5), | 388 | array('Language', 'lang', 5), | |||
386 | array('Theme', 'theme', 6), | 389 | array('Theme', 'theme', 6), | |||
(28 unchanged lines omitted) | ||||||
415 | 418 | |||||
416 | 'Image view & Comment settings', | 419 | 'Image view & Comment settings', | |||
417 | array('Width of the table for file display (pixels or %)', 'picture_table_width', 0), //cpg1.3.0 | 420 | array('Width of the table for file display (pixels or %)', 'picture_table_width', 0), //cpg1.3.0 | |||
418 | array('File information is visible by default', 'display_pic_info', 1), //cpg1.3.0 | 421 | array('File information is visible by default', 'display_pic_info', 1), //cpg1.3.0 | |||
422 | array('Show file upload username to users', 'show_upload_user', 1), | |||||
419 | array('Filter bad words in comments', 'filter_bad_words', 1), | 423 | array('Filter bad words in comments', 'filter_bad_words', 1), | |||
420 | array('Allow smiles in comments', 'enable_smilies', 1), | 424 | array('Allow smiles in comments', 'enable_smilies', 1), | |||
421 | array('Allow several consecutive comments on one file from the same user (disable flood protection)', 'disable_comment_flood_protect', 1), //cpg1.3.0 | 425 | array('Allow several consecutive comments on one file from the same user (disable flood protection)', 'disable_comment_flood_protect', 1), //cpg1.3.0 | |||
422 | array('Max length for an image description', 'max_img_desc_length', 0), | 426 | array('Max length for an image description', 'max_img_desc_length', 0), | |||
(26 unchanged lines omitted) | ||||||
449 | array('Path to ImageMagick \'convert\' utility (example /usr/bin/X11/)', 'impath', 0), //cpg1.3.0 | 453 | array('Path to ImageMagick \'convert\' utility (example /usr/bin/X11/)', 'impath', 0), //cpg1.3.0 | |||
450 | //array('Allowed image types (only valid for ImageMagick)', 'allowed_img_types',0), //cpg1.3.0 | 454 | //array('Allowed image types (only valid for ImageMagick)', 'allowed_img_types',0), //cpg1.3.0 | |||
451 | array('Command line options for ImageMagick', 'im_options', 0), //cpg1.3.0 | 455 | array('Command line options for ImageMagick', 'im_options', 0), //cpg1.3.0 | |||
452 | array('Read EXIF data in JPEG files', 'read_exif_data', 1), //cpg1.3.0 | 456 | array('Read EXIF data in JPEG files', 'read_exif_data', 1), //cpg1.3.0 | |||
457 | array('EXIF tags to ignore #1', 'exif_ignore1', 0), | |||||
458 | array('EXIF tags to ignore #2', 'exif_ignore2', 0), | |||||
459 | array('EXIF tags to ignore #3', 'exif_ignore3', 0), | |||||
453 | array('Read IPTC data in JPEG files', 'read_iptc_data', 1), //cpg1.3.0 | 460 | array('Read IPTC data in JPEG files', 'read_iptc_data', 1), //cpg1.3.0 | |||
454 | array('The album directory <a href="#notice1" class="clickable_option">*</a>', 'fullpath', 0), //cpg1.3.0 | 461 | array('The album directory <a href="#notice1" class="clickable_option">*</a>', 'fullpath', 0), //cpg1.3.0 | |||
455 | array('The directory for user files <a href="#notice1" class="clickable_option">*</a>', 'userpics', 0), //cpg1.3.0 | 462 | array('The directory for user files <a href="#notice1" class="clickable_option">*</a>', 'userpics', 0), //cpg1.3.0 | |||
456 | array('The prefix for intermediate pictures <a href="#notice1" class="clickable_option">*</a>', 'normal_pfx', 0), //cpg1.3.0 | 463 | array('The prefix for intermediate pictures <a href="#notice1" class="clickable_option">*</a>', 'normal_pfx', 0), //cpg1.3.0 | |||
(22 unchanged lines omitted) | ||||||
479 | 486 | |||||
480 | 'Miscellaneous settings', | 487 | 'Miscellaneous settings', | |||
481 | array('Enable debug mode', 'debug_mode', 9), //cpg1.3.0 | 488 | array('Enable debug mode', 'debug_mode', 9), //cpg1.3.0 | |||
482 | array('Display notices in debug mode', 'debug_notice', 1), //cpg1.3.0 | 489 | array('Display notices in debug mode', 'debug_notice', 1), //cpg1.3.0 | |||
490 | array('Confirm when entering/leaving admin mode', 'admin_confirm', 1), | |||||
483 | 491 | |||||
484 | '<br /><div align="left"><a name="notice1"></a>(*) This settings mustn\'t be changed if you already have files in your database.<br /> | 492 | '<br /><div align="left"><a name="notice1"></a>(*) This settings mustn\'t be changed if you already have files in your database.<br /> | |||
485 | <a name="notice2"></a>(**) When changing this setting, only the files that are added from that point on are affected, so it is advisable that this setting must not be changed if there are already files in the gallery. You can, however, apply the changes to the existing files with the "<a href="util.php">admin tools</a> (resize pictures)" utility from the admin menu.</div><br />', //cpg1.3.0 | 493 | <a name="notice2"></a>(**) When changing this setting, only the files that are added from that point on are affected, so it is advisable that this setting must not be changed if there are already files in the gallery. You can, however, apply the changes to the existing files with the "<a href="util.php">admin tools</a> (resize pictures)" utility from the admin menu.</div><br />', //cpg1.3.0 | |||
486 | ); | 494 | ); | |||
(534 unchanged lines omitted) | ||||||
1021 | 1029 | |||||
1022 | if (defined('SEARCHNEW_PHP')) $lang_search_new_php = array( | 1030 | if (defined('SEARCHNEW_PHP')) $lang_search_new_php = array( | |||
1023 | 'page_title' => 'Search new files', //cpg1.3.0 | 1031 | 'page_title' => 'Search new files', //cpg1.3.0 | |||
1024 | 'select_dir' => 'Select directory', | 1032 | 'select_dir' => 'Select directory', | |||
1025 | 'select_dir_msg' => 'This function allows you to add a batch of file that you r have uploaded to your server by FTP.<br /><br />Select the directory where you have uploaded your files ', //cpg1.3.0 | 1033 | 'select_dir_msg' => 'This function allows you to add a batch of file s that you have uploaded to your server by FTP.<br /><br />Select the directory where you have uploaded your files (must be in the albums folder, but NOT in the user folder) ', //cpg1.3.0 | |||
1026 | 'no_pic_to_add' => 'There is no file to add', //cpg1.3.0 | 1034 | 'no_pic_to_add' => 'There is no file to add', //cpg1.3.0 | |||
1027 | 'need_one_album' => 'You need at least one album to use this function', | 1035 | 'need_one_album' => 'You need at least one album to use this function', | |||
1028 | 'warning' => 'Warning', | 1036 | 'warning' => 'Warning', | |||
1029 | 'change_perm' => 'the script can\'t write in this directory, you need to change its mode to 755 or 777 before trying to add the files !', //cpg1.3.0 | 1037 | 'change_perm' => 'the script can\'t write in this directory, you need to change its mode to 755 or 777 before trying to add the files !', //cpg1.3.0 | |||
(238 unchanged lines omitted) | ||||||
1268 | 'nonexist' => 'attached to non existant file # ', //cpg1.3.0 | 1276 | 'nonexist' => 'attached to non existant file # ', //cpg1.3.0 | |||
1269 | 'phpinfo' => 'Display phpinfo', //cpg1.3.0 | 1277 | 'phpinfo' => 'Display phpinfo', //cpg1.3.0 | |||
1270 | 'update_db' => 'Update database', //cpg1.3.0 | 1278 | 'update_db' => 'Update database', //cpg1.3.0 | |||
1271 | 'update_db_explanation' => 'If you have replaced coppermine files, added a modification or upgraded from a previous version of coppermine, make sure to run the database update once. This will create the necessary tables and/or config values in your coppermine database.', //cpg1.3.0 | 1279 | 'update_db_explanation' => 'If you have replaced coppermine files, added a modification or upgraded from a previous version of coppermine, make sure to run the database update once. This will create the necessary tables and/or config values in your coppermine database.', //cpg1.3.0 | |||
1280 | 'process_all_albums' => 'Process ALL albums', | |||||
1272 | ); | 1281 | ); | |||
1273 | 1282 | |||||
1274 | ?> | 1283 | ?> |
Araxis Merge (but not this generated report) is Copyright © 1993-2003 Araxis Ltd (www.araxis.com). All rights reserved.