[geeklog-cvs] geeklog: Merged with "plgupdate" feature branch
geeklog-cvs at lists.geeklog.net
geeklog-cvs at lists.geeklog.net
Thu Oct 29 11:54:18 EDT 2009
changeset 7395:bb675c876cb9
url: http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/bb675c876cb9
user: Dirk Haun <dirk at haun-online.de>
date: Thu Oct 29 11:56:23 2009 +0100
description:
Merged with "plgupdate" feature branch
diffstat:
language/afrikaans.php | 20 +-
language/afrikaans_utf-8.php | 20 +-
language/bosnian.php | 20 +-
language/bosnian_utf-8.php | 20 +-
language/bulgarian.php | 20 +-
language/bulgarian_utf-8.php | 20 +-
language/catalan.php | 20 +-
language/catalan_utf-8.php | 20 +-
language/chinese_simplified_utf-8.php | 20 +-
language/chinese_traditional_utf-8.php | 20 +-
language/croatian.php | 20 +-
language/croatian_utf-8.php | 20 +-
language/czech.php | 20 +-
language/czech_utf-8.php | 20 +-
language/danish.php | 20 +-
language/danish_utf-8.php | 20 +-
language/dutch.php | 20 +-
language/dutch_utf-8.php | 20 +-
language/english.php | 16 +-
language/english_utf-8.php | 16 +-
language/estonian.php | 24 +-
language/estonian_utf-8.php | 24 +-
language/farsi_utf-8.php | 20 +-
language/finnish.php | 20 +-
language/finnish_utf-8.php | 20 +-
language/french_canada.php | 20 +-
language/french_canada_utf-8.php | 20 +-
language/french_france.php | 20 +-
language/french_france_utf-8.php | 20 +-
language/german.php | 34 +-
language/german_formal.php | 32 +-
language/german_formal_utf-8.php | 32 +-
language/german_utf-8.php | 34 +-
language/hebrew_utf-8.php | 18 +-
language/hellenic.php | 20 +-
language/hellenic_utf-8.php | 20 +-
language/indonesian.php | 20 +-
language/indonesian_utf-8.php | 20 +-
language/italian.php | 20 +-
language/italian_utf-8.php | 20 +-
language/japanese_utf-8.php | 405 ++++----
language/korean.php | 20 +-
language/korean_utf-8.php | 20 +-
language/norwegian.php | 20 +-
language/norwegian_utf-8.php | 20 +-
language/polish.php | 20 +-
language/polish_utf-8.php | 20 +-
language/portuguese.php | 20 +-
language/portuguese_brazil.php | 20 +-
language/portuguese_brazil_utf-8.php | 20 +-
language/portuguese_utf-8.php | 20 +-
language/romanian.php | 20 +-
language/romanian_utf-8.php | 20 +-
language/russian.php | 20 +-
language/russian_utf-8.php | 20 +-
language/serbian.php | 20 +-
language/serbian_utf-8.php | 20 +-
language/slovak.php | 20 +-
language/slovak_utf-8.php | 20 +-
language/slovenian.php | 20 +-
language/slovenian_utf-8.php | 20 +-
language/spanish.php | 20 +-
language/spanish_argentina.php | 20 +-
language/spanish_argentina_utf-8.php | 20 +-
language/spanish_utf-8.php | 20 +-
language/swedish.php | 20 +-
language/swedish_utf-8.php | 20 +-
language/turkish.php | 20 +-
language/turkish_utf-8.php | 20 +-
language/ukrainian.php | 20 +-
language/ukrainian_koi8-u.php | 20 +-
language/ukrainian_utf-8.php | 20 +-
plugins/calendar/autoinstall.php | 10 +-
plugins/calendar/functions.inc | 91 +-
plugins/calendar/language/czech.php | 2 +-
plugins/calendar/language/czech_utf-8.php | 2 +-
plugins/calendar/language/danish.php | 2 +-
plugins/calendar/language/danish_utf-8.php | 2 +-
plugins/calendar/language/dutch.php | 2 +-
plugins/calendar/language/dutch_utf-8.php | 2 +-
plugins/calendar/language/estonian.php | 2 +-
plugins/calendar/language/french_canada.php | 2 +-
plugins/calendar/language/french_canada_utf-8.php | 2 +-
plugins/calendar/language/german.php | 2 +-
plugins/calendar/language/german_formal.php | 2 +-
plugins/calendar/language/german_formal_utf-8.php | 2 +-
plugins/calendar/language/german_utf-8.php | 2 +-
plugins/calendar/language/japanese_utf-8.php | 16 +-
plugins/calendar/language/korean.php | 2 +-
plugins/calendar/language/korean_utf-8.php | 2 +-
plugins/calendar/language/russian.php | 2 +-
plugins/calendar/language/russian_utf-8.php | 2 +-
plugins/calendar/language/slovenian.php | 2 +-
plugins/calendar/language/slovenian_utf-8.php | 2 +-
plugins/calendar/language/spanish.php | 2 +-
plugins/calendar/language/spanish_utf-8.php | 2 +-
plugins/calendar/language/ukrainian.php | 2 +-
plugins/calendar/language/ukrainian_koi8-u.php | 2 +-
plugins/calendar/language/ukrainian_utf-8.php | 2 +-
plugins/calendar/sql/mssql_install.php | 5 +-
plugins/calendar/sql/mssql_updates.php | 43 +
plugins/calendar/sql/mysql_install.php | 3 +-
plugins/calendar/sql/mysql_updates.php | 43 +
plugins/links/functions.inc | 15 +-
plugins/links/language/chinese_simplified_utf-8.php | 5 +-
plugins/links/language/chinese_traditional_utf-8.php | 5 +-
plugins/links/language/czech.php | 5 +-
plugins/links/language/czech_utf-8.php | 5 +-
plugins/links/language/dutch.php | 5 +-
plugins/links/language/dutch_utf-8.php | 5 +-
plugins/links/language/english.php | 3 +-
plugins/links/language/english_utf-8.php | 3 +-
plugins/links/language/estonian.php | 5 +-
plugins/links/language/estonian_utf-8.php | 5 +-
plugins/links/language/french_canada.php | 5 +-
plugins/links/language/french_canada_utf-8.php | 5 +-
plugins/links/language/german.php | 5 +-
plugins/links/language/german_formal.php | 5 +-
plugins/links/language/german_formal_utf-8.php | 5 +-
plugins/links/language/german_utf-8.php | 5 +-
plugins/links/language/hebrew_utf-8.php | 3 +-
plugins/links/language/japanese_utf-8.php | 23 +-
plugins/links/language/korean.php | 5 +-
plugins/links/language/korean_utf-8.php | 5 +-
plugins/links/language/polish.php | 5 +-
plugins/links/language/polish_utf-8.php | 5 +-
plugins/links/language/russian.php | 5 +-
plugins/links/language/russian_utf-8.php | 5 +-
plugins/links/language/slovenian.php | 5 +-
plugins/links/language/slovenian_utf-8.php | 5 +-
plugins/links/language/spanish.php | 5 +-
plugins/links/language/spanish_utf-8.php | 5 +-
plugins/links/language/ukrainian.php | 5 +-
plugins/links/language/ukrainian_koi8-u.php | 5 +-
plugins/links/language/ukrainian_utf-8.php | 5 +-
plugins/links/templates/admin/categoryeditor.thtml | 4 +
plugins/polls/autoinstall.php | 6 +-
plugins/polls/functions.inc | 63 +-
plugins/polls/language/chinese_simplified_utf-8.php | 7 +-
plugins/polls/language/chinese_traditional_utf-8.php | 7 +-
plugins/polls/language/dutch.php | 7 +-
plugins/polls/language/dutch_utf-8.php | 7 +-
plugins/polls/language/estonian.php | 7 +-
plugins/polls/language/estonian_utf-8.php | 5 +-
plugins/polls/language/french_canada.php | 7 +-
plugins/polls/language/french_canada_utf-8.php | 7 +-
plugins/polls/language/german.php | 7 +-
plugins/polls/language/german_formal.php | 7 +-
plugins/polls/language/german_formal_utf-8.php | 7 +-
plugins/polls/language/german_utf-8.php | 7 +-
plugins/polls/language/hebrew_utf-8.php | 5 +-
plugins/polls/language/japanese_utf-8.php | 53 +-
plugins/polls/language/korean.php | 7 +-
plugins/polls/language/korean_utf-8.php | 7 +-
plugins/polls/language/russian.php | 7 +-
plugins/polls/language/russian_utf-8.php | 7 +-
plugins/polls/language/slovenian.php | 7 +-
plugins/polls/language/slovenian_utf-8.php | 7 +-
plugins/polls/language/spanish.php | 7 +-
plugins/polls/language/spanish_utf-8.php | 7 +-
plugins/polls/language/ukrainian.php | 7 +-
plugins/polls/language/ukrainian_koi8-u.php | 7 +-
plugins/polls/language/ukrainian_utf-8.php | 7 +-
plugins/spamx/language/estonian.php | 2 +-
plugins/spamx/language/estonian_utf-8.php | 2 +-
plugins/spamx/language/farsi_utf-8.php | 2 +-
plugins/spamx/language/french_canada.php | 2 +-
plugins/spamx/language/french_canada_utf-8.php | 2 +-
plugins/spamx/language/french_france.php | 2 +-
plugins/spamx/language/french_france_utf-8.php | 2 +-
plugins/spamx/language/italian.php | 2 +-
plugins/spamx/language/italian_utf-8.php | 2 +-
plugins/spamx/language/japanese_utf-8.php | 4 +-
plugins/spamx/language/russian.php | 2 +-
plugins/spamx/language/russian_utf-8.php | 2 +-
plugins/spamx/language/slovenian.php | 2 +-
plugins/spamx/language/slovenian_utf-8.php | 2 +-
plugins/spamx/language/spanish.php | 2 +-
plugins/spamx/language/spanish_utf-8.php | 2 +-
plugins/spamx/language/ukrainian.php | 2 +-
plugins/spamx/language/ukrainian_koi8-u.php | 2 +-
plugins/spamx/language/ukrainian_utf-8.php | 2 +-
plugins/staticpages/autoinstall.php | 8 +-
plugins/staticpages/functions.inc | 79 +-
plugins/staticpages/language/chinese_simplified_utf-8.php | 5 +-
plugins/staticpages/language/chinese_traditional_utf-8.php | 5 +-
plugins/staticpages/language/czech.php | 5 +-
plugins/staticpages/language/czech_utf-8.php | 5 +-
plugins/staticpages/language/danish.php | 5 +-
plugins/staticpages/language/danish_utf-8.php | 5 +-
plugins/staticpages/language/dutch.php | 5 +-
plugins/staticpages/language/dutch_utf-8.php | 5 +-
plugins/staticpages/language/estonian.php | 5 +-
plugins/staticpages/language/estonian_utf-8.php | 5 +-
plugins/staticpages/language/farsi_utf-8.php | 5 +-
plugins/staticpages/language/french_canada.php | 5 +-
plugins/staticpages/language/french_canada_utf-8.php | 5 +-
plugins/staticpages/language/german.php | 5 +-
plugins/staticpages/language/german_formal.php | 5 +-
plugins/staticpages/language/german_formal_utf-8.php | 5 +-
plugins/staticpages/language/german_utf-8.php | 5 +-
plugins/staticpages/language/hebrew_utf-8.php | 3 +-
plugins/staticpages/language/italian.php | 5 +-
plugins/staticpages/language/italian_utf-8.php | 5 +-
plugins/staticpages/language/japanese_utf-8.php | 7 +-
plugins/staticpages/language/korean.php | 5 +-
plugins/staticpages/language/korean_utf-8.php | 5 +-
plugins/staticpages/language/polish.php | 5 +-
plugins/staticpages/language/polish_utf-8.php | 5 +-
plugins/staticpages/language/portuguese_brazil.php | 5 +-
plugins/staticpages/language/portuguese_brazil_utf-8.php | 5 +-
plugins/staticpages/language/slovenian.php | 5 +-
plugins/staticpages/language/slovenian_utf-8.php | 5 +-
plugins/staticpages/language/spanish.php | 5 +-
plugins/staticpages/language/spanish_utf-8.php | 5 +-
plugins/staticpages/language/swedish.php | 5 +-
plugins/staticpages/language/swedish_utf-8.php | 5 +-
plugins/staticpages/language/turkish.php | 5 +-
plugins/staticpages/language/turkish_utf-8.php | 5 +-
plugins/staticpages/language/ukrainian.php | 5 +-
plugins/staticpages/language/ukrainian_koi8-u.php | 5 +-
plugins/staticpages/language/ukrainian_utf-8.php | 5 +-
plugins/staticpages/services.inc.php | 11 +-
plugins/staticpages/sql/mssql_updates.php | 20 +-
plugins/staticpages/sql/mysql_updates.php | 20 +-
plugins/xmlsitemap/language/estonian.php | 32 +-
plugins/xmlsitemap/language/estonian_utf-8.php | 32 +-
plugins/xmlsitemap/language/hebrew_utf-8.php | 28 +-
plugins/xmlsitemap/language/japanese_utf-8.php | 36 +-
public_html/admin/configuration.php | 13 +-
public_html/admin/group.php | 2 +-
public_html/admin/install/config-install.php | 1 +
public_html/admin/install/language/hebrew_utf-8.php | 2 +-
public_html/admin/install/language/japanese_utf-8.php | 2 +-
public_html/admin/install/lib-install.php | 16 +-
public_html/admin/mail.php | 2 +-
public_html/admin/moderation.php | 22 +-
public_html/admin/plugins.php | 39 +-
public_html/admin/plugins/calendar/index.php | 4 +-
public_html/admin/plugins/links/category.php | 10 +
public_html/admin/plugins/polls/index.php | 19 +-
public_html/admin/plugins/staticpages/index.php | 13 +-
public_html/admin/story.php | 21 +-
public_html/admin/topic.php | 54 +-
public_html/admin/user.php | 12 +
public_html/comment.php | 5 +-
public_html/docs/english/changes.html | 28 +
public_html/docs/english/config.html | 42 +-
public_html/docs/english/theme.html | 14 +
public_html/docs/english/themevars.html | 24 +-
public_html/docs/history | 53 +-
public_html/layout/professional/admin/mail/mailform.thtml | 29 +-
public_html/layout/professional/admin/story/storyeditor.thtml | 4 +-
public_html/layout/professional/admin/story/storyeditor_advanced.thtml | 6 +-
public_html/layout/professional/admin/topic/topiceditor.thtml | 4 +
public_html/layout/professional/profiles/contactauthorform.thtml | 17 +-
public_html/layout/professional/profiles/contactuserform.thtml | 28 +-
public_html/profiles.php | 81 +-
public_html/submit.php | 3 +-
public_html/users.php | 127 +-
public_html/usersettings.php | 25 +-
sql/mysql_tableanddata.php | 2 +-
sql/updates/mssql_1.6.0_to_1.6.1.php | 3 +
sql/updates/mysql_1.6.0_to_1.6.1.php | 7 +-
system/classes/listfactory.class.php | 225 +++-
system/classes/search.class.php | 224 ++---
system/classes/searchcriteria.class.php | 115 +-
system/classes/story.class.php | 121 +-
system/classes/template.class.php | 8 +-
system/lib-admin.php | 278 +++---
system/lib-custom.php.dist | 11 +
system/lib-plugins.php | 15 -
system/lib-security.php | 70 +
273 files changed, 3189 insertions(+), 1714 deletions(-)
diffs (truncated from 12802 to 300 lines):
diff -r fdb273c78589 -r bb675c876cb9 language/afrikaans.php
--- a/language/afrikaans.php Mon Sep 28 22:20:30 2009 +0200
+++ b/language/afrikaans.php Thu Oct 29 11:56:23 2009 +0100
@@ -824,7 +824,9 @@
85 => 'Wys Alles',
86 => 'Advanced Editor',
87 => 'Story Stats',
- 88 => 'Wiki-style format'
+ 88 => 'Wiki-style format',
+ 89 => 'Meta Description',
+ 90 => 'Meta Keywords'
);
###############################################################################
@@ -859,7 +861,8 @@
26 => 'maak hierdie die standaard onderwerp vir die artikelargief. Slegs een onderwerp toegelaat.',
27 => 'of Laai Onderwerp Ikoon',
28 => 'Maksimum',
- 29 => 'Lêer Oplaai Foute'
+ 29 => 'Lêer Oplaai Foute',
+ 30 => 'Stories in Topic'
);
###############################################################################
@@ -1471,7 +1474,7 @@
'public_html' => '"public_html" should never be part of your site\'s URL. Please read the part about public_html in the %s again and change your setup accordingly before you proceed.',
'installation' => 'installation instructions',
'directory' => 'directory',
- 'failed_bak' => 'Failed to create a temporary file in your data directory. Check your directory permissions!',
+ 'failed_tmp' => 'Failed to create a temporary file in your %s directory. Check your directory permissions!',
'fix_it' => 'This is a security risk and should be fixed!',
'reachable' => 'Your %s is reachable from the web.',
'not_reachable' => 'Good! Your %s is not reachable from the web.',
@@ -1571,6 +1574,8 @@
'addchild' => 'Add child',
'list' => 'list',
'list_all' => 'List all',
+ 'meta_description' => 'Meta Description',
+ 'meta_keywords' => 'Meta Keywords',
'na' => 'N/A'
);
@@ -1843,12 +1848,16 @@
'censorlist' => 'Censor List',
'ip_lookup' => 'IP Lookup',
'url_rewrite' => 'Enable URL Rewrite',
+ 'meta_tags' => 'Meta Tags',
+ 'meta_description' => 'Default Meta Description',
+ 'meta_keywords' => 'Default Meta Keywords',
'default_permissions_block' => 'Block Default Permissions',
'default_permissions_story' => 'Story Default Permissions',
'default_permissions_topic' => 'Topic Default Permissions',
'atom_max_stories' => 'Max. Stories in Webservices Feed',
'disable_webservices' => 'Disable Webservices?',
'restrict_webservices' => 'Restrict Webservices?',
+ 'article_comment_close_enabled' => 'Automatically close comments (default)',
'article_comment_close_days' => 'Days to close comments (default)',
'comment_close_rec_stories' => 'Number of most recent stories enabled for comments',
'allow_reply_notifications' => 'Allow comment reply notifications?',
@@ -1940,7 +1949,8 @@
19 => array('Google' => 'google', 'Table' => 'table'),
20 => array('Exact Phrase' => 'phrase', 'All of The Words' => 'all', 'Any of The Words' => 'any'),
21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict'),
- 22 => array('Strict' => 'DENY', 'Same Origin' => 'SAMEORIGIN', '(disabled)' => '')
+ 22 => array('Strict' => 'DENY', 'Same Origin' => 'SAMEORIGIN', '(disabled)' => ''),
+ 23 => array('Disabled' => 0, 'Enabled' => 1, 'Enabled (Default for Homepage only)' => 2)
);
-?>
\ No newline at end of file
+?>
diff -r fdb273c78589 -r bb675c876cb9 language/afrikaans_utf-8.php
--- a/language/afrikaans_utf-8.php Mon Sep 28 22:20:30 2009 +0200
+++ b/language/afrikaans_utf-8.php Thu Oct 29 11:56:23 2009 +0100
@@ -824,7 +824,9 @@
85 => 'Wys Alles',
86 => 'Advanced Editor',
87 => 'Story Stats',
- 88 => 'Wiki-style format'
+ 88 => 'Wiki-style format',
+ 89 => 'Meta Description',
+ 90 => 'Meta Keywords'
);
###############################################################################
@@ -859,7 +861,8 @@
26 => 'maak hierdie die standaard onderwerp vir die artikelargief. Slegs een onderwerp toegelaat.',
27 => 'of Laai Onderwerp Ikoon',
28 => 'Maksimum',
- 29 => 'Lêer Oplaai Foute'
+ 29 => 'Lêer Oplaai Foute',
+ 30 => 'Stories in Topic'
);
###############################################################################
@@ -1471,7 +1474,7 @@
'public_html' => '"public_html" should never be part of your site\'s URL. Please read the part about public_html in the %s again and change your setup accordingly before you proceed.',
'installation' => 'installation instructions',
'directory' => 'directory',
- 'failed_bak' => 'Failed to create a temporary file in your data directory. Check your directory permissions!',
+ 'failed_tmp' => 'Failed to create a temporary file in your %s directory. Check your directory permissions!',
'fix_it' => 'This is a security risk and should be fixed!',
'reachable' => 'Your %s is reachable from the web.',
'not_reachable' => 'Good! Your %s is not reachable from the web.',
@@ -1571,6 +1574,8 @@
'addchild' => 'Add child',
'list' => 'list',
'list_all' => 'List all',
+ 'meta_description' => 'Meta Description',
+ 'meta_keywords' => 'Meta Keywords',
'na' => 'N/A'
);
@@ -1843,12 +1848,16 @@
'censorlist' => 'Censor List',
'ip_lookup' => 'IP Lookup',
'url_rewrite' => 'Enable URL Rewrite',
+ 'meta_tags' => 'Meta Tags',
+ 'meta_description' => 'Default Meta Description',
+ 'meta_keywords' => 'Default Meta Keywords',
'default_permissions_block' => 'Block Default Permissions',
'default_permissions_story' => 'Story Default Permissions',
'default_permissions_topic' => 'Topic Default Permissions',
'atom_max_stories' => 'Max. Stories in Webservices Feed',
'disable_webservices' => 'Disable Webservices?',
'restrict_webservices' => 'Restrict Webservices?',
+ 'article_comment_close_enabled' => 'Automatically close comments (default)',
'article_comment_close_days' => 'Days to close comments (default)',
'comment_close_rec_stories' => 'Number of most recent stories enabled for comments',
'allow_reply_notifications' => 'Allow comment reply notifications?',
@@ -1940,7 +1949,8 @@
19 => array('Google' => 'google', 'Table' => 'table'),
20 => array('Exact Phrase' => 'phrase', 'All of The Words' => 'all', 'Any of The Words' => 'any'),
21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict'),
- 22 => array('Strict' => 'DENY', 'Same Origin' => 'SAMEORIGIN', '(disabled)' => '')
+ 22 => array('Strict' => 'DENY', 'Same Origin' => 'SAMEORIGIN', '(disabled)' => ''),
+ 23 => array('Disabled' => 0, 'Enabled' => 1, 'Enabled (Default for Homepage only)' => 2)
);
-?>
\ No newline at end of file
+?>
diff -r fdb273c78589 -r bb675c876cb9 language/bosnian.php
--- a/language/bosnian.php Mon Sep 28 22:20:30 2009 +0200
+++ b/language/bosnian.php Thu Oct 29 11:56:23 2009 +0100
@@ -828,7 +828,9 @@
85 => 'Show All',
86 => 'Advanced Editor',
87 => 'Story Stats',
- 88 => 'Wiki-style format'
+ 88 => 'Wiki-style format',
+ 89 => 'Meta Description',
+ 90 => 'Meta Keywords'
);
###############################################################################
@@ -863,7 +865,8 @@
26 => 'make this the default topic for archived stories. Only one topic allowed.',
27 => 'Or Upload Topic Icon',
28 => 'Maximum',
- 29 => 'File Upload Errors'
+ 29 => 'File Upload Errors',
+ 30 => 'Stories in Topic'
);
###############################################################################
@@ -1475,7 +1478,7 @@
'public_html' => '"public_html" should never be part of your site\'s URL. Please read the part about public_html in the %s again and change your setup accordingly before you proceed.',
'installation' => 'installation instructions',
'directory' => 'directory',
- 'failed_bak' => 'Failed to create a temporary file in your data directory. Check your directory permissions!',
+ 'failed_tmp' => 'Failed to create a temporary file in your %s directory. Check your directory permissions!',
'fix_it' => 'This is a security risk and should be fixed!',
'reachable' => 'Your %s is reachable from the web.',
'not_reachable' => 'Good! Your %s is not reachable from the web.',
@@ -1575,6 +1578,8 @@
'addchild' => 'Add child',
'list' => 'list',
'list_all' => 'List all',
+ 'meta_description' => 'Meta Description',
+ 'meta_keywords' => 'Meta Keywords',
'na' => 'N/A'
);
@@ -1847,12 +1852,16 @@
'censorlist' => 'Censor List',
'ip_lookup' => 'IP Lookup',
'url_rewrite' => 'Enable URL Rewrite',
+ 'meta_tags' => 'Meta Tags',
+ 'meta_description' => 'Default Meta Description',
+ 'meta_keywords' => 'Default Meta Keywords',
'default_permissions_block' => 'Block Default Permissions',
'default_permissions_story' => 'Story Default Permissions',
'default_permissions_topic' => 'Topic Default Permissions',
'atom_max_stories' => 'Max. Stories in Webservices Feed',
'disable_webservices' => 'Disable Webservices?',
'restrict_webservices' => 'Restrict Webservices?',
+ 'article_comment_close_enabled' => 'Automatically close comments (default)',
'article_comment_close_days' => 'Days to close comments (default)',
'comment_close_rec_stories' => 'Number of most recent stories enabled for comments',
'allow_reply_notifications' => 'Allow comment reply notifications?',
@@ -1944,7 +1953,8 @@
19 => array('Google' => 'google', 'Table' => 'table'),
20 => array('Exact Phrase' => 'phrase', 'All of The Words' => 'all', 'Any of The Words' => 'any'),
21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict'),
- 22 => array('Strict' => 'DENY', 'Same Origin' => 'SAMEORIGIN', '(disabled)' => '')
+ 22 => array('Strict' => 'DENY', 'Same Origin' => 'SAMEORIGIN', '(disabled)' => ''),
+ 23 => array('Disabled' => 0, 'Enabled' => 1, 'Enabled (Default for Homepage only)' => 2)
);
-?>
\ No newline at end of file
+?>
diff -r fdb273c78589 -r bb675c876cb9 language/bosnian_utf-8.php
--- a/language/bosnian_utf-8.php Mon Sep 28 22:20:30 2009 +0200
+++ b/language/bosnian_utf-8.php Thu Oct 29 11:56:23 2009 +0100
@@ -828,7 +828,9 @@
85 => 'Show All',
86 => 'Advanced Editor',
87 => 'Story Stats',
- 88 => 'Wiki-style format'
+ 88 => 'Wiki-style format',
+ 89 => 'Meta Description',
+ 90 => 'Meta Keywords'
);
###############################################################################
@@ -863,7 +865,8 @@
26 => 'make this the default topic for archived stories. Only one topic allowed.',
27 => 'Or Upload Topic Icon',
28 => 'Maximum',
- 29 => 'File Upload Errors'
+ 29 => 'File Upload Errors',
+ 30 => 'Stories in Topic'
);
###############################################################################
@@ -1475,7 +1478,7 @@
'public_html' => '"public_html" should never be part of your site\'s URL. Please read the part about public_html in the %s again and change your setup accordingly before you proceed.',
'installation' => 'installation instructions',
'directory' => 'directory',
- 'failed_bak' => 'Failed to create a temporary file in your data directory. Check your directory permissions!',
+ 'failed_tmp' => 'Failed to create a temporary file in your %s directory. Check your directory permissions!',
'fix_it' => 'This is a security risk and should be fixed!',
'reachable' => 'Your %s is reachable from the web.',
'not_reachable' => 'Good! Your %s is not reachable from the web.',
@@ -1575,6 +1578,8 @@
'addchild' => 'Add child',
'list' => 'list',
'list_all' => 'List all',
+ 'meta_description' => 'Meta Description',
+ 'meta_keywords' => 'Meta Keywords',
'na' => 'N/A'
);
@@ -1847,12 +1852,16 @@
'censorlist' => 'Censor List',
'ip_lookup' => 'IP Lookup',
'url_rewrite' => 'Enable URL Rewrite',
+ 'meta_tags' => 'Meta Tags',
+ 'meta_description' => 'Default Meta Description',
+ 'meta_keywords' => 'Default Meta Keywords',
'default_permissions_block' => 'Block Default Permissions',
'default_permissions_story' => 'Story Default Permissions',
'default_permissions_topic' => 'Topic Default Permissions',
'atom_max_stories' => 'Max. Stories in Webservices Feed',
'disable_webservices' => 'Disable Webservices?',
'restrict_webservices' => 'Restrict Webservices?',
+ 'article_comment_close_enabled' => 'Automatically close comments (default)',
'article_comment_close_days' => 'Days to close comments (default)',
'comment_close_rec_stories' => 'Number of most recent stories enabled for comments',
'allow_reply_notifications' => 'Allow comment reply notifications?',
@@ -1944,7 +1953,8 @@
19 => array('Google' => 'google', 'Table' => 'table'),
20 => array('Exact Phrase' => 'phrase', 'All of The Words' => 'all', 'Any of The Words' => 'any'),
21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict'),
- 22 => array('Strict' => 'DENY', 'Same Origin' => 'SAMEORIGIN', '(disabled)' => '')
+ 22 => array('Strict' => 'DENY', 'Same Origin' => 'SAMEORIGIN', '(disabled)' => ''),
+ 23 => array('Disabled' => 0, 'Enabled' => 1, 'Enabled (Default for Homepage only)' => 2)
);
-?>
\ No newline at end of file
+?>
diff -r fdb273c78589 -r bb675c876cb9 language/bulgarian.php
--- a/language/bulgarian.php Mon Sep 28 22:20:30 2009 +0200
+++ b/language/bulgarian.php Thu Oct 29 11:56:23 2009 +0100
@@ -824,7 +824,9 @@
85 => 'Show All',
86 => 'Advanced Editor',
87 => 'Story Stats',
- 88 => 'Wiki-style format'
+ 88 => 'Wiki-style format',
+ 89 => 'Meta Description',
+ 90 => 'Meta Keywords'
);
###############################################################################
@@ -859,7 +861,8 @@
26 => 'make this the default topic for archived stories. Only one topic allowed.',
More information about the geeklog-cvs
mailing list