[geeklog-hg] geeklog: Merged with Upstream
geeklog-cvs at lists.geeklog.net
geeklog-cvs at lists.geeklog.net
Sat Jan 4 11:04:30 EST 2014
changeset 9383:2ac353bc34aa
url: http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/2ac353bc34aa
user: Tom <websitemaster at cogeco.net>
date: Sat Jan 04 10:39:33 2014 -0500
description:
Merged with Upstream
diffstat:
language/afrikaans.php | 7 +-
language/afrikaans_utf-8.php | 7 +-
language/bosnian.php | 7 +-
language/bosnian_utf-8.php | 7 +-
language/bulgarian.php | 7 +-
language/bulgarian_utf-8.php | 7 +-
language/catalan.php | 7 +-
language/catalan_utf-8.php | 7 +-
language/chinese_simplified_utf-8.php | 7 +-
language/chinese_traditional_utf-8.php | 7 +-
language/croatian.php | 7 +-
language/croatian_utf-8.php | 7 +-
language/czech.php | 7 +-
language/czech_utf-8.php | 7 +-
language/danish.php | 7 +-
language/danish_utf-8.php | 7 +-
language/dutch.php | 7 +-
language/dutch_utf-8.php | 7 +-
language/english.php | 5 +-
language/english_utf-8.php | 5 +-
language/estonian.php | 7 +-
language/estonian_utf-8.php | 7 +-
language/farsi_utf-8.php | 7 +-
language/finnish.php | 7 +-
language/finnish_utf-8.php | 7 +-
language/french_canada.php | 7 +-
language/french_canada_utf-8.php | 7 +-
language/french_france.php | 7 +-
language/french_france_utf-8.php | 7 +-
language/german.php | 7 +-
language/german_formal.php | 7 +-
language/german_formal_utf-8.php | 7 +-
language/german_utf-8.php | 7 +-
language/hebrew_utf-8.php | 7 +-
language/hellenic.php | 7 +-
language/hellenic_utf-8.php | 7 +-
language/indonesian.php | 7 +-
language/indonesian_utf-8.php | 7 +-
language/italian.php | 7 +-
language/italian_utf-8.php | 7 +-
language/japanese_utf-8.php | 7 +-
language/korean.php | 7 +-
language/korean_utf-8.php | 7 +-
language/norwegian.php | 7 +-
language/norwegian_utf-8.php | 7 +-
language/polish.php | 7 +-
language/polish_utf-8.php | 7 +-
language/portuguese.php | 7 +-
language/portuguese_brazil.php | 7 +-
language/portuguese_brazil_utf-8.php | 7 +-
language/portuguese_utf-8.php | 7 +-
language/romanian.php | 7 +-
language/romanian_utf-8.php | 7 +-
language/russian.php | 7 +-
language/russian_utf-8.php | 7 +-
language/serbian.php | 7 +-
language/serbian_utf-8.php | 7 +-
language/slovak.php | 7 +-
language/slovak_utf-8.php | 7 +-
language/slovenian.php | 7 +-
language/slovenian_utf-8.php | 7 +-
language/spanish.php | 7 +-
language/spanish_argentina.php | 7 +-
language/spanish_argentina_utf-8.php | 7 +-
language/spanish_utf-8.php | 7 +-
language/swedish.php | 7 +-
language/swedish_utf-8.php | 7 +-
language/turkish.php | 7 +-
language/turkish_utf-8.php | 7 +-
language/ukrainian.php | 7 +-
language/ukrainian_koi8-u.php | 7 +-
language/ukrainian_utf-8.php | 7 +-
plugins/calendar/language/italian.php | 2 +-
plugins/calendar/language/italian_utf-8.php | 2 +-
plugins/links/language/italian.php | 2 +-
plugins/links/language/italian_utf-8.php | 2 +-
plugins/spamx/IP.Examine.class.php | 2 +-
public_html/admin/block.php | 20 +-
public_html/admin/configuration_validation.php | 2 +-
public_html/article.php | 4 +-
public_html/layout/denim/admin/block/blockeditor.thtml | 6 +-
public_html/layout/modern_curve/admin/block/blockeditor.thtml | 8 +-
public_html/layout/professional/admin/block/blockeditor.thtml | 96 ++++++---
public_html/layout/professional_css/admin/block/blockeditor.thtml | 6 +-
system/classes/story.class.php | 3 +-
system/lib-comment.php | 4 +-
86 files changed, 388 insertions(+), 271 deletions(-)
diffs (truncated from 2574 to 300 lines):
diff -r e11236a405b3 -r 2ac353bc34aa language/afrikaans.php
--- a/language/afrikaans.php Sat Jan 04 10:36:42 2014 -0500
+++ b/language/afrikaans.php Sat Jan 04 10:39:33 2014 -0500
@@ -1853,7 +1853,8 @@
$LANG_postmodes = array(
'plaintext' => 'Gewone Teks',
- 'html' => 'HTML Formaat'
+ 'html' => 'HTML Formaat',
+ 'wikitext' => 'Wiki-style format'
);
$LANG_sortcodes = array(
@@ -2270,7 +2271,7 @@
2 => array('Reject' => 0, 'Only Keep Latest' => 1, 'Allow Multiple Posts' => 2),
3 => array('Trackback Enabled' => 0, 'Trackback Disabled' => -1),
4 => array('Don\'t Check Anything' => 0, 'Check against Site URL' => 1, 'Check full URL' => 2, 'Check against Site URL and full URL' => 3, 'Check IP against Site IP' => 4, 'Check IP and Site URL' => 5, 'Check IP and Full URL' => 6, 'Check IP, Full URL, and Site URL' => 7),
- 5 => array('Plain Old Text' => 'plaintext', 'HTML Formatted' => 'html'),
+ 5 => array('Plain Old Text' => 'plaintext', 'HTML Formatted' => 'html', 'Wiki-style Format' => 'wikitext'),
6 => array('12' => 12, '24' => 24),
7 => array('Last Page' => 'last', 'First Page' => 'first', 'Every Page' => 'all'),
8 => array('Right' => 'right', 'Left' => 'left'),
@@ -2289,7 +2290,7 @@
21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict', 'HTML5' => 'html5', 'HTML5 with XHTML syntax' => 'xhtml5'),
22 => array('Strict' => 'DENY', 'Same Origin' => 'SAMEORIGIN', '(disabled)' => ''),
23 => array('Disabled' => 0, 'Enabled' => 1, 'Enabled (Default for Homepage only)' => 2),
- 24 => array('Contribute' => 'contribute', 'Home' => 'home', 'Advanced Search' => 'search', 'Directory' => 'directory', 'My Account' => 'prefs', 'Plugin Entries' => 'plugins', 'Custom Entries' => 'custom', 'Site Statistics' => 'stats'),
+ 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'),
diff -r e11236a405b3 -r 2ac353bc34aa language/afrikaans_utf-8.php
--- a/language/afrikaans_utf-8.php Sat Jan 04 10:36:42 2014 -0500
+++ b/language/afrikaans_utf-8.php Sat Jan 04 10:39:33 2014 -0500
@@ -1853,7 +1853,8 @@
$LANG_postmodes = array(
'plaintext' => 'Gewone Teks',
- 'html' => 'HTML Formaat'
+ 'html' => 'HTML Formaat',
+ 'wikitext' => 'Wiki-style format'
);
$LANG_sortcodes = array(
@@ -2270,7 +2271,7 @@
2 => array('Reject' => 0, 'Only Keep Latest' => 1, 'Allow Multiple Posts' => 2),
3 => array('Trackback Enabled' => 0, 'Trackback Disabled' => -1),
4 => array('Don\'t Check Anything' => 0, 'Check against Site URL' => 1, 'Check full URL' => 2, 'Check against Site URL and full URL' => 3, 'Check IP against Site IP' => 4, 'Check IP and Site URL' => 5, 'Check IP and Full URL' => 6, 'Check IP, Full URL, and Site URL' => 7),
- 5 => array('Plain Old Text' => 'plaintext', 'HTML Formatted' => 'html'),
+ 5 => array('Plain Old Text' => 'plaintext', 'HTML Formatted' => 'html', 'Wiki-style Format' => 'wikitext'),
6 => array('12' => 12, '24' => 24),
7 => array('Last Page' => 'last', 'First Page' => 'first', 'Every Page' => 'all'),
8 => array('Right' => 'right', 'Left' => 'left'),
@@ -2289,7 +2290,7 @@
21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict', 'HTML5' => 'html5', 'HTML5 with XHTML syntax' => 'xhtml5'),
22 => array('Strict' => 'DENY', 'Same Origin' => 'SAMEORIGIN', '(disabled)' => ''),
23 => array('Disabled' => 0, 'Enabled' => 1, 'Enabled (Default for Homepage only)' => 2),
- 24 => array('Contribute' => 'contribute', 'Home' => 'home', 'Advanced Search' => 'search', 'Directory' => 'directory', 'My Account' => 'prefs', 'Plugin Entries' => 'plugins', 'Custom Entries' => 'custom', 'Site Statistics' => 'stats'),
+ 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'),
diff -r e11236a405b3 -r 2ac353bc34aa language/bosnian.php
--- a/language/bosnian.php Sat Jan 04 10:36:42 2014 -0500
+++ b/language/bosnian.php Sat Jan 04 10:39:33 2014 -0500
@@ -1857,7 +1857,8 @@
$LANG_postmodes = array(
'plaintext' => 'Plain Old Text',
- 'html' => 'HTML Formatted'
+ 'html' => 'HTML Formatted',
+ 'wikitext' => 'Wiki-style format'
);
$LANG_sortcodes = array(
@@ -2274,7 +2275,7 @@
2 => array('Reject' => 0, 'Only Keep Latest' => 1, 'Allow Multiple Posts' => 2),
3 => array('Trackback Enabled' => 0, 'Trackback Disabled' => -1),
4 => array('Don\'t Check Anything' => 0, 'Check against Site URL' => 1, 'Check full URL' => 2, 'Check against Site URL and full URL' => 3, 'Check IP against Site IP' => 4, 'Check IP and Site URL' => 5, 'Check IP and Full URL' => 6, 'Check IP, Full URL, and Site URL' => 7),
- 5 => array('Plain Old Text' => 'plaintext', 'HTML Formatted' => 'html'),
+ 5 => array('Plain Old Text' => 'plaintext', 'HTML Formatted' => 'html', 'Wiki-style Format' => 'wikitext'),
6 => array('12' => 12, '24' => 24),
7 => array('Last Page' => 'last', 'First Page' => 'first', 'Every Page' => 'all'),
8 => array('Right' => 'right', 'Left' => 'left'),
@@ -2293,7 +2294,7 @@
21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict', 'HTML5' => 'html5', 'HTML5 with XHTML syntax' => 'xhtml5'),
22 => array('Strict' => 'DENY', 'Same Origin' => 'SAMEORIGIN', '(disabled)' => ''),
23 => array('Disabled' => 0, 'Enabled' => 1, 'Enabled (Default for Homepage only)' => 2),
- 24 => array('Contribute' => 'contribute', 'Home' => 'home', 'Advanced Search' => 'search', 'Directory' => 'directory', 'My Account' => 'prefs', 'Plugin Entries' => 'plugins', 'Custom Entries' => 'custom', 'Site Statistics' => 'stats'),
+ 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'),
diff -r e11236a405b3 -r 2ac353bc34aa language/bosnian_utf-8.php
--- a/language/bosnian_utf-8.php Sat Jan 04 10:36:42 2014 -0500
+++ b/language/bosnian_utf-8.php Sat Jan 04 10:39:33 2014 -0500
@@ -1857,7 +1857,8 @@
$LANG_postmodes = array(
'plaintext' => 'Plain Old Text',
- 'html' => 'HTML Formatted'
+ 'html' => 'HTML Formatted',
+ 'wikitext' => 'Wiki-style format'
);
$LANG_sortcodes = array(
@@ -2274,7 +2275,7 @@
2 => array('Reject' => 0, 'Only Keep Latest' => 1, 'Allow Multiple Posts' => 2),
3 => array('Trackback Enabled' => 0, 'Trackback Disabled' => -1),
4 => array('Don\'t Check Anything' => 0, 'Check against Site URL' => 1, 'Check full URL' => 2, 'Check against Site URL and full URL' => 3, 'Check IP against Site IP' => 4, 'Check IP and Site URL' => 5, 'Check IP and Full URL' => 6, 'Check IP, Full URL, and Site URL' => 7),
- 5 => array('Plain Old Text' => 'plaintext', 'HTML Formatted' => 'html'),
+ 5 => array('Plain Old Text' => 'plaintext', 'HTML Formatted' => 'html', 'Wiki-style Format' => 'wikitext'),
6 => array('12' => 12, '24' => 24),
7 => array('Last Page' => 'last', 'First Page' => 'first', 'Every Page' => 'all'),
8 => array('Right' => 'right', 'Left' => 'left'),
@@ -2293,7 +2294,7 @@
21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict', 'HTML5' => 'html5', 'HTML5 with XHTML syntax' => 'xhtml5'),
22 => array('Strict' => 'DENY', 'Same Origin' => 'SAMEORIGIN', '(disabled)' => ''),
23 => array('Disabled' => 0, 'Enabled' => 1, 'Enabled (Default for Homepage only)' => 2),
- 24 => array('Contribute' => 'contribute', 'Home' => 'home', 'Advanced Search' => 'search', 'Directory' => 'directory', 'My Account' => 'prefs', 'Plugin Entries' => 'plugins', 'Custom Entries' => 'custom', 'Site Statistics' => 'stats'),
+ 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'),
diff -r e11236a405b3 -r 2ac353bc34aa language/bulgarian.php
--- a/language/bulgarian.php Sat Jan 04 10:36:42 2014 -0500
+++ b/language/bulgarian.php Sat Jan 04 10:39:33 2014 -0500
@@ -1853,7 +1853,8 @@
$LANG_postmodes = array(
'plaintext' => 'Plain Old Text',
- 'html' => 'HTML Formatted'
+ 'html' => 'HTML Formatted',
+ 'wikitext' => 'Wiki-style format'
);
$LANG_sortcodes = array(
@@ -2270,7 +2271,7 @@
2 => array('Reject' => 0, 'Only Keep Latest' => 1, 'Allow Multiple Posts' => 2),
3 => array('Trackback Enabled' => 0, 'Trackback Disabled' => -1),
4 => array('Don\'t Check Anything' => 0, 'Check against Site URL' => 1, 'Check full URL' => 2, 'Check against Site URL and full URL' => 3, 'Check IP against Site IP' => 4, 'Check IP and Site URL' => 5, 'Check IP and Full URL' => 6, 'Check IP, Full URL, and Site URL' => 7),
- 5 => array('Plain Old Text' => 'plaintext', 'HTML Formatted' => 'html'),
+ 5 => array('Plain Old Text' => 'plaintext', 'HTML Formatted' => 'html', 'Wiki-style Format' => 'wikitext'),
6 => array('12' => 12, '24' => 24),
7 => array('Last Page' => 'last', 'First Page' => 'first', 'Every Page' => 'all'),
8 => array('Right' => 'right', 'Left' => 'left'),
@@ -2289,7 +2290,7 @@
21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict', 'HTML5' => 'html5', 'HTML5 with XHTML syntax' => 'xhtml5'),
22 => array('Strict' => 'DENY', 'Same Origin' => 'SAMEORIGIN', '(disabled)' => ''),
23 => array('Disabled' => 0, 'Enabled' => 1, 'Enabled (Default for Homepage only)' => 2),
- 24 => array('Contribute' => 'contribute', 'Home' => 'home', 'Advanced Search' => 'search', 'Directory' => 'directory', 'My Account' => 'prefs', 'Plugin Entries' => 'plugins', 'Custom Entries' => 'custom', 'Site Statistics' => 'stats'),
+ 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'),
diff -r e11236a405b3 -r 2ac353bc34aa language/bulgarian_utf-8.php
--- a/language/bulgarian_utf-8.php Sat Jan 04 10:36:42 2014 -0500
+++ b/language/bulgarian_utf-8.php Sat Jan 04 10:39:33 2014 -0500
@@ -1853,7 +1853,8 @@
$LANG_postmodes = array(
'plaintext' => 'Plain Old Text',
- 'html' => 'HTML Formatted'
+ 'html' => 'HTML Formatted',
+ 'wikitext' => 'Wiki-style format'
);
$LANG_sortcodes = array(
@@ -2270,7 +2271,7 @@
2 => array('Reject' => 0, 'Only Keep Latest' => 1, 'Allow Multiple Posts' => 2),
3 => array('Trackback Enabled' => 0, 'Trackback Disabled' => -1),
4 => array('Don\'t Check Anything' => 0, 'Check against Site URL' => 1, 'Check full URL' => 2, 'Check against Site URL and full URL' => 3, 'Check IP against Site IP' => 4, 'Check IP and Site URL' => 5, 'Check IP and Full URL' => 6, 'Check IP, Full URL, and Site URL' => 7),
- 5 => array('Plain Old Text' => 'plaintext', 'HTML Formatted' => 'html'),
+ 5 => array('Plain Old Text' => 'plaintext', 'HTML Formatted' => 'html', 'Wiki-style Format' => 'wikitext'),
6 => array('12' => 12, '24' => 24),
7 => array('Last Page' => 'last', 'First Page' => 'first', 'Every Page' => 'all'),
8 => array('Right' => 'right', 'Left' => 'left'),
@@ -2289,7 +2290,7 @@
21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict', 'HTML5' => 'html5', 'HTML5 with XHTML syntax' => 'xhtml5'),
22 => array('Strict' => 'DENY', 'Same Origin' => 'SAMEORIGIN', '(disabled)' => ''),
23 => array('Disabled' => 0, 'Enabled' => 1, 'Enabled (Default for Homepage only)' => 2),
- 24 => array('Contribute' => 'contribute', 'Home' => 'home', 'Advanced Search' => 'search', 'Directory' => 'directory', 'My Account' => 'prefs', 'Plugin Entries' => 'plugins', 'Custom Entries' => 'custom', 'Site Statistics' => 'stats'),
+ 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'),
diff -r e11236a405b3 -r 2ac353bc34aa language/catalan.php
--- a/language/catalan.php Sat Jan 04 10:36:42 2014 -0500
+++ b/language/catalan.php Sat Jan 04 10:39:33 2014 -0500
@@ -1851,7 +1851,8 @@
$LANG_postmodes = array(
'plaintext' => 'Plain Old Text',
- 'html' => 'HTML Formatted'
+ 'html' => 'HTML Formatted',
+ 'wikitext' => 'Wiki-style format'
);
$LANG_sortcodes = array(
@@ -2268,7 +2269,7 @@
2 => array('Reject' => 0, 'Only Keep Latest' => 1, 'Allow Multiple Posts' => 2),
3 => array('Trackback Enabled' => 0, 'Trackback Disabled' => -1),
4 => array('Don\'t Check Anything' => 0, 'Check against Site URL' => 1, 'Check full URL' => 2, 'Check against Site URL and full URL' => 3, 'Check IP against Site IP' => 4, 'Check IP and Site URL' => 5, 'Check IP and Full URL' => 6, 'Check IP, Full URL, and Site URL' => 7),
- 5 => array('Plain Old Text' => 'plaintext', 'HTML Formatted' => 'html'),
+ 5 => array('Plain Old Text' => 'plaintext', 'HTML Formatted' => 'html', 'Wiki-style Format' => 'wikitext'),
6 => array('12' => 12, '24' => 24),
7 => array('Last Page' => 'last', 'First Page' => 'first', 'Every Page' => 'all'),
8 => array('Right' => 'right', 'Left' => 'left'),
@@ -2287,7 +2288,7 @@
21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict', 'HTML5' => 'html5', 'HTML5 with XHTML syntax' => 'xhtml5'),
22 => array('Strict' => 'DENY', 'Same Origin' => 'SAMEORIGIN', '(disabled)' => ''),
23 => array('Disabled' => 0, 'Enabled' => 1, 'Enabled (Default for Homepage only)' => 2),
- 24 => array('Contribute' => 'contribute', 'Home' => 'home', 'Advanced Search' => 'search', 'Directory' => 'directory', 'My Account' => 'prefs', 'Plugin Entries' => 'plugins', 'Custom Entries' => 'custom', 'Site Statistics' => 'stats'),
+ 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'),
diff -r e11236a405b3 -r 2ac353bc34aa language/catalan_utf-8.php
--- a/language/catalan_utf-8.php Sat Jan 04 10:36:42 2014 -0500
+++ b/language/catalan_utf-8.php Sat Jan 04 10:39:33 2014 -0500
@@ -1851,7 +1851,8 @@
$LANG_postmodes = array(
'plaintext' => 'Plain Old Text',
- 'html' => 'HTML Formatted'
+ 'html' => 'HTML Formatted',
+ 'wikitext' => 'Wiki-style format'
);
$LANG_sortcodes = array(
@@ -2268,7 +2269,7 @@
2 => array('Reject' => 0, 'Only Keep Latest' => 1, 'Allow Multiple Posts' => 2),
3 => array('Trackback Enabled' => 0, 'Trackback Disabled' => -1),
4 => array('Don\'t Check Anything' => 0, 'Check against Site URL' => 1, 'Check full URL' => 2, 'Check against Site URL and full URL' => 3, 'Check IP against Site IP' => 4, 'Check IP and Site URL' => 5, 'Check IP and Full URL' => 6, 'Check IP, Full URL, and Site URL' => 7),
- 5 => array('Plain Old Text' => 'plaintext', 'HTML Formatted' => 'html'),
+ 5 => array('Plain Old Text' => 'plaintext', 'HTML Formatted' => 'html', 'Wiki-style Format' => 'wikitext'),
6 => array('12' => 12, '24' => 24),
7 => array('Last Page' => 'last', 'First Page' => 'first', 'Every Page' => 'all'),
8 => array('Right' => 'right', 'Left' => 'left'),
@@ -2287,7 +2288,7 @@
21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict', 'HTML5' => 'html5', 'HTML5 with XHTML syntax' => 'xhtml5'),
22 => array('Strict' => 'DENY', 'Same Origin' => 'SAMEORIGIN', '(disabled)' => ''),
23 => array('Disabled' => 0, 'Enabled' => 1, 'Enabled (Default for Homepage only)' => 2),
- 24 => array('Contribute' => 'contribute', 'Home' => 'home', 'Advanced Search' => 'search', 'Directory' => 'directory', 'My Account' => 'prefs', 'Plugin Entries' => 'plugins', 'Custom Entries' => 'custom', 'Site Statistics' => 'stats'),
+ 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'),
diff -r e11236a405b3 -r 2ac353bc34aa language/chinese_simplified_utf-8.php
--- a/language/chinese_simplified_utf-8.php Sat Jan 04 10:36:42 2014 -0500
+++ b/language/chinese_simplified_utf-8.php Sat Jan 04 10:39:33 2014 -0500
@@ -1856,7 +1856,8 @@
$LANG_postmodes = array(
'plaintext' => '普通文å—',
- 'html' => 'HTML æ ¼å¼'
+ 'html' => 'HTML æ ¼å¼',
+ 'wikitext' => 'Wiki-style format'
);
$LANG_sortcodes = array(
@@ -2273,7 +2274,7 @@
2 => array('Reject' => 0, 'Only Keep Latest' => 1, 'Allow Multiple Posts' => 2),
3 => array('Trackback Enabled' => 0, 'Trackback Disabled' => -1),
4 => array('Don\'t Check Anything' => 0, 'Check against Site URL' => 1, 'Check full URL' => 2, 'Check against Site URL and full URL' => 3, 'Check IP against Site IP' => 4, 'Check IP and Site URL' => 5, 'Check IP and Full URL' => 6, 'Check IP, Full URL, and Site URL' => 7),
- 5 => array('Plain Old Text' => 'plaintext', 'HTML Formatted' => 'html'),
+ 5 => array('Plain Old Text' => 'plaintext', 'HTML Formatted' => 'html', 'Wiki-style Format' => 'wikitext'),
6 => array('12' => 12, '24' => 24),
7 => array('Last Page' => 'last', 'First Page' => 'first', 'Every Page' => 'all'),
8 => array('Right' => 'right', 'Left' => 'left'),
@@ -2292,7 +2293,7 @@
21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict', 'HTML5' => 'html5', 'HTML5 with XHTML syntax' => 'xhtml5'),
22 => array('Strict' => 'DENY', 'Same Origin' => 'SAMEORIGIN', '(disabled)' => ''),
23 => array('Disabled' => 0, 'Enabled' => 1, 'Enabled (Default for Homepage only)' => 2),
- 24 => array('Contribute' => 'contribute', 'Home' => 'home', 'Advanced Search' => 'search', 'Directory' => 'directory', 'My Account' => 'prefs', 'Plugin Entries' => 'plugins', 'Custom Entries' => 'custom', 'Site Statistics' => 'stats'),
+ 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'),
diff -r e11236a405b3 -r 2ac353bc34aa language/chinese_traditional_utf-8.php
--- a/language/chinese_traditional_utf-8.php Sat Jan 04 10:36:42 2014 -0500
+++ b/language/chinese_traditional_utf-8.php Sat Jan 04 10:39:33 2014 -0500
@@ -1856,7 +1856,8 @@
$LANG_postmodes = array(
'plaintext' => '普通文å—',
- 'html' => 'HTML æ ¼å¼'
+ 'html' => 'HTML æ ¼å¼',
+ 'wikitext' => 'Wiki-style format'
);
$LANG_sortcodes = array(
@@ -2273,7 +2274,7 @@
2 => array('Reject' => 0, 'Only Keep Latest' => 1, 'Allow Multiple Posts' => 2),
3 => array('Trackback Enabled' => 0, 'Trackback Disabled' => -1),
4 => array('Don\'t Check Anything' => 0, 'Check against Site URL' => 1, 'Check full URL' => 2, 'Check against Site URL and full URL' => 3, 'Check IP against Site IP' => 4, 'Check IP and Site URL' => 5, 'Check IP and Full URL' => 6, 'Check IP, Full URL, and Site URL' => 7),
- 5 => array('Plain Old Text' => 'plaintext', 'HTML Formatted' => 'html'),
+ 5 => array('Plain Old Text' => 'plaintext', 'HTML Formatted' => 'html', 'Wiki-style Format' => 'wikitext'),
6 => array('12' => 12, '24' => 24),
7 => array('Last Page' => 'last', 'First Page' => 'first', 'Every Page' => 'all'),
More information about the geeklog-cvs
mailing list