[geeklog-cvs] geeklog: Merge with commentform
geeklog-cvs at lists.geeklog.net
geeklog-cvs at lists.geeklog.net
Wed Feb 29 11:59:44 EST 2012
changeset 8497:0e3d077bcafc
url: http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/0e3d077bcafc
user: Tom <websitemaster at cogeco.net>
date: Wed Feb 29 09:47:40 2012 -0500
description:
Merge with commentform
diffstat:
language/english.php | 4411 +++++----
language/english_utf-8.php | 5 +-
language/japanese_utf-8.php | 5 +-
public_html/admin/configuration_validation.php | 2 +
public_html/admin/install/config-install.php | 2 +
public_html/article.php | 14 +-
public_html/comment.php | 486 +-
public_html/docs/english/config.html | 8 +
public_html/docs/japanese/config.html | 8 +
public_html/layout/professional/comment/commentbar.thtml | 12 +-
public_html/layout/professional/comment/commentform.thtml | 21 +-
public_html/layout/professional/comment/commentform_advanced.thtml | 21 +-
public_html/layout/professional/comment/startcomment.thtml | 5 +-
public_html/layout/professional/comment/thread.thtml | 2 +-
public_html/layout/professional/style.css | 25 +
public_html/layout/professional_css/comment/commentbar.thtml | 12 +-
public_html/layout/professional_css/comment/commentform.thtml | 17 +-
public_html/layout/professional_css/comment/commentform_advanced.thtml | 15 +-
public_html/layout/professional_css/comment/startcomment.thtml | 11 +-
public_html/layout/professional_css/css/comment/comment.css | 94 +-
system/lib-comment.php | 1001 ++-
system/lib-story.php | 21 +-
22 files changed, 3307 insertions(+), 2891 deletions(-)
diffs (truncated from 7016 to 300 lines):
diff -r be6ece46e6ca -r 0e3d077bcafc language/english.php
--- a/language/english.php Wed Feb 22 15:39:42 2012 -0500
+++ b/language/english.php Wed Feb 29 09:47:40 2012 -0500
@@ -1,2204 +1,2207 @@
-<?php
-
-###############################################################################
-# english.php
-#
-# This is the English language file for Geeklog
-# Special thanks to Mischa Polivanov for his work on this project
-#
-# Copyright (C) 2000 Jason Whittenburg
-# jwhitten AT securitygeeks DOT com
-#
-# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-###############################################################################
-
-$LANG_CHARSET = 'iso-8859-1';
-
-###############################################################################
-# Array Format:
-# $LANGXX[YY]: $LANG - variable name
-# XX - file id number
-# YY - phrase id number
-###############################################################################
-
-###############################################################################
-# USER PHRASES - These are file phrases used in end user scripts
-###############################################################################
-
-###############################################################################
-# lib-common.php
-
-$LANG01 = array(
- 1 => 'Contributed by:',
- 2 => 'read more',
- 3 => 'comments',
- 4 => 'Edit',
- 5 => '',
- 6 => '',
- 7 => '',
- 8 => '',
- 9 => 'Admin Functions:',
- 10 => 'Submissions',
- 11 => 'Stories',
- 12 => 'Blocks',
- 13 => 'Topics',
- 14 => '',
- 15 => '',
- 16 => '',
- 17 => 'Users',
- 18 => 'SQL Query',
- 19 => 'Log Out',
- 20 => 'User Information:',
- 21 => 'Username',
- 22 => 'User ID',
- 23 => 'Security Level',
- 24 => 'Anonymous',
- 25 => 'Reply',
- 26 => 'The following comments are owned by whomever posted them. This site is not responsible for what they say.',
- 27 => 'Most Recent Post',
- 28 => 'Delete',
- 29 => 'No user comments.',
- 30 => 'Older Stories',
- 31 => 'Allowed HTML Tags:',
- 32 => 'Error, invalid username',
- 33 => 'Error, could not write to the log file',
- 34 => 'Error',
- 35 => 'Logout',
- 36 => 'on',
- 37 => 'No user stories',
- 38 => 'Content Syndication',
- 39 => 'Refresh',
- 40 => '',
- 41 => 'Guest Users',
- 42 => 'Authored by:',
- 43 => 'Reply to This',
- 44 => 'Parent',
- 45 => 'MySQL Error Number',
- 46 => 'MySQL Error Message',
- 47 => 'User Functions',
- 48 => 'My Account',
- 49 => 'Preferences',
- 50 => 'Error with SQL statement',
- 51 => 'help',
- 52 => 'New',
- 53 => 'Admin Home',
- 54 => 'Could not open the file.',
- 55 => 'Error at',
- 56 => 'Vote',
- 57 => 'Password',
- 58 => 'Login',
- 59 => "Don't have an account yet? Sign up as a <a href=\"{$_CONF['site_url']}/users.php?mode=new\" rel=\"nofollow\">New User</a>",
- 60 => 'Post a comment',
- 61 => 'Create New Account',
- 62 => 'words',
- 63 => 'Comment Preferences',
- 64 => 'Email Article To a Friend',
- 65 => 'View Printable Version',
- 66 => '',
- 67 => 'Welcome to ',
- 68 => 'Home',
- 69 => 'Contact',
- 70 => 'Search',
- 71 => 'Contribute',
- 72 => 'Web Resources',
- 73 => '',
- 74 => '',
- 75 => 'Advanced Search',
- 76 => 'Site Statistics',
- 77 => 'Plugins',
- 78 => '',
- 79 => 'What\'s New',
- 80 => 'stories in last',
- 81 => 'story in last',
- 82 => 'hours',
- 83 => 'Comments',
- 84 => '',
- 85 => 'last 48 hrs',
- 86 => 'No new comments',
- 87 => 'last 2 wks',
- 88 => '',
- 89 => '',
- 90 => 'Home',
- 91 => 'Created this page in',
- 92 => 'seconds',
- 93 => 'Copyright',
- 94 => 'All trademarks and copyrights on this page are owned by their respective owners.',
- 95 => 'Powered by',
- 96 => 'Groups',
- 97 => 'Word List',
- 98 => 'Plugins',
- 99 => 'Stories',
- 100 => 'No new stories',
- 101 => '',
- 102 => '',
- 103 => 'DB Backups',
- 104 => 'by',
- 105 => 'Mail Users',
- 106 => 'Views:',
- 107 => 'GL Version Test',
- 108 => 'Clear Cache',
- 109 => 'Report abuse',
- 110 => 'Report this post to the site admin',
- 111 => '',
- 112 => 'Registered Users',
- 113 => 'Documentation',
- 114 => 'Trackbacks',
- 115 => 'No new trackback comments',
- 116 => 'Trackback',
- 117 => 'Directory',
- 118 => 'Please continue reading on the next page:',
- 119 => "Lost your <a href=\"{$_CONF['site_url']}/users.php?mode=getpassword\" rel=\"nofollow\">password</a>?",
- 120 => 'Permanent link to this comment',
- 121 => 'Comments (%d)',
- 122 => 'Trackbacks (%d)',
- 123 => 'All HTML is allowed',
- 124 => 'Click to delete all checked items',
- 125 => 'Are you sure you want to Delete all checked items?',
- 126 => 'Select or de-select all items',
- 127 => 'Permalink',
- 128 => 'Login with OpenID:',
- 129 => 'Configuration',
- 130 => 'Webservices',
- 131 => 'No HTML is allowed',
- 132 => 'Information',
- 133 => 'Critical',
- 134 => 'Help',
- 135 => 'Warning',
- 136 => 'Warning: Javascript recommended for enhanced functionality',
- 137 => 'Warning: Javascript required to enable functionality',
- 138 => "Click <a href=\"{$_CONF['site_url']}/usersettings.php\" rel=\"nofollow\">here</a> to disable the advanced editor and use the default editor which does not require JavaScript",
- 139 => "Click <a href=\"{$_CONF['site_url']}/\" rel=\"nofollow\">here</a> to return to the homepage"
-);
-
-###############################################################################
-# comment.php
-
-$LANG03 = array(
- 1 => 'Post a Comment',
- 2 => 'Post Mode',
- 3 => 'Logout',
- 4 => 'Create Account',
- 5 => 'Username',
- 6 => 'This site requires you to be logged in to post a comment, please log in. If you do not have an account you can use the form below to create one.',
- 7 => 'Your last comment was ',
- 8 => " seconds ago. This site requires at least {$_CONF['commentspeedlimit']} seconds between comments",
- 9 => 'Comment',
- 10 => 'Send Report',
- 11 => 'Submit Comment',
- 12 => 'Please fill in the Title and Comment fields, as they are necessary for your submission of a comment.',
- 13 => 'Your Information',
- 14 => 'Preview',
- 15 => 'Report this post',
- 16 => 'Title',
- 17 => 'Error',
- 18 => 'Important Stuff',
- 19 => 'Please try to keep posts on topic.',
- 20 => 'Try to reply to other people comments instead of starting new threads.',
- 21 => 'Read other people\'s messages before posting your own to avoid simply duplicating what has already been said.',
- 22 => 'Use a clear subject that describes what your message is about.',
- 23 => 'Your email address will NOT be made public.',
- 24 => 'Anonymous User',
- 25 => 'Are you sure you want to report this post to the site admin?',
- 26 => '%s reported the following abusive comment post:',
- 27 => 'Abuse report',
- 28 => 'Preview Changes',
- 29 => 'Submit Changes',
- 30 => 'Edited on',
- 31 => 'by',
- 32 => 'Editing a Comment',
- 33 => 'Editing a Comment Submission',
- 34 => 'Preview Submission Changes',
- 35 => 'Save Changes to Queue',
- 36 => 'Notify me of new replies',
- 37 => 'New Comment Reply',
- 38 => "A reply has been made to your comment '%s'.",
- 39 => 'You may view the comment thread at the following address:',
- 40 => 'If you wish to receive no further notifications of replies, visit the following link:',
- 41 => 'Hello %s,',
- 42 => 'Unsubscribe',
- 43 => 'Unsubscribe from reply notifications',
- 44 => 'Your Name'
-);
-
-###############################################################################
-# usersettings.php
-
-$LANG04 = array(
- 1 => 'User Profile for',
- 2 => 'Username',
- 3 => 'Full Name',
- 4 => 'New Password',
- 5 => 'Email',
- 6 => 'Homepage',
- 7 => 'Bio',
- 8 => 'PGP Key',
- 9 => 'Save Information',
- 10 => 'Last 10 comments for user',
- 11 => 'No User Comments',
- 12 => 'User Preferences for',
- 13 => 'Email Nightly Digest',
- 14 => 'This password is generated by a randomizer. It is recommended that you change this password immediately. To change your password, log in and then click My Account from the User Functions menu.',
- 15 => "Your {$_CONF['site_name']} account has been created successfully. To be able to use it, you must login using the information below. Please save this mail for further reference.",
- 16 => 'Your Account Information',
- 17 => 'Account does not exist',
- 18 => 'The email address provided does not appear to be a valid email address',
- 19 => 'The username or email address provided already exists',
- 20 => 'The email address provided does not appear to be a valid email address',
- 21 => 'Error',
- 22 => "Register with {$_CONF['site_name']}!",
- 23 => "Creating a user account will give you all the benefits of {$_CONF['site_name']} membership and it will allow you to post comments and submit items as yourself. If you don't have an account, you will only be able to post anonymously. Please note that your email address will <b><i>never</i></b> be publicly displayed on this site.",
- 24 => 'Your password will be sent to the email address you enter.',
- 25 => 'Did You Forget Your Password?',
- 26 => 'Enter <em>either</em> your username <em>or</em> the email address you used to register and click Email Password. Instructions on how to set a new password will be mailed to the email address on record.',
- 27 => 'Register Now!',
- 28 => 'Email Password',
- 29 => 'logged out from',
- 30 => 'logged in from',
- 31 => 'The function you have selected requires you to be logged in',
- 32 => 'Signature',
- 33 => 'Never publicly displayed',
- 34 => 'This is your real name',
- 35 => 'Enter password to change it',
- 36 => 'Begins with http://',
- 37 => 'Applied to your comments',
- 38 => 'It\'s all about you! Everyone can read this',
- 39 => 'Your public PGP key to share',
- 40 => 'No Topic Icons',
- 41 => 'Willing to Moderate',
- 42 => 'Date Format',
- 43 => 'Maximum Stories',
- 44 => 'No boxes',
- 45 => 'Display Preferences for',
- 46 => 'Excluded Items for',
- 47 => 'News box Configuration for',
- 48 => 'Topics',
- 49 => 'No icons in stories',
- 50 => 'Uncheck this if you aren\'t interested',
- 51 => 'Just the news stories',
- 52 => 'The default is',
- 53 => 'Receive the days stories every night',
- 54 => 'Check the boxes for the topics and authors you don\'t want to see.',
- 55 => 'If you leave these all unchecked, it means you want the default selection of boxes. If you start selecting boxes, remember to set all of them that you want because the default selection will be ignored. Default entries are displayed in bold.',
- 56 => 'Authors',
- 57 => 'Display Mode',
More information about the geeklog-cvs
mailing list