[geeklog-hg] geeklog: Removed tab character and unnecessary space character
geeklog-cvs at lists.geeklog.net
geeklog-cvs at lists.geeklog.net
Sat May 9 06:25:21 EDT 2015
changeset 9599:f4b58f8009a5
url: http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/f4b58f8009a5
user: dengen <taharaxp at gmail.com>
date: Sat May 09 19:24:44 2015 +0900
description:
Removed tab character and unnecessary space character
diffstat:
language/english.php | 98 +-
language/english_utf-8.php | 98 +-
language/norwegian.php | 14 +-
language/norwegian_utf-8.php | 14 +-
plugins/calendar/autoinstall.php | 10 +-
plugins/calendar/buildpackage.php | 4 +-
plugins/calendar/functions.inc | 42 +-
plugins/calendar/install_defaults.php | 24 +-
plugins/calendar/install_updates.php | 34 +-
plugins/calendar/language/english.php | 16 +-
plugins/calendar/language/english_utf-8.php | 16 +-
plugins/calendar/sql/mssql_install.php | 4 +-
plugins/calendar/sql/mssql_updates.php | 26 +-
plugins/calendar/sql/mysql_updates.php | 28 +-
plugins/calendar/sql/pgsql_updates.php | 30 +-
plugins/calendar/templates/default/admin/eventeditor.thtml | 8 +-
plugins/links/autoinstall.php | 4 +-
plugins/links/buildpackage.php | 2 +-
plugins/links/functions.inc | 64 +-
plugins/links/install_defaults.php | 8 +-
plugins/links/install_updates.php | 14 +-
plugins/links/language/english.php | 6 +-
plugins/links/language/english_utf-8.php | 6 +-
plugins/links/sql/mssql_updates.php | 16 +-
plugins/links/sql/mysql_updates.php | 16 +-
plugins/links/sql/pgsql_updates.php | 14 +-
plugins/links/templates/default/admin/categoryeditor.thtml | 4 +-
plugins/polls/autoinstall.php | 10 +-
plugins/polls/buildpackage.php | 2 +-
plugins/polls/configuration_validation.php | 2 +-
plugins/polls/functions.inc | 150 +-
plugins/polls/install_defaults.php | 38 +-
plugins/polls/install_updates.php | 40 +-
plugins/polls/language/english.php | 18 +-
plugins/polls/language/english_utf-8.php | 18 +-
plugins/polls/sql/mssql_install.php | 2 +-
plugins/polls/sql/mssql_updates.php | 50 +-
plugins/polls/sql/mysql_install.php | 2 +-
plugins/polls/sql/mysql_updates.php | 50 +-
plugins/polls/sql/pgsql_updates.php | 32 +-
plugins/polls/templates/default/pollvotes_bar.thtml | 6 +-
plugins/polls/templates/default/pollvotes_num.thtml | 6 +-
plugins/spamx/BaseAdmin.class.php | 4 +-
plugins/spamx/BaseCommand.class.php | 8 +-
plugins/spamx/BlackList.Examine.class.php | 10 +-
plugins/spamx/DeleteComment.Action.class.php | 10 +-
plugins/spamx/Header.Examine.class.php | 4 +-
plugins/spamx/IP.Examine.class.php | 2 +-
plugins/spamx/IPofUrl.Examine.class.php | 2 +-
plugins/spamx/MailAdmin.Action.class.php | 10 +-
plugins/spamx/SFS.Examine.class.php | 2 +-
plugins/spamx/SFS.Misc.class.php | 34 +-
plugins/spamx/SFSbase.class.php | 32 +-
plugins/spamx/SFSreport.Action.class.php | 4 +-
plugins/spamx/SLVbase.class.php | 2 +-
plugins/spamx/SNL.Examine.class.php | 2 +-
plugins/spamx/SNLbase.class.php | 2 +-
plugins/spamx/SNLreport.Action.class.php | 4 +-
plugins/spamx/autoinstall.php | 2 +-
plugins/spamx/buildpackage.php | 2 +-
plugins/spamx/functions.inc | 48 +-
plugins/spamx/install_defaults.php | 18 +-
plugins/spamx/install_updates.php | 14 +-
plugins/spamx/language/english.php | 38 +-
plugins/spamx/language/english_utf-8.php | 36 +-
plugins/spamx/sql/mssql_install.php | 2 +-
plugins/spamx/sql/mssql_updates.php | 8 +-
plugins/spamx/sql/mysql_updates.php | 2 +-
plugins/spamx/sql/pgsql_updates.php | 4 +-
plugins/staticpages/autoinstall.php | 6 +-
plugins/staticpages/buildpackage.php | 2 +-
plugins/staticpages/configuration_validation.php | 8 +-
plugins/staticpages/functions.inc | 116 +-
plugins/staticpages/install_defaults.php | 22 +-
plugins/staticpages/install_updates.php | 24 +-
plugins/staticpages/language/english.php | 18 +-
plugins/staticpages/language/english_utf-8.php | 18 +-
plugins/staticpages/services.inc.php | 134 +-
plugins/staticpages/sql/mssql_install.php | 10 +-
plugins/staticpages/sql/mssql_updates.php | 32 +-
plugins/staticpages/sql/mysql_install.php | 2 +-
plugins/staticpages/sql/mysql_updates.php | 32 +-
plugins/staticpages/sql/pgsql_updates.php | 20 +-
plugins/staticpages/templates/default/admin/editor.thtml | 6 +-
plugins/staticpages/templates/default/admin/editor_advanced.thtml | 6 +-
plugins/staticpages/templates/default/spcomments.thtml | 2 +-
plugins/xmlsitemap/functions.inc | 8 +-
plugins/xmlsitemap/install_defaults.php | 2 +-
plugins/xmlsitemap/install_updates.php | 4 +-
plugins/xmlsitemap/language/english.php | 4 +-
plugins/xmlsitemap/language/english_utf-8.php | 2 +-
plugins/xmlsitemap/sql/mssql_updates.php | 6 +-
plugins/xmlsitemap/sql/mysql_updates.php | 4 +-
plugins/xmlsitemap/sql/pgsql_updates.php | 4 +-
plugins/xmlsitemap/xmlsitemap.class.php | 14 +-
public_html/admin/block.php | 96 +-
public_html/admin/clearctl.php | 2 +-
public_html/admin/configuration.php | 142 +-
public_html/admin/configuration_validation.php | 54 +-
public_html/admin/envcheck.php | 98 +-
public_html/admin/group.php | 2 +-
public_html/admin/install/bigdump.php | 48 +-
public_html/admin/install/config-install.php | 40 +-
public_html/admin/install/help.php | 6 +-
public_html/admin/install/index.php | 70 +-
public_html/admin/install/install-plugins.php | 50 +-
public_html/admin/install/language/english.php | 4 +-
public_html/admin/install/layout/style.css | 96 +-
public_html/admin/install/lib-install.php | 56 +-
public_html/admin/install/lib-upgrade.php | 14 +-
public_html/admin/install/migrate.php | 98 +-
public_html/admin/install/rescue.php | 30 +-
public_html/admin/install/success.php | 4 +-
public_html/admin/logviewer.php | 2 +-
public_html/admin/moderation.php | 30 +-
public_html/admin/plugins.php | 22 +-
public_html/admin/plugins/calendar/index.php | 4 +-
public_html/admin/plugins/links/category.php | 4 +-
public_html/admin/plugins/links/index.php | 4 +-
public_html/admin/plugins/polls/index.php | 28 +-
public_html/admin/plugins/staticpages/index.php | 48 +-
public_html/admin/story.php | 38 +-
public_html/admin/syndication.php | 30 +-
public_html/admin/topic.php | 122 +-
public_html/admin/user.php | 8 +-
public_html/article.php | 10 +-
public_html/calendar/index.php | 8 +-
public_html/directory.php | 22 +-
public_html/docs/english/config.html | 12 +-
public_html/docs/english/install.html | 38 +-
public_html/docs/japanese/config.html | 76 +-
public_html/docs/japanese/history.html | 3532 +++++-----
public_html/docs/japanese/install.html | 30 +-
public_html/getimage.php | 2 +-
public_html/help/advancedsearch.html | 18 +-
public_html/help/cccommentsubmission.html | 2 +-
public_html/help/ccdraftsubmission.html | 2 +-
public_html/help/cceventsubmission.html | 2 +-
public_html/help/cclinksubmission.html | 2 +-
public_html/help/ccstorysubmission.html | 4 +-
public_html/help/ccusersubmission.html | 2 +-
public_html/help/submitevent.html | 4 +-
public_html/help/submitlink.html | 4 +-
public_html/help/submitstory.html | 4 +-
public_html/index.php | 68 +-
public_html/javascript/admin.configuration.js | 180 +-
public_html/javascript/admin.topic.js | 2 +-
public_html/javascript/common.js | 2 +-
public_html/javascript/moveusers.js | 22 +-
public_html/javascript/profile_editor.js | 12 +-
public_html/javascript/title_2_id.js | 34 +-
public_html/layout/denim/admin/block/blockeditor.thtml | 4 +-
public_html/layout/denim/admin/mail/mailform.thtml | 2 +-
public_html/layout/denim/admin/story/storyeditor.thtml | 4 +-
public_html/layout/denim/admin/story/storyeditor_advanced.thtml | 8 +-
public_html/layout/denim/admin/syndication/feededitor.thtml | 2 +-
public_html/layout/denim/admin/topic/topiceditor.thtml | 2 +-
public_html/layout/denim/blockfooter.thtml | 1 -
public_html/layout/denim/breadcrumbs.thtml | 16 +-
public_html/layout/denim/comment/commentform.thtml | 6 +-
public_html/layout/denim/comment/commentform_advanced.thtml | 14 +-
public_html/layout/denim/css_ltr/print.css | 4 +-
public_html/layout/denim/css_rtl/print.css | 4 +-
public_html/layout/denim/javascript/script.js | 50 +-
public_html/layout/denim/loginform_oauth.thtml | 2 +-
public_html/layout/denim/noscript.thtml | 8 +-
public_html/layout/denim/submit/submitstory_advanced.thtml | 14 +-
public_html/layout/modern_curve/README | 4 +-
public_html/layout/modern_curve/admin/block/blockeditor.thtml | 4 +-
public_html/layout/modern_curve/admin/config/configuration.thtml | 20 +-
public_html/layout/modern_curve/admin/group/groupeditor.thtml | 2 +-
public_html/layout/modern_curve/admin/lists/searchmenu.thtml | 4 +-
public_html/layout/modern_curve/admin/mail/mailform.thtml | 2 +-
public_html/layout/modern_curve/admin/story/storyeditor.thtml | 4 +-
public_html/layout/modern_curve/admin/story/storyeditor_advanced.thtml | 6 +-
public_html/layout/modern_curve/admin/syndication/feededitor.thtml | 2 +-
public_html/layout/modern_curve/admin/topic/topiceditor.thtml | 8 +-
public_html/layout/modern_curve/admin/user/password.thtml | 8 +-
public_html/layout/modern_curve/blockfooter.thtml | 1 -
public_html/layout/modern_curve/breadcrumbs.thtml | 16 +-
public_html/layout/modern_curve/comment/commentbar.thtml | 2 +-
public_html/layout/modern_curve/comment/commentform.thtml | 8 +-
public_html/layout/modern_curve/comment/commentform_advanced.thtml | 16 +-
public_html/layout/modern_curve/footer.thtml | 6 +-
public_html/layout/modern_curve/functions.php | 24 +-
public_html/layout/modern_curve/javascript/fix_html.js | 2 +-
public_html/layout/modern_curve/loginform_oauth.thtml | 2 +-
public_html/layout/modern_curve/noscript.thtml | 8 +-
public_html/layout/modern_curve/preferences/current_password.thtml | 8 +-
public_html/layout/modern_curve/preferences/password.thtml | 4 +-
public_html/layout/modern_curve/preferences/profile.thtml | 4 +-
public_html/layout/modern_curve/style.css.php | 22 +-
public_html/layout/modern_curve/submit/submitstory_advanced.thtml | 14 +-
public_html/layout/modern_curve/users/email.thtml | 2 +-
public_html/layout/modern_curve/users/loginform.thtml | 2 +-
public_html/layout/modern_curve/users/registrationform.thtml | 2 +-
public_html/layout/professional/README | 2 +-
public_html/layout/professional/admin/block/blockeditor.thtml | 10 +-
public_html/layout/professional/admin/config/configuration.thtml | 20 +-
public_html/layout/professional/admin/story/storyeditor.thtml | 8 +-
public_html/layout/professional/admin/story/storyeditor_advanced.thtml | 4 +-
public_html/layout/professional/admin/topic/topiceditor.thtml | 16 +-
public_html/layout/professional/archivestorytext.thtml | 4 +-
public_html/layout/professional/breadcrumbs.thtml | 16 +-
public_html/layout/professional/comment/commentform.thtml | 6 +-
public_html/layout/professional/comment/commentform_advanced.thtml | 6 +-
public_html/layout/professional/featuredstorytext.thtml | 4 +-
public_html/layout/professional/functions.php | 4 +-
public_html/layout/professional/noscript.thtml | 8 +-
public_html/layout/professional/preferences/profile.thtml | 2 +-
public_html/layout/professional/search/resultrowenhanced.thtml | 2 +-
public_html/layout/professional/storytext.thtml | 4 +-
public_html/layout/professional/users/services.thtml | 2 +-
public_html/layout/professional_css/README | 4 +-
public_html/layout/professional_css/admin/block/blockeditor.thtml | 4 +-
public_html/layout/professional_css/admin/config/configuration.thtml | 20 +-
public_html/layout/professional_css/admin/group/groupeditor.thtml | 2 +-
public_html/layout/professional_css/admin/lists/searchmenu.thtml | 4 +-
public_html/layout/professional_css/admin/mail/mailform.thtml | 2 +-
public_html/layout/professional_css/admin/story/storyeditor.thtml | 4 +-
public_html/layout/professional_css/admin/story/storyeditor_advanced.thtml | 6 +-
public_html/layout/professional_css/admin/syndication/feededitor.thtml | 2 +-
public_html/layout/professional_css/admin/topic/topiceditor.thtml | 8 +-
public_html/layout/professional_css/blockfooter.thtml | 1 -
public_html/layout/professional_css/breadcrumbs.thtml | 16 +-
public_html/layout/professional_css/comment/commentbar.thtml | 2 +-
public_html/layout/professional_css/comment/commentform.thtml | 6 +-
public_html/layout/professional_css/comment/commentform_advanced.thtml | 16 +-
public_html/layout/professional_css/footer.thtml | 4 +-
public_html/layout/professional_css/functions.php | 10 +-
public_html/layout/professional_css/javascript/fix_html.js | 2 +-
public_html/layout/professional_css/noscript.thtml | 6 +-
public_html/layout/professional_css/preferences/profile.thtml | 4 +-
public_html/layout/professional_css/submit/submitstory_advanced.thtml | 14 +-
public_html/layout/professional_css/users/loginform.thtml | 4 +-
public_html/layout/professional_css/users/registrationform.thtml | 2 +-
public_html/lib-common.php | 364 +-
public_html/links/index.php | 6 +-
public_html/links/portal.php | 10 +-
public_html/pingback.php | 4 +-
public_html/polls/index.php | 2 +-
public_html/profiles.php | 4 +-
public_html/staticpages/index.php | 8 +-
public_html/stats.php | 36 +-
public_html/submit.php | 18 +-
public_html/trackback.php | 10 +-
public_html/users.php | 6 +-
public_html/usersettings.php | 58 +-
readme | 18 +-
sql/mssql_tableanddata.php | 10 +-
sql/mysql_tableanddata.php | 4 +-
sql/pgsql_tableanddata.php | 10 +-
sql/updates/0.4_to_0.5.sql | 2 +-
sql/updates/1.2.5-1_to_1.3.sql | 4 +-
sql/updates/mssql_1.4.1_to_1.5.0.php | 6 +-
sql/updates/mssql_1.6.0_to_1.6.1.php | 4 +-
sql/updates/mssql_1.7.2_to_1.8.0.php | 38 +-
sql/updates/mssql_1.8.2_to_2.0.0.php | 40 +-
sql/updates/mssql_2.0.0_to_2.1.0.php | 54 +-
sql/updates/mysql_1.3.11_to_1.4.0.php | 12 +-
sql/updates/mysql_1.3_to_1.3.1.php | 2 +-
sql/updates/mysql_1.5.2_to_1.6.0.php | 2 +-
sql/updates/mysql_1.6.0_to_1.6.1.php | 4 +-
sql/updates/mysql_1.7.2_to_1.8.0.php | 52 +-
sql/updates/mysql_1.8.2_to_2.0.0.php | 36 +-
sql/updates/mysql_2.0.0_to_2.1.0.php | 44 +-
sql/updates/pgsql_1.7.2_to_1.8.0.php | 36 +-
sql/updates/pgsql_1.8.2_to_2.0.0.php | 38 +-
sql/updates/pgsql_2.0.0_to_2.1.0.php | 52 +-
system/build/build-geeklog-packagexmls.php | 20 +-
system/build/build-geeklog-pear-packages.php | 14 +-
system/build/buildpackage-end.php | 16 +-
system/build/buildpackage-theme-professional.php | 14 +-
system/build/buildpackage.php | 36 +-
system/classes/authentication/LDAP.auth.class.php | 4 +-
system/classes/authentication/LiveJournal.auth.class.php | 2 +-
system/classes/calendar.class.php | 36 +-
system/classes/config.class.php | 316 +-
system/classes/downloader.class.php | 12 +-
system/classes/gltext.class.php | 2 +-
system/classes/metatags.class.php | 30 +-
system/classes/navbar.class.php | 22 +-
system/classes/oauthhelper.class.php | 108 +-
system/classes/openidhelper.class.php | 2 +-
system/classes/plugin.class.php | 18 +-
system/classes/scripts.class.php | 210 +-
system/classes/search.class.php | 18 +-
system/classes/searchcriteria.class.php | 4 +-
system/classes/story.class.php | 14 +-
system/classes/syndication/rss.feed.class.php | 18 +-
system/classes/template.class.php | 36 +-
system/classes/timer.class.php | 10 +-
system/classes/timezoneconfig.class.php | 4 +-
system/classes/unpacker.class.php | 102 +-
system/classes/url.class.php | 30 +-
system/classes/validator.class.php | 828 +-
system/databases/mssql.class.php | 250 +-
system/databases/mysql.class.php | 10 +-
system/databases/mysqli.class.php | 4 +-
system/databases/pgsql.class.php | 2 +-
system/lib-admin.php | 28 +-
system/lib-block.php | 10 +-
system/lib-comment.php | 246 +-
system/lib-database.php | 2 +-
system/lib-mbyte.php | 12 +-
system/lib-plugins.php | 62 +-
system/lib-security.php | 80 +-
system/lib-story.php | 290 +-
system/lib-syndication.php | 32 +-
system/lib-template.php | 196 +-
system/lib-topic.php | 574 +-
system/lib-trackback.php | 4 +-
system/lib-user.php | 50 +-
system/lib-webservices.php | 10 +-
314 files changed, 6295 insertions(+), 6298 deletions(-)
diffs (truncated from 30155 to 300 lines):
diff -r 2001242b306d -r f4b58f8009a5 language/english.php
--- a/language/english.php Sat May 09 13:41:59 2015 +0900
+++ b/language/english.php Sat May 09 19:24:44 2015 +0900
@@ -406,11 +406,11 @@
162 => 'will not be scaled',
163 => 'Re-Authentication Failed',
164 => 'You have exceeded the number of allowed attempts for re-authentication. The operation has been aborted and your recent changes were lost, sorry.',
- 165 => 'Use Advanced Editor',
+ 165 => 'Use Advanced Editor',
166 => 'Re-synch Remote Account',
167 => 'Remote login',
168 => 'You may also login with one of the remote authentication services below.',
- 'user_login' => 'User Login',
+ 'user_login' => 'User Login',
'user_login_message' => 'Please login below. You must enter both a username and password.',
'user_logged_in_message' => "You are already logged in. Whould you like to <a href=\"{$_CONF['site_url']}/users.php?mode=logout\" rel=\"nofollow\">logout</a>?"
);
@@ -485,7 +485,7 @@
37 => 'Send me a copy of this email',
38 => "This is a copy of the email that you sent to %s from <{$_CONF['site_url']}>:",
39 => 'Your last message was ',
- 40 => " seconds ago. This site requires at least {$_CONF['speedlimit']} seconds between sending messages"
+ 40 => " seconds ago. This site requires at least {$_CONF['speedlimit']} seconds between sending messages"
);
###############################################################################
@@ -747,7 +747,7 @@
'location' => 'Location',
'status' => 'Status',
'item' => 'Item',
-
+
/* Left incase we decided to use jhead and/or jpegtran Program in future */
'jhead' => 'jhead Program',
'jhead_not_found' => 'Unable to locate the jhead executable.',
@@ -755,7 +755,7 @@
'jpegtran' => 'jpegtran Program',
'jpegtran_not_found' => 'Unable to locate the jpegtran executable.',
'jpegtran_ok' => 'The jpegtran executable is installed.',
-
+
'showhide_phpinfo' => 'Show/Hide Full PHP Info',
'view_online' => 'Click here %s to view online',
'no_new_items' => 'No New Items',
@@ -986,24 +986,24 @@
27 => 'Or Upload Topic Icon',
28 => 'Maximum',
29 => 'File Upload Errors',
- 30 => 'Stories in Topic',
+ 30 => 'Stories in Topic',
31 => 'You have used a restricted Topic ID. Please choose another one.',
32 => 'Parent Topic',
33 => 'Inherit',
34 => 'Parent topic inherits all inheritable items',
- 35 => 'Hidden',
+ 35 => 'Hidden',
36 => 'Topic will be hidden in the Topic Block until it\'s parent topic is selected',
37 => 'Root',
38 => 'All',
- 39 => 'Homepage Only',
+ 39 => 'Homepage Only',
40 => 'Assign one or more topics. ',
- 41 => 'If "All" is selected then the item will appear for all topics. If "Homepage Only" is selected then item will appear just on the homepage. Else you must select at least one topic to assign the item to. ',
+ 41 => 'If "All" is selected then the item will appear for all topics. If "Homepage Only" is selected then item will appear just on the homepage. Else you must select at least one topic to assign the item to. ',
42 => 'Inherit contains the list of assigned topics. If the topic is selected then the item will be inherited by the parent topic. ',
- 43 => 'Default contains the list of assigned topics. This is the default topic that will be used when displaying the item if the actual topic the user is in is not found. ',
+ 43 => 'Default contains the list of assigned topics. This is the default topic that will be used when displaying the item if the actual topic the user is in is not found. ',
44 => 'Inherit',
45 => 'Default',
46 => 'Your parent topic cannot be the Archive topic. Please choose a different Parent Topic.',
- 47 => 'An Archive Topic cannot have any child topics. Please remove any child topics before making a topic the Archive Topic.',
+ 47 => 'An Archive Topic cannot have any child topics. Please remove any child topics before making a topic the Archive Topic.',
48 => 'Parent Topic Id not found.',
49 => 'This Topic ID is already being used. Please choose another one.',
50 => 'Yes',
@@ -1012,12 +1012,12 @@
53 => 'Image',
54 => 'Selected',
55 => 'Assigned',
- 'breadcrumb_separator' => '>',
+ 'breadcrumb_separator' => '>',
'breadcrumb_root' => 'Home',
'autotag_desc_topic' => '[topic:id alternate title] - Displays a link to a topic using the ID as the title. An alternate title may be specified but is not required.',
'autotag_desc_related_topics' => '[related_topics:id type:plugin max:max_items_listed] - Creates a clickable horizontal list of related topics based on the item id and type.',
'autotag_desc_related_items' => '[related_items:id type:plugin max:max_items_listed trim:max_length include:plugin] - Create a clickable list of related items based on the item id and type.',
- 'no_related_items' => 'No related items found.',
+ 'no_related_items' => 'No related items found.',
'topics:' => 'Topics:',
'filed_under:' => 'Filed under:'
);
@@ -1116,7 +1116,7 @@
88 => 'Default Group',
89 => 'Check to make this a default group for new users',
90 => 'Apply "Default Group" change to existing user accounts',
- 'autotag_desc_user' => '[user: name alternate title] - Displays a link to a User using the Username as the title. An alternate title may be specified but is not required.'
+ 'autotag_desc_user' => '[user: name alternate title] - Displays a link to a User using the Username as the title. An alternate title may be specified but is not required.'
);
###############################################################################
@@ -1584,7 +1584,7 @@
$LANG_404 = array(
1 => '404 Error',
2 => '<p>Gee, I\'ve looked everywhere but I can not find:</p><p><b>%s</b></p>',
- 3 => "<p>We're sorry, but the page you have requested does not exist. Please feel free to check the <a href=\"{$_CONF['site_url']}/\">main page</a> or the <a href=\"{$_CONF['site_url']}/search.php\">search page</a> to see if you can find what you lost.",
+ 3 => "<p>We're sorry, but the page you have requested does not exist. Please feel free to check the <a href=\"{$_CONF['site_url']}/\">main page</a> or the <a href=\"{$_CONF['site_url']}/search.php\">search page</a> to see if you can find what you lost.",
4 => "<p>We're sorry, but the page you have requested does not exist. We recommend going back to this <a href=\"%s\">related page</a>, or you may want to check the <a href=\"{$_CONF['site_url']}/\">home page</a>, or the <a href=\"{$_CONF['site_url']}/search.php\">search page</a> to see if you can find what you lost.",
);
@@ -1713,7 +1713,7 @@
'reachable' => 'Your %s is reachable from the web.',
'not_reachable' => 'Good! Your %s is not reachable from the web.',
'not_sure' => 'Got an HTTP result code %s when trying to test your %s. Not sure what to make of it ...',
- 'remove_inst' => 'You should really remove the install directory %s once you have your site up and running without any errors.',
+ 'remove_inst' => 'You should really remove the install directory %s once you have your site up and running without any errors.',
'remove_inst2' => 'Keeping it around would allow malicious users the ability to destroy your current install, take over your site, or retrieve sensitive information.',
'inst_removed' => 'Good! You seem to have removed the install directory already.',
'fix_password' => 'You still have not changed the <strong>default password</strong> from "password" on the default Admin user account.',
@@ -1810,7 +1810,7 @@
'list' => 'list',
'list_all' => 'List all',
'meta_description' => 'Meta Description',
- 'meta_keywords' => 'Meta Keywords',
+ 'meta_keywords' => 'Meta Keywords',
'na' => 'N/A',
'unavailable' => 'N/A',
'warning' => '!!!',
@@ -1946,11 +1946,11 @@
'custom_registration' => "Enable Custom Registration",
'user_login_method' => "User Login Method",
'facebook_login' => "Enable OAuth Login Method Facebook",
- 'facebook_consumer_key' => "Facebook OAuth Application ID",
- 'facebook_consumer_secret' => "Facebook OAuth Application Secret",
+ 'facebook_consumer_key' => "Facebook OAuth Application ID",
+ 'facebook_consumer_secret' => "Facebook OAuth Application Secret",
'linkedin_login' => "Enable OAuth Login Method LinkedIn",
- 'linkedin_consumer_key' => "LinkedIn OAuth API Key",
- 'linkedin_consumer_secret' => "LinkedIn OAuth Secret Key",
+ 'linkedin_consumer_key' => "LinkedIn OAuth API Key",
+ 'linkedin_consumer_secret' => "LinkedIn OAuth Secret Key",
'twitter_login' => "Enable OAuth Login Method Twitter",
'twitter_consumer_key' => "Twitter OAuth Consumer Key",
'twitter_consumer_secret' => "Twitter OAuth Consumer Secret",
@@ -2085,7 +2085,7 @@
'comment_feeds_article_tag' => 'Article Tag',
'comment_feeds_article_tag_position' => 'Article Tag Position',
'comment_feeds_article_author_tag' => 'Article Author Tag',
- 'comment_feeds_comment_author_tag' => 'Comment Author Tag',
+ 'comment_feeds_comment_author_tag' => 'Comment Author Tag',
'copyrightyear' => "Copyright Year",
'image_lib' => "Image Library",
'path_to_mogrify' => "Path to Mogrify",
@@ -2141,7 +2141,7 @@
'cdn_hosted' => "Use CDN-hosted copy of jQuery",
'meta_tags' => "Meta Tags",
'meta_description' => "Default Meta Description",
- 'meta_keywords' => "Default Meta Keywords",
+ 'meta_keywords' => "Default Meta Keywords",
'default_permissions_block' => "Block Default Permissions",
'default_permissions_story' => "Story Default Permissions",
'default_permissions_topic' => "Topic Default Permissions",
@@ -2162,8 +2162,8 @@
'search_show_limit' => "Show Page Limits?",
'search_separator' => "Group Separator",
'search_def_keytype' => "Default Search Method",
- 'search_def_sort' => "Default Sort Order",
- 'autotag_permissions_story' => '[story: ] Permissions',
+ 'search_def_sort' => "Default Sort Order",
+ 'autotag_permissions_story' => '[story: ] Permissions',
'autotag_permissions_user' => '[user: ] Permissions',
'autotag_permissions_topic' => '[topic: ] Permissions',
'autotag_permissions_related_topics' => '[related_topics: ] Permissions',
@@ -2257,16 +2257,16 @@
'fs_perm_topic' => 'Topic Default Permission',
'fs_perm_block' => 'Block Default Permission',
'fs_webservices' => 'Webservices',
- 'fs_autotag_permissions' => 'Autotag Usage Permissions',
+ 'fs_autotag_permissions' => 'Autotag Usage Permissions',
'fs_breadcrumbs' => 'Breadcrumbs',
'fs_pass' => 'Password Settings',
- 'fs_filemanager_general' => 'General Settings',
- 'fs_filemanager_upload' => 'Upload',
- 'fs_filemanager_images' => 'Images',
- 'fs_filemanager_videos' => 'Videos',
- 'fs_filemanager_audios' => 'Audios'
+ 'fs_filemanager_general' => 'General Settings',
+ 'fs_filemanager_upload' => 'Upload',
+ 'fs_filemanager_images' => 'Images',
+ 'fs_filemanager_videos' => 'Videos',
+ 'fs_filemanager_audios' => 'Audios'
);
-
+
$LANG_tab['Core'] = array(
'tab_site' => 'Site',
'tab_paths' => 'Paths',
@@ -2308,11 +2308,11 @@
'tab_permissions' => 'Permissions',
'tab_webservices' => 'Webservices',
'tab_topics' => 'Topics',
- 'tab_filemanager_general' => 'General Settings',
- 'tab_filemanager_upload' => 'Upload',
- 'tab_filemanager_images' => 'Images',
- 'tab_filemanager_videos' => 'Videos',
- 'tab_filemanager_audios' => 'Audios'
+ 'tab_filemanager_general' => 'General Settings',
+ 'tab_filemanager_upload' => 'Upload',
+ 'tab_filemanager_images' => 'Images',
+ 'tab_filemanager_videos' => 'Videos',
+ 'tab_filemanager_audios' => 'Audios'
);
$LANG_configselects['Core'] = array(
@@ -2350,15 +2350,15 @@
24 => array('Contribute' => 'contribute', 'Home' => 'home', 'Advanced Search' => 'search', 'Directory' => 'directory', 'Login' => 'login', 'My Account' => 'prefs', 'Plugin Entries' => 'plugins', 'Custom Entries' => 'custom', 'Site Statistics' => 'stats'),
25 => array('New Stories' => 'story', 'New Comments' => 'comment', 'New Trackbacks' => 'trackback', 'New Pingbacks' => 'pingback', 'New Users' => 'user'),
26 => array('G (General Audiences)' => 'G', 'PG (Parental Guidance)' => 'PG', 'R (Restricted)' => 'R', 'X (Explicit)' => 'X'),
- 27 => array('Hits (asc)' => 'hits|asc', 'Hits (desc)' => 'hits|desc', 'Date (asc)' => 'date|asc', 'Date (desc)' => 'date|desc', 'Title (asc)' => 'title|asc', 'Title (desc)' => 'title|desc', 'Author (asc)' => 'uid|asc', 'Author (desc)' => 'uid|desc'),
+ 27 => array('Hits (asc)' => 'hits|asc', 'Hits (desc)' => 'hits|desc', 'Date (asc)' => 'date|asc', 'Date (desc)' => 'date|desc', 'Title (asc)' => 'title|asc', 'Title (desc)' => 'title|desc', 'Author (asc)' => 'uid|asc', 'Author (desc)' => 'uid|desc'),
28 => array('No access' => 0, 'Use' => 2),
29 => array('md5' => 0, 'sha1' => 1, 'sha256' => 2, 'sha512' => 3, 'blowfish' => 4),
- 30 => array('Start' => 'start', 'End' => 'end', 'None' => 'none'),
- 31 => array('Newest First' => 'DESC', 'Oldest First' => 'ASC'),
- 32 => array('Disabled' => 0, 'Just Article Pages' => 1, 'Articles and Topics' => 2),
+ 30 => array('Start' => 'start', 'End' => 'end', 'None' => 'none'),
+ 31 => array('Newest First' => 'DESC', 'Oldest First' => 'ASC'),
+ 32 => array('Disabled' => 0, 'Just Article Pages' => 1, 'Articles and Topics' => 2),
33 => array('Disabled' => 0, 'Enabled' => 1, 'Enabled (No Links)' => 2, 'Enabled (No Outbound Links)' => 3),
- 34 => array('grid' => 'grid', 'list' => 'list'),
- 35 => array('default' => 'default', 'Name (asc)' => 'NAME_ASC', 'Name (desc)' => 'NAME_DESC', 'Type (asc)' => 'TYPE_ASC', 'Type (desc)' => 'TYPE_DESC', 'Modified (asc)' => 'MODIFIED_ASC', 'Modified (desc)' => 'MODIFIED_DESC'),
+ 34 => array('grid' => 'grid', 'list' => 'list'),
+ 35 => array('default' => 'default', 'Name (asc)' => 'NAME_ASC', 'Name (desc)' => 'NAME_DESC', 'Type (asc)' => 'TYPE_ASC', 'Type (desc)' => 'TYPE_DESC', 'Modified (asc)' => 'MODIFIED_ASC', 'Modified (desc)' => 'MODIFIED_DESC'),
);
################################################################################
@@ -2392,23 +2392,23 @@
'mail_settings_backend' => "This field must be one of 'smtp', 'sendmail', or 'mail'",
'mail_settings_sendmail_path' => 'This field must contains a valid path to sendmail binary',
'mail_settings_host' => 'This field must contain a valid hostname',
- 'mail_settings_port' => 'This field must be between 0 - 65535',
- 'rdf_limit' => 'This field must be numeric',
+ 'mail_settings_port' => 'This field must be between 0 - 65535',
+ 'rdf_limit' => 'This field must be numeric',
'path' => 'Path does not exist',
- 'file' => 'File does not exist',
+ 'file' => 'File does not exist',
'search_limits' => 'This field must be numeric and separated with a comma',
- 'num_search_results' => "This field must be numeric and from the 'search_limits' field above",
+ 'num_search_results' => "This field must be numeric and from the 'search_limits' field above",
'theme' => 'Theme directory does not exist',
'path_themes' => 'Theme path must be an absolute path and make sure the last character contains the ' .
'directory separator',
'path_to_mogrify' => 'You must set the image library to imagemagick and fill this field with the ' .
'complete path to the mogrify executable',
'path_to_netpbm' => 'You must set the image library to netpbm and fill this field with the ' .
- 'directory where the binaries from the Netpbm package are kept',
+ 'directory where the binaries from the Netpbm package are kept',
'language' => 'Language file does not exist',
'timezone' => 'Invalid timezone',
'single_char' => 'This field must be a single character',
- 'page_navigation_max_pages' => 'This field must be between 2 - 21',
+ 'page_navigation_max_pages' => 'This field must be between 2 - 21',
'hash' => 'This field must be a hash function supported by your version of PHP'
);
diff -r 2001242b306d -r f4b58f8009a5 language/english_utf-8.php
--- a/language/english_utf-8.php Sat May 09 13:41:59 2015 +0900
+++ b/language/english_utf-8.php Sat May 09 19:24:44 2015 +0900
@@ -406,11 +406,11 @@
162 => 'will not be scaled',
163 => 'Re-Authentication Failed',
164 => 'You have exceeded the number of allowed attempts for re-authentication. The operation has been aborted and your recent changes were lost, sorry.',
- 165 => 'Use Advanced Editor',
+ 165 => 'Use Advanced Editor',
166 => 'Re-synch Remote Account',
167 => 'Remote login',
168 => 'You may also login with one of the remote authentication services below.',
- 'user_login' => 'User Login',
+ 'user_login' => 'User Login',
'user_login_message' => 'Please login below. You must enter both a username and password.',
'user_logged_in_message' => "You are already logged in. Whould you like to <a href=\"{$_CONF['site_url']}/users.php?mode=logout\" rel=\"nofollow\">logout</a>?"
);
@@ -485,7 +485,7 @@
37 => 'Send me a copy of this email',
38 => "This is a copy of the email that you sent to %s from <{$_CONF['site_url']}>:",
39 => 'Your last message was ',
- 40 => " seconds ago. This site requires at least {$_CONF['speedlimit']} seconds between sending messages"
+ 40 => " seconds ago. This site requires at least {$_CONF['speedlimit']} seconds between sending messages"
);
###############################################################################
@@ -747,7 +747,7 @@
'location' => 'Location',
'status' => 'Status',
'item' => 'Item',
-
+
/* Left incase we decided to use jhead and/or jpegtran Program in future */
'jhead' => 'jhead Program',
'jhead_not_found' => 'Unable to locate the jhead executable.',
@@ -755,7 +755,7 @@
More information about the geeklog-cvs
mailing list